Skip to content

Commit ffedb29

Browse files
committed
Merge remote-tracking branch 'origin/3.4+' into 3.4+
2 parents 24952b7 + 5d5fe84 commit ffedb29

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

.github/workflows/build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
- name: Publish plugins to maven local
4040
run: >
4141
./gradlew
42-
clean
4342
compiler-plugin:publishToMavenLocal
4443
gradle-plugin:publishToMavenLocal
4544

kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Dataset.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ inline fun <reified T> List<T>.toDF(spark: SparkSession, vararg colNames: String
9292
* Utility method to create dataset from list
9393
*/
9494
inline fun <reified T> Array<T>.toDS(spark: SparkSession): Dataset<T> =
95-
toList().toDS(spark)
95+
asList().toDS(spark)
9696

9797
/**
9898
* Utility method to create dataframe from list

kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Rdd.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import java.io.Serializable
1111
fun <T> JavaSparkContext.rddOf(
1212
vararg elements: T,
1313
numSlices: Int = defaultParallelism(),
14-
): JavaRDD<T> = parallelize(elements.toList(), numSlices)
14+
): JavaRDD<T> = parallelize(elements.asList(), numSlices)
1515

1616
/**
1717
* Utility method to create an RDD from a list.

kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/SparkSession.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class KSparkSession(val spark: SparkSession) {
113113
* NOTE: [T] must be [Serializable].
114114
*/
115115
fun <T> rddOf(vararg elements: T, numSlices: Int = sc.defaultParallelism()): JavaRDD<T> =
116-
sc.toRDD(elements.toList(), numSlices)
116+
sc.toRDD(elements.asList(), numSlices)
117117

118118
/**
119119
* A collection of methods for registering user-defined functions (UDF).

kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/TypeInferenceTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ class TypeInferenceTest : ShouldSpec({
226226
should("generate valid serializer schema") {
227227
expect(schemaFor<Sample>() as org.apache.spark.sql.types.StructType) {
228228
this
229-
.feature("data type", { this.fields()?.toList() }) {
229+
.feature("data type", { this.fields()?.asList() }) {
230230
this.notToEqualNull().toContain.inOrder.only.entry {
231231
this
232232
.feature("element name", { name() }) { toEqual("optionList") }

0 commit comments

Comments
 (0)