K2 compatibility: Fixed test from PivotTests by making ConfiguredAggregateColumn implement both SingleColumn<C>, ColumnSet<C>. Changed the factory functions to explicitly accept either of those only.

Jolanrensen · Jolanrensen · commit 6041d95ef498 · 2024-05-28T14:15:11.000+02:00
diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl.kt
@@ -13,17 +13,19 @@ public interface ColumnsForAggregateSelectionDsl<out T> : ColumnsSelectionDsl<T>
         ConfiguredAggregateColumn.withDefault(this, defaultValue)
 
     public infix fun <C> SingleColumn<C>.default(defaultValue: C): SingleColumn<C> =
-        ConfiguredAggregateColumn.withDefault(this, defaultValue).single()
+        ConfiguredAggregateColumn.withDefault(this, defaultValue)
 
     public fun path(vararg names: String): ColumnPath = ColumnPath(names.asList())
 
-    public infix fun <C> ColumnSet<C>.into(name: String): ColumnSet<C> = ConfiguredAggregateColumn.withPath(this, pathOf(name))
+    public infix fun <C> ColumnSet<C>.into(name: String): ColumnSet<C> =
+        ConfiguredAggregateColumn.withPath(this, pathOf(name))
 
     public infix fun <C> SingleColumn<C>.into(name: String): SingleColumn<C> =
-        ConfiguredAggregateColumn.withPath(this, pathOf(name)).single()
+        ConfiguredAggregateColumn.withPath(this, pathOf(name))
 
-    public infix fun <C> ColumnSet<C>.into(path: ColumnPath): ColumnSet<C> = ConfiguredAggregateColumn.withPath(this, path)
+    public infix fun <C> ColumnSet<C>.into(path: ColumnPath): ColumnSet<C> =
+        ConfiguredAggregateColumn.withPath(this, path)
 
     public infix fun <C> SingleColumn<C>.into(path: ColumnPath): SingleColumn<C> =
-        ConfiguredAggregateColumn.withPath(this, path).single()
+        ConfiguredAggregateColumn.withPath(this, path)
 }
diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/ConfiguredAggregateColumn.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/ConfiguredAggregateColumn.kt
@@ -5,13 +5,14 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnResolutionContext
 import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
 import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
 import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver
+import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
 import org.jetbrains.kotlinx.dataframe.columns.shortPath
 
 internal class ConfiguredAggregateColumn<C> private constructor(
     val columns: ColumnsResolver<C>,
     private val default: C? = null,
     private val newPath: ColumnPath? = null,
-) : ColumnSet<C> {
+) : SingleColumn<C>, ColumnSet<C> {
 
     private fun ColumnWithPath<C>.toDescriptor(keepName: Boolean): AggregateColumnDescriptor<C> =
         when (val col = this) {
@@ -38,16 +39,33 @@ internal class ConfiguredAggregateColumn<C> private constructor(
     override fun resolve(context: ColumnResolutionContext): List<ColumnWithPath<C>> =
         resolve(context, columns)
 
+    override fun resolveSingle(context: ColumnResolutionContext): ColumnWithPath<C>? =
+        resolve(context, columns).singleOrNull()
+
     companion object {
 
-        fun <C> withDefault(src: ColumnsResolver<C>, default: C?): ColumnSet<C> = when (src) {
-            is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, default, src.newPath)
-            else -> ConfiguredAggregateColumn(src, default, null)
-        }
+        fun <C> withPath(src: SingleColumn<C>, newPath: ColumnPath): SingleColumn<C> =
+            when (src) {
+                is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, src.default, newPath)
+                else -> ConfiguredAggregateColumn(src, null, newPath)
+            }
 
-        fun <C> withPath(src: ColumnsResolver<C>, newPath: ColumnPath): ColumnSet<C> = when (src) {
-            is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, src.default, newPath)
-            else -> ConfiguredAggregateColumn(src, null, newPath)
-        }
+        fun <C> withDefault(src: SingleColumn<C>, default: C?): SingleColumn<C> =
+            when (src) {
+                is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, default, src.newPath)
+                else -> ConfiguredAggregateColumn(src, default, null)
+            }
+
+        fun <C> withPath(src: ColumnSet<C>, newPath: ColumnPath): ColumnSet<C> =
+            when (src) {
+                is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, src.default, newPath)
+                else -> ConfiguredAggregateColumn(src, null, newPath)
+            }
+
+        fun <C> withDefault(src: ColumnSet<C>, default: C?): ColumnSet<C> =
+            when (src) {
+                is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, default, src.newPath)
+                else -> ConfiguredAggregateColumn(src, default, null)
+            }
     }
 }
diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl.kt
@@ -13,17 +13,19 @@ public interface ColumnsForAggregateSelectionDsl<out T> : ColumnsSelectionDsl<T>
         ConfiguredAggregateColumn.withDefault(this, defaultValue)
 
     public infix fun <C> SingleColumn<C>.default(defaultValue: C): SingleColumn<C> =
-        ConfiguredAggregateColumn.withDefault(this, defaultValue).single()
+        ConfiguredAggregateColumn.withDefault(this, defaultValue)
 
     public fun path(vararg names: String): ColumnPath = ColumnPath(names.asList())
 
-    public infix fun <C> ColumnSet<C>.into(name: String): ColumnSet<C> = ConfiguredAggregateColumn.withPath(this, pathOf(name))
+    public infix fun <C> ColumnSet<C>.into(name: String): ColumnSet<C> =
+        ConfiguredAggregateColumn.withPath(this, pathOf(name))
 
     public infix fun <C> SingleColumn<C>.into(name: String): SingleColumn<C> =
-        ConfiguredAggregateColumn.withPath(this, pathOf(name)).single()
+        ConfiguredAggregateColumn.withPath(this, pathOf(name))
 
-    public infix fun <C> ColumnSet<C>.into(path: ColumnPath): ColumnSet<C> = ConfiguredAggregateColumn.withPath(this, path)
+    public infix fun <C> ColumnSet<C>.into(path: ColumnPath): ColumnSet<C> =
+        ConfiguredAggregateColumn.withPath(this, path)
 
     public infix fun <C> SingleColumn<C>.into(path: ColumnPath): SingleColumn<C> =
-        ConfiguredAggregateColumn.withPath(this, path).single()
+        ConfiguredAggregateColumn.withPath(this, path)
 }
diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/ConfiguredAggregateColumn.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/ConfiguredAggregateColumn.kt
@@ -5,13 +5,14 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnResolutionContext
 import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
 import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
 import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver
+import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
 import org.jetbrains.kotlinx.dataframe.columns.shortPath
 
 internal class ConfiguredAggregateColumn<C> private constructor(
     val columns: ColumnsResolver<C>,
     private val default: C? = null,
     private val newPath: ColumnPath? = null,
-) : ColumnSet<C> {
+) : SingleColumn<C>, ColumnSet<C> {
 
     private fun ColumnWithPath<C>.toDescriptor(keepName: Boolean): AggregateColumnDescriptor<C> =
         when (val col = this) {
@@ -38,16 +39,33 @@ internal class ConfiguredAggregateColumn<C> private constructor(
     override fun resolve(context: ColumnResolutionContext): List<ColumnWithPath<C>> =
         resolve(context, columns)
 
+    override fun resolveSingle(context: ColumnResolutionContext): ColumnWithPath<C>? =
+        resolve(context, columns).singleOrNull()
+
     companion object {
 
-        fun <C> withDefault(src: ColumnsResolver<C>, default: C?): ColumnSet<C> = when (src) {
-            is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, default, src.newPath)
-            else -> ConfiguredAggregateColumn(src, default, null)
-        }
+        fun <C> withPath(src: SingleColumn<C>, newPath: ColumnPath): SingleColumn<C> =
+            when (src) {
+                is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, src.default, newPath)
+                else -> ConfiguredAggregateColumn(src, null, newPath)
+            }
 
-        fun <C> withPath(src: ColumnsResolver<C>, newPath: ColumnPath): ColumnSet<C> = when (src) {
-            is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, src.default, newPath)
-            else -> ConfiguredAggregateColumn(src, null, newPath)
-        }
+        fun <C> withDefault(src: SingleColumn<C>, default: C?): SingleColumn<C> =
+            when (src) {
+                is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, default, src.newPath)
+                else -> ConfiguredAggregateColumn(src, default, null)
+            }
+
+        fun <C> withPath(src: ColumnSet<C>, newPath: ColumnPath): ColumnSet<C> =
+            when (src) {
+                is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, src.default, newPath)
+                else -> ConfiguredAggregateColumn(src, null, newPath)
+            }
+
+        fun <C> withDefault(src: ColumnSet<C>, default: C?): ColumnSet<C> =
+            when (src) {
+                is ConfiguredAggregateColumn<C> -> ConfiguredAggregateColumn(src.columns, default, src.newPath)
+                else -> ConfiguredAggregateColumn(src, default, null)
+            }
     }
 }
