Skip to content

Commit 9661de9

Browse files
Merge pull request #1533 from Kotlin/groupby_kdocs
groupBy Kdocs
2 parents 7c189f0 + 6f4f087 commit 9661de9

File tree

6 files changed

+548
-7
lines changed

6 files changed

+548
-7
lines changed

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/aggregation/AggregateDsl.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.jetbrains.kotlinx.dataframe.aggregation
22

33
import org.jetbrains.kotlinx.dataframe.DataFrame
4+
import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload
45
import org.jetbrains.kotlinx.dataframe.annotations.HasSchema
56
import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
67
import org.jetbrains.kotlinx.dataframe.api.ColumnSelectionDsl
@@ -9,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor
910
import org.jetbrains.kotlinx.dataframe.impl.aggregation.ValueWithDefault
1011
import org.jetbrains.kotlinx.dataframe.impl.aggregation.receivers.internal
1112
import org.jetbrains.kotlinx.dataframe.impl.columnName
13+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
1214
import kotlin.reflect.KProperty
1315
import kotlin.reflect.typeOf
1416

@@ -21,9 +23,13 @@ public abstract class AggregateDsl<out T> :
2123
public inline infix fun <reified R> R.into(name: String): NamedValue =
2224
internal().yield(pathOf(name), this, typeOf<R>())
2325

26+
@Deprecated(DEPRECATED_ACCESS_API)
27+
@AccessApiOverload
2428
public inline infix fun <reified R> R.into(column: ColumnAccessor<R>): NamedValue =
2529
internal().yield(pathOf(column.name()), this, typeOf<R>())
2630

31+
@Deprecated(DEPRECATED_ACCESS_API)
32+
@AccessApiOverload
2733
public inline infix fun <reified R> R.into(column: KProperty<R>): NamedValue =
2834
internal().yield(pathOf(column.columnName), this, typeOf<R>())
2935

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import kotlin.reflect.KProperty
2424
// region DataFrame
2525

2626
/**
27-
* Groups the specified [columns\] within the [DataFrame].
27+
* Groups the specified [columns\] within the [DataFrame] into
28+
* [column group][ColumnGroup].
2829
*
2930
* This function does not immediately group the columns but instead select columns to group and
3031
* returns a [GroupClause],

0 commit comments

Comments
 (0)