File tree 2 files changed +3
-3
lines changed
core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -67,7 +67,7 @@ internal fun <A, B> DataFrame<A>.joinImpl(
67
67
68
68
require(leftJoinColumns.size == rightJoinColumns.size)
69
69
70
- // replace all MapColumns in join with nested columns, matching by column path
70
+ // replace all ColumnGroups in join with nested columns, matching by column path
71
71
val allLeftJoinColumns = mutableListOf<ColumnWithPath <* >>()
72
72
val allRightJoinColumns = mutableListOf<ColumnWithPath <* >>()
73
73
@@ -220,7 +220,7 @@ internal fun <A, B> DataFrame<A>.joinImpl(
220
220
val newColumn = when (srcColumn.kind) {
221
221
ColumnKind .Value -> DataColumn .createValueColumn(srcColumn.name, columnValues.asList(), srcColumn.type.withNullability(hasNulls))
222
222
ColumnKind .Frame -> DataColumn .createFrameColumn(srcColumn.name, columnValues.asList() as List <AnyFrame >)
223
- ColumnKind .Group -> error(" Unexpected MapColumn at path ${srcColumn.path} " )
223
+ ColumnKind .Group -> error(" Unexpected ColumnGroup at path ${srcColumn.path} " )
224
224
}
225
225
srcColumn.path to newColumn
226
226
}
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ internal fun <T> DataColumn<T>.updateWith(values: List<T>): DataColumn<T> = when
75
75
null -> null
76
76
is List <* > -> it[colIndex]
77
77
is AnyRow -> it.getOrNull(col.name)
78
- else -> require(false ) { " Can not add value '$it ' to MapColumn " }
78
+ else -> require(false ) { " Can not add value '$it ' to ColumnGroup " }
79
79
}
80
80
}
81
81
col.updateWith(newValues)
You can’t perform that action at this time.
0 commit comments