Skip to content

Commit cd200e8

Browse files
committed
Remove redundant API from ColumnSelectionDsl.
1 parent 29e7bff commit cd200e8

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import kotlin.reflect.KProperty
1616
/**
1717
* Provides access to [columns][DataColumn].
1818
*
19-
* Base interface for [DataFrame] and [column selection DSLs][ColumnSelectionDsl]
19+
* Base interface for [DataFrame] and [ColumnSelectionDsl]
2020
*
2121
* @param T Schema marker. Used to generate extension properties for typed column access.
2222
*/

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import org.jetbrains.kotlinx.dataframe.columns.UnresolvedColumnsPolicy
1717
import org.jetbrains.kotlinx.dataframe.columns.renamedReference
1818
import org.jetbrains.kotlinx.dataframe.impl.DataFrameReceiver
1919
import org.jetbrains.kotlinx.dataframe.impl.columnName
20-
import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnAccessorImpl
2120
import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnsList
2221
import org.jetbrains.kotlinx.dataframe.impl.columns.DistinctColumnSet
2322
import org.jetbrains.kotlinx.dataframe.impl.columns.allColumnsExcept
@@ -36,19 +35,11 @@ import kotlin.reflect.typeOf
3635

3736
public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
3837

39-
public operator fun <C> ColumnReference<C>.invoke(): DataColumn<C> = get(this)
40-
41-
public operator fun <T> ColumnReference<DataRow<T>>.invoke(): ColumnGroup<T> = get(this)
42-
43-
public operator fun <C> ColumnReference<C>.invoke(newName: String): ColumnReference<C> = renamedReference(newName)
44-
4538
public operator fun <C> ColumnPath.invoke(): DataColumn<C> = getColumn(this).cast()
4639

4740
public operator fun <C> String.invoke(): DataColumn<C> = getColumn(this).cast()
4841

4942
public operator fun String.get(column: String): ColumnPath = pathOf(this, column)
50-
51-
public fun <C> String.cast(): ColumnAccessor<C> = ColumnAccessorImpl(this)
5243
}
5344

5445
public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColumn<DataRow<T>> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import kotlin.reflect.KProperty
2323
public interface SortDsl<out T> : ColumnsSelectionDsl<T> {
2424

2525
public fun <C> ColumnSet<C>.desc(): ColumnSet<C> = addFlag(SortFlag.Reversed)
26-
public fun String.desc(): ColumnSet<Comparable<*>?> = cast<Comparable<*>>().desc()
26+
public fun String.desc(): ColumnSet<Comparable<*>?> = invoke<Comparable<*>>().desc()
2727
public fun <C> KProperty<C>.desc(): ColumnSet<C> = toColumnAccessor().desc()
2828

2929
public fun <C> ColumnSet<C?>.nullsLast(flag: Boolean = true): ColumnSet<C?> =
3030
if (flag) addFlag(SortFlag.NullsLast) else this
3131

32-
public fun String.nullsLast(flag: Boolean = true): ColumnSet<Comparable<*>?> = cast<Comparable<*>>().nullsLast(flag)
32+
public fun String.nullsLast(flag: Boolean = true): ColumnSet<Comparable<*>?> = invoke<Comparable<*>>().nullsLast(flag)
3333
public fun <C> KProperty<C?>.nullsLast(flag: Boolean = true): ColumnSet<C?> = toColumnAccessor().nullsLast(flag)
3434
}
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ class DataFrameTests : BaseTest() {
451451

452452
df.sortBy { Person::name and Person::age.desc() }.check()
453453

454-
df.sortBy { "name".cast<String>() and "age".desc() }.check()
454+
df.sortBy { "name"<String>() and "age".desc() }.check()
455455
}
456456

457457
@Test

0 commit comments

Comments
 (0)