This is an automated email from the ASF dual-hosted git repository.
frankgh pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-analytics.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6710efc Ninja fix for CASSANDRA-19815
6710efc is described below
commit 6710efc212da2f135467fe3e972418ab5b9f5b78
Author: James Berragan <[email protected]>
AuthorDate: Wed Sep 11 13:36:40 2024 -0700
Ninja fix for CASSANDRA-19815
Fixes Scala 2.13 build and configuration for CI
---
.circleci/config.yml | 4 ++--
.../spark/data/converter/types/complex/SparkList.java | 11 ++++++-----
.../apache/cassandra/spark/utils/ScalaConversionUtils.java | 0
.../apache/cassandra/spark/utils/ScalaConversionUtils.java | 0
.../apache/cassandra/spark/utils/ScalaConversionUtils.java | 0
.../apache/cassandra/spark/utils/ScalaConversionUtils.java | 0
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5f7a9b0..233c35a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -317,7 +317,7 @@ jobs:
at: dependencies
- run_build:
spark: "3"
- scala: "2.12"
+ scala: "2.13"
jdk: "11"
use_jdk11: "true"
@@ -345,7 +345,7 @@ jobs:
at: dependencies
- run_integration:
spark: "3"
- scala: "2.12"
+ scala: "2.13"
jdk: "11"
use_jdk11: "true"
diff --git
a/cassandra-analytics-spark-converter/src/main/java/org/apache/cassandra/spark/data/converter/types/complex/SparkList.java
b/cassandra-analytics-spark-converter/src/main/java/org/apache/cassandra/spark/data/converter/types/complex/SparkList.java
index 5be1b40..18c6a10 100644
---
a/cassandra-analytics-spark-converter/src/main/java/org/apache/cassandra/spark/data/converter/types/complex/SparkList.java
+++
b/cassandra-analytics-spark-converter/src/main/java/org/apache/cassandra/spark/data/converter/types/complex/SparkList.java
@@ -23,12 +23,12 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.stream.Collector;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
import org.apache.cassandra.bridge.BigNumberConfig;
import org.apache.cassandra.spark.data.CqlField;
import org.apache.cassandra.spark.data.converter.SparkSqlTypeConverter;
import org.apache.cassandra.spark.data.converter.types.SparkType;
+import org.apache.cassandra.spark.utils.ScalaConversionUtils;
import org.apache.spark.sql.Row;
import org.apache.spark.sql.catalyst.expressions.GenericInternalRow;
import org.apache.spark.sql.catalyst.util.ArrayData;
@@ -36,7 +36,7 @@ import org.apache.spark.sql.catalyst.util.GenericArrayData;
import org.apache.spark.sql.types.DataType;
import org.apache.spark.sql.types.DataTypes;
import org.jetbrains.annotations.NotNull;
-import scala.collection.mutable.WrappedArray;
+import scala.collection.mutable.Seq;
public class SparkList implements CollectionFeatures
{
@@ -85,9 +85,10 @@ public class SparkList implements CollectionFeatures
@Override
public Object toTestRowType(Object value)
{
- return Stream.of((Object[]) ((WrappedArray<Object>) value).array())
- .map(element -> sparkType().toTestRowType(element))
- .collect(Collectors.toList());
+ return ScalaConversionUtils.mutableSeqAsJavaList((Seq<Object>) value)
+ .stream()
+ .map(element ->
sparkType().toTestRowType(element))
+ .collect(Collectors.toList());
}
public <T> Collector<T, ?, ?> collector()
diff --git
a/cassandra-bridge/src/main/scala-2.11-spark-2/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
b/cassandra-analytics-spark-converter/src/main/scala-2.11-spark-2/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
similarity index 100%
rename from
cassandra-bridge/src/main/scala-2.11-spark-2/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
rename to
cassandra-analytics-spark-converter/src/main/scala-2.11-spark-2/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
diff --git
a/cassandra-bridge/src/main/scala-2.12-spark-2/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
b/cassandra-analytics-spark-converter/src/main/scala-2.12-spark-2/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
similarity index 100%
rename from
cassandra-bridge/src/main/scala-2.12-spark-2/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
rename to
cassandra-analytics-spark-converter/src/main/scala-2.12-spark-2/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
diff --git
a/cassandra-bridge/src/main/scala-2.12-spark-3/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
b/cassandra-analytics-spark-converter/src/main/scala-2.12-spark-3/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
similarity index 100%
rename from
cassandra-bridge/src/main/scala-2.12-spark-3/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
rename to
cassandra-analytics-spark-converter/src/main/scala-2.12-spark-3/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
diff --git
a/cassandra-bridge/src/main/scala-2.13-spark-3/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
b/cassandra-analytics-spark-converter/src/main/scala-2.13-spark-3/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
similarity index 100%
rename from
cassandra-bridge/src/main/scala-2.13-spark-3/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
rename to
cassandra-analytics-spark-converter/src/main/scala-2.13-spark-3/org/apache/cassandra/spark/utils/ScalaConversionUtils.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
