Merge remote-tracking branch 'origin/3.4+' into 3.4+

Kotlin · Mar 25, 2024 · 6e0a33d · 6e0a33d
2 parents 24952b7 + 5d5fe84
commit 6e0a33d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,8 +39,9 @@ jobs:
       - name: Publish plugins to maven local
         run: >
           ./gradlew
-          clean 
+          compiler-plugin:clean 
           compiler-plugin:publishToMavenLocal
+          gradle-plugin:clean
           gradle-plugin:publishToMavenLocal
 
       - name: Build with Gradle

diff --git a/kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Dataset.kt b/kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Dataset.kt
@@ -92,7 +92,7 @@ inline fun <reified T> List<T>.toDF(spark: SparkSession, vararg colNames: String
  * Utility method to create dataset from list
  */
 inline fun <reified T> Array<T>.toDS(spark: SparkSession): Dataset<T> =
-    toList().toDS(spark)
+    asList().toDS(spark)
 
 /**
  * Utility method to create dataframe from list

diff --git a/kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Rdd.kt b/kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Rdd.kt
@@ -11,7 +11,7 @@ import java.io.Serializable
 fun <T> JavaSparkContext.rddOf(
     vararg elements: T,
     numSlices: Int = defaultParallelism(),
-): JavaRDD<T> = parallelize(elements.toList(), numSlices)
+): JavaRDD<T> = parallelize(elements.asList(), numSlices)
 
 /**
  * Utility method to create an RDD from a list.

diff --git a/kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/SparkSession.kt b/kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/SparkSession.kt
@@ -113,7 +113,7 @@ class KSparkSession(val spark: SparkSession) {
      * NOTE: [T] must be [Serializable].
      */
     fun <T> rddOf(vararg elements: T, numSlices: Int = sc.defaultParallelism()): JavaRDD<T> =
-        sc.toRDD(elements.toList(), numSlices)
+        sc.toRDD(elements.asList(), numSlices)
 
     /**
      * A collection of methods for registering user-defined functions (UDF).

diff --git a/kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/TypeInferenceTest.kt b/kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/TypeInferenceTest.kt
@@ -226,7 +226,7 @@ class TypeInferenceTest : ShouldSpec({
         should("generate valid serializer schema") {
             expect(schemaFor<Sample>() as org.apache.spark.sql.types.StructType) {
                 this
-                    .feature("data type", { this.fields()?.toList() }) {
+                    .feature("data type", { this.fields()?.asList() }) {
                         this.notToEqualNull().toContain.inOrder.only.entry {
                             this
                                 .feature("element name", { name() }) { toEqual("optionList") }