Skip to content

Commit 681be27

Browse files
committed
updating error messages with column paths
1 parent 35e4e19 commit 681be27

File tree

7 files changed

+7
-13
lines changed

7 files changed

+7
-13
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ package org.jetbrains.kotlinx.dataframe.api
33
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
44
import org.jetbrains.kotlinx.dataframe.DataRow
55
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
6-
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
76
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
87
import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
98
import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver
109
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
11-
import org.jetbrains.kotlinx.dataframe.columns.UnresolvedColumnsPolicy
1210
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
1311
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
1412
import org.jetbrains.kotlinx.dataframe.documentation.UsageTemplateColumnsSelectionDsl.UsageTemplate
@@ -17,11 +15,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.allColumnsExceptAndUnpack
1715
import org.jetbrains.kotlinx.dataframe.impl.columns.allColumnsExceptKeepingStructure
1816
import org.jetbrains.kotlinx.dataframe.impl.columns.changePath
1917
import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet
20-
import org.jetbrains.kotlinx.dataframe.impl.columns.isMissingColumn
21-
import org.jetbrains.kotlinx.dataframe.impl.columns.transform
2218
import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle
23-
import org.jetbrains.kotlinx.dataframe.impl.getColumnsWithPaths
24-
import org.jetbrains.kotlinx.dataframe.io.renderToString
2519
import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_EXCEPT
2620
import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_REPLACE
2721
import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_REPLACE_VARARG

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,15 +635,15 @@ public interface ColGroupColumnsSelectionDsl {
635635
internal fun <C> SingleColumn<DataRow<C>>.ensureIsColumnGroup(): SingleColumn<DataRow<C>> =
636636
onResolve { col: ColumnWithPath<*>? ->
637637
require(col?.isColumnGroup() != false) {
638-
"Column at ${col?.path?.joinToString()} is not a ColumnGroup, but a ${col?.kind()}."
638+
"Column at '${col?.path?.joinToString()}' is not a ColumnGroup, but a ${col?.kind()}."
639639
}
640640
}
641641

642642
/** @include [SingleColumn.ensureIsColumnGroup] */
643643
internal fun <C> ColumnAccessor<DataRow<C>>.ensureIsColumnGroup(): ColumnAccessor<DataRow<C>> =
644644
onResolve { col: ColumnWithPath<*>? ->
645645
require(col?.isColumnGroup() != false) {
646-
"Column at ${col?.path?.joinToString()} is not a ColumnGroup, but a ${col?.kind()}."
646+
"Column at '${col?.path?.joinToString()}' is not a ColumnGroup, but a ${col?.kind()}."
647647
}
648648
}
649649

core/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/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/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/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/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>()

0 commit comments

Comments
 (0)