Skip to content

Commit 785dafa

Browse files
committed
Convert ColumnPathApproximation to typealias
Makes it easier to call df methods with ColumnPath parameters
1 parent 117e958 commit 785dafa

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/impl/api/flatten.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Flatten0 : AbstractSchemaModificationInterpreter() {
2828
val Arguments.columns: ColumnsResolver by arg()
2929

3030
override fun Arguments.interpret(): PluginDataFrameSchema {
31-
val columns = columns.resolve(receiver).map { pathOf(*it.path.path.toTypedArray()) }
31+
val columns = columns.resolve(receiver).map { it.path }
3232
return receiver
3333
.asDataFrame()
3434
.flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }

plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/impl/api/move.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ToTop : AbstractSchemaModificationInterpreter() {
2525
val Arguments.receiver: MoveClauseApproximation by arg()
2626

2727
override fun Arguments.interpret(): PluginDataFrameSchema {
28-
val columns = receiver.columns.resolve(receiver.df).map { pathOf(*it.path.path.toTypedArray()) }
28+
val columns = receiver.columns.resolve(receiver.df).map { it.path }
2929
return receiver.df.asDataFrame().move { columns.toColumnSet() }.toTop().toPluginDataFrameSchema()
3030
}
3131
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
package org.jetbrains.kotlinx.dataframe.plugin.impl.data
22

3-
data class ColumnPathApproximation(val path: List<String>)
3+
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
4+
5+
typealias ColumnPathApproximation = ColumnPath

0 commit comments

Comments
 (0)