K2 compatibility: split up add-dsl in gatherImpl due to failing tests at runtime (it failed at typeOf<K>() deep in ColumnsContainer<T>.mapToColumn(name, typeOf<R>(), infer, body), this avoids the call)

Author: Jolanrensen

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/gather.kt

@@ -40,21 +40,20 @@ internal fun <T, C, K, R> Gather<T, C, K, R>.gatherImpl(
     // optimization when no filter is applied
     if (filter == null) {
         // add key and value columns
-        df = df.add { // add columns for names and values
-            if (keysColumn != null) {
-                keysColumn from { keys }
-            }
-            if (valuesColumn != null) {
-                valuesColumn from { row ->
-                    columnsToGather.map { col ->
-                        val value = col[row]
-                        if (valueTransform != null) {
-                            when {
-                                explode && value is List<*> -> (value as List<C>).map(valueTransform)
-                                else -> valueTransform(value)
-                            }
-                        } else value
-                    }
+        if (keysColumn != null) {
+            df = df.add(keysColumn) { keys }
+        }
+
+        if (valuesColumn != null) {
+            df = df.add(valuesColumn) { row ->
+                columnsToGather.map { col ->
+                    val value = col[row]
+                    if (valueTransform != null) {
+                        when {
+                            explode && value is List<*> -> (value as List<C>).map(valueTransform)
+                            else -> valueTransform(value)
+                        }
+                    } else value
                 }
             }
         }

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

@@ -40,21 +40,20 @@ internal fun <T, C, K, R> Gather<T, C, K, R>.gatherImpl(
     // optimization when no filter is applied
     if (filter == null) {
         // add key and value columns
-        df = df.add { // add columns for names and values
-            if (keysColumn != null) {
-                keysColumn from { keys }
-            }
-            if (valuesColumn != null) {
-                valuesColumn from { row ->
-                    columnsToGather.map { col ->
-                        val value = col[row]
-                        if (valueTransform != null) {
-                            when {
-                                explode && value is List<*> -> (value as List<C>).map(valueTransform)
-                                else -> valueTransform(value)
-                            }
-                        } else value
-                    }
+        if (keysColumn != null) {
+            df = df.add(keysColumn) { keys }
+        }
+
+        if (valuesColumn != null) {
+            df = df.add(valuesColumn) { row ->
+                columnsToGather.map { col ->
+                    val value = col[row]
+                    if (valueTransform != null) {
+                        when {
+                            explode && value is List<*> -> (value as List<C>).map(valueTransform)
+                            else -> valueTransform(value)
+                        }
+                    } else value
                 }
             }
         }