Skip to content

Commit 9ed12ed

Browse files
committed
Applying KT-64092 temp-fix to all(Cols)X functions as well
1 parent c4b3da7 commit 9ed12ed

File tree

14 files changed

+786
-186
lines changed

14 files changed

+786
-186
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt

Lines changed: 438 additions & 24 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt

Lines changed: 110 additions & 117 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3428,7 +3428,7 @@ public interface ColGroupColumnsSelectionDsl {
34283428
internal fun <C> SingleColumn<DataRow<C>>.ensureIsColumnGroup(): SingleColumn<DataRow<C>> =
34293429
onResolve { col: ColumnWithPath<*>? ->
34303430
require(col?.isColumnGroup() != false) {
3431-
"Column at ${col?.path?.joinToString()} is not a ColumnGroup, but a ${col?.kind()}."
3431+
"Column at '${col?.path?.joinToString()}' is not a ColumnGroup, but a ${col?.kind()}."
34323432
}
34333433
}
34343434

@@ -3438,7 +3438,7 @@ internal fun <C> SingleColumn<DataRow<C>>.ensureIsColumnGroup(): SingleColumn<Da
34383438
internal fun <C> ColumnAccessor<DataRow<C>>.ensureIsColumnGroup(): ColumnAccessor<DataRow<C>> =
34393439
onResolve { col: ColumnWithPath<*>? ->
34403440
require(col?.isColumnGroup() != false) {
3441-
"Column at ${col?.path?.joinToString()} is not a ColumnGroup, but a ${col?.kind()}."
3441+
"Column at '${col?.path?.joinToString()}' is not a ColumnGroup, but a ${col?.kind()}."
34423442
}
34433443
}
34443444

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public fun <T> Pivot<T>.groupBy(vararg columns: KProperty<*>): PivotGroupBy<T> =
5353
public fun <T> Pivot<T>.groupByOther(): PivotGroupBy<T> {
5454
val impl = this as PivotImpl<T>
5555
val pivotColumns = df.getPivotColumnPaths(columns).toColumnSet()
56-
return impl.toGroupedPivot(moveToTop = false) { except(pivotColumns) }
56+
return impl.toGroupedPivot(moveToTop = false) { allExcept(pivotColumns) }
5757
}
5858

5959
// endregion

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/exceptions/TypeConversionException.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ public open class TypeConversionException(
1212
) : RuntimeException() {
1313

1414
override val message: String
15-
get() = "Failed to convert '$value' from $from to $to" + (column?.let { " in column ${it.joinToString()}" } ?: "")
15+
get() = "Failed to convert '$value' from $from to $to" + (column?.let { " in column '${it.joinToString()}'" } ?: "")
1616
}

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/exceptions/TypeConverterNotFoundException.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ public class TypeConverterNotFoundException(
1111
) : IllegalArgumentException() {
1212

1313
override val message: String
14-
get() = "Type converter from $from to $to is not found" + (column?.let { " for column ${it.joinToString()}" } ?: "")
14+
get() = "Type converter from $from to $to is not found" + (column?.let { " for column '${it.joinToString()}'" } ?: "")
1515
}

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/DataFrameReceiver.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ internal open class DataFrameReceiver<T>(
4646
host = this@DataFrameReceiver,
4747
).asDataColumn().cast()
4848

49-
UnresolvedColumnsPolicy.Fail -> error("Column ${path.joinToString()} not found among ${df.columnNames()}.")
49+
UnresolvedColumnsPolicy.Fail -> error("Column '${path.joinToString()}' not found among ${df.columnNames()}.")
5050
}
5151

5252
is MissingDataColumn -> this

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/insert.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ internal fun <T> insertImpl(
5353
if (subTree != null) {
5454
// assert that new columns go directly under current column so they have longer paths
5555
val invalidPath = subTree.firstOrNull { it.insertionPath.size == childDepth }
56-
check(invalidPath == null) { "Can not insert column `" + invalidPath!!.insertionPath.joinToString(".") + "` because column with this path already exists in DataFrame" }
56+
check(invalidPath == null) { "Can not insert column '${invalidPath!!.insertionPath.joinToString(".")}' because column with this path already exists in DataFrame" }
5757
val group = it as? ColumnGroup<*>
5858
check(group != null) { "Can not insert columns under a column '${it.name()}', because it is not a column group" }
5959
val newDf = insertImpl(group, subTree, treeNode?.get(it.name()), childDepth)

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ internal fun <C> ColumnsContainer<*>.getColumn(path: ColumnPath, policy: Unresol
361361
getColumnOrNull(path)?.cast()
362362
?: when (policy) {
363363
UnresolvedColumnsPolicy.Fail ->
364-
error("Column not found: ${path.joinToString()}")
364+
error("Column not found: '${path.joinToString()}'")
365365

366366
UnresolvedColumnsPolicy.Skip -> null
367367
UnresolvedColumnsPolicy.Create -> DataColumn.empty().cast<C>()

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,8 @@ internal const val IDENTITY_FUNCTION = "This overload is an identity function an
107107

108108
internal const val COL_REPLACE = "col"
109109

110+
internal const val ALL_COLS_EXCEPT = "This overload is blocked to prevent issues with column accessors. Use the `{}` overload instead."
111+
internal const val ALL_COLS_REPLACE = "allColsExcept { other }"
112+
internal const val ALL_COLS_REPLACE_VARARG = "allColsExcept { others.toColumnSet() }"
113+
110114
// endregion

0 commit comments

Comments
 (0)