Skip to content

Commit 29e7bff

Browse files
committed
Remove String.invoke and String.by functions from ColumnSelectionDsl.
1 parent 0a74bc2 commit 29e7bff

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import org.jetbrains.kotlinx.dataframe.ColumnsContainer
66
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
77
import org.jetbrains.kotlinx.dataframe.DataColumn
88
import org.jetbrains.kotlinx.dataframe.Predicate
9-
import org.jetbrains.kotlinx.dataframe.RowExpression
109
import org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor
1110
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1211
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
@@ -25,7 +24,6 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.allColumnsExcept
2524
import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet
2625
import org.jetbrains.kotlinx.dataframe.impl.columns.getAt
2726
import org.jetbrains.kotlinx.dataframe.impl.columns.getChildrenAt
28-
import org.jetbrains.kotlinx.dataframe.impl.columns.newColumnWithActualType
2927
import org.jetbrains.kotlinx.dataframe.impl.columns.single
3028
import org.jetbrains.kotlinx.dataframe.impl.columns.toColumns
3129
import org.jetbrains.kotlinx.dataframe.impl.columns.top
@@ -329,12 +327,6 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
329327
// endregion
330328

331329
public fun <C> ColumnSet<C>.distinct(): ColumnSet<C> = DistinctColumnSet(this)
332-
333-
public operator fun <C> String.invoke(newColumnExpression: RowExpression<T, C>): DataColumn<C> =
334-
newColumnWithActualType(this, newColumnExpression)
335-
336-
public infix fun <C> String.by(newColumnExpression: RowExpression<T, C>): DataColumn<C> =
337-
newColumnWithActualType(this, newColumnExpression)
338330
}
339331

340332
public inline fun <T, reified R> ColumnsSelectionDsl<T>.expr(

tests/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/PivotTests.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
1818
import org.jetbrains.kotlinx.dataframe.api.drop
1919
import org.jetbrains.kotlinx.dataframe.api.dropNulls
2020
import org.jetbrains.kotlinx.dataframe.api.explodeLists
21+
import org.jetbrains.kotlinx.dataframe.api.expr
2122
import org.jetbrains.kotlinx.dataframe.api.filter
2223
import org.jetbrains.kotlinx.dataframe.api.first
2324
import org.jetbrains.kotlinx.dataframe.api.forEachColumn
@@ -181,7 +182,7 @@ class PivotTests {
181182
@Test
182183
fun `pivot two values`() {
183184
val pivoted = typed.pivot(inward = false) { key }.groupBy { name }
184-
.values { value and "str" { value?.toString() } default "-" }
185+
.values { value and (expr { value?.toString() } into "str") default "-" }
185186

186187
val expected = defaultExpected.replace("age", "city", "weight").with {
187188
columnOf(

0 commit comments

Comments
 (0)