Skip to content

Commit 9713fa2

Browse files
committed
Rename all remaining MapColumn to ColumnGroup
1 parent 97c1beb commit 9713fa2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ internal fun <A, B> DataFrame<A>.joinImpl(
6767

6868
require(leftJoinColumns.size == rightJoinColumns.size)
6969

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
7171
val allLeftJoinColumns = mutableListOf<ColumnWithPath<*>>()
7272
val allRightJoinColumns = mutableListOf<ColumnWithPath<*>>()
7373

@@ -220,7 +220,7 @@ internal fun <A, B> DataFrame<A>.joinImpl(
220220
val newColumn = when (srcColumn.kind) {
221221
ColumnKind.Value -> DataColumn.createValueColumn(srcColumn.name, columnValues.asList(), srcColumn.type.withNullability(hasNulls))
222222
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}")
224224
}
225225
srcColumn.path to newColumn
226226
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ internal fun <T> DataColumn<T>.updateWith(values: List<T>): DataColumn<T> = when
7575
null -> null
7676
is List<*> -> it[colIndex]
7777
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" }
7979
}
8080
}
8181
col.updateWith(newValues)

0 commit comments

Comments
 (0)