From aa4c1b6da5111cc399671ed6c42d8e24c9b19eb2 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Thu, 30 Oct 2025 16:48:49 +0100 Subject: [PATCH 1/6] Prepare Spark 4.1 release. --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 9a8ba3929c..8802f25bfc 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ org.eclipse.jdt ecj - 3.43.0 + 3.43.0 @@ -277,25 +277,25 @@ org.apache.spark spark-core_2.13 - 4.0.1 + 4.1.0-preview3 provided org.apache.spark spark-sql_2.13 - 4.0.1 + 4.1.0-preview3 provided org.apache.spark spark-mllib_2.13 - 4.0.1 + 4.1.0-preview3 provided org.apache.spark spark-hive_2.13 - 4.0.1 + 4.1.0-preview3 provided @@ -307,7 +307,7 @@ org.apache.spark spark-avro_2.13 - 4.0.1 + 4.1.0-preview3 org.antlr From cfd9672f2c79d2af56112c8baeb6f508c1b667d0 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Fri, 13 Mar 2026 16:10:37 +0100 Subject: [PATCH 2/6] Update versions. --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 8802f25bfc..1d141aa84f 100644 --- a/pom.xml +++ b/pom.xml @@ -277,25 +277,25 @@ org.apache.spark spark-core_2.13 - 4.1.0-preview3 + 4.1.1 provided org.apache.spark spark-sql_2.13 - 4.1.0-preview3 + 4.1.1 provided org.apache.spark spark-mllib_2.13 - 4.1.0-preview3 + 4.1.1 provided org.apache.spark spark-hive_2.13 - 4.1.0-preview3 + 4.1.1 provided @@ -307,7 +307,7 @@ org.apache.spark spark-avro_2.13 - 4.1.0-preview3 + 4.1.1 org.antlr @@ -373,7 +373,7 @@ io.delta delta-spark_2.13 - 4.0.0 + 4.1.0 org.skyscreamer From 645d1e4b0921298eb07733c7ec17cd53553569ba Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Fri, 13 Mar 2026 16:20:15 +0100 Subject: [PATCH 3/6] Fix build. --- pom.xml | 6 ++++++ .../org/rumbledb/types/DerivedAtomicItemType.java | 8 ++++---- .../java/org/rumbledb/types/ObjectItemType.java | 13 ++++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 1d141aa84f..77a97def95 100644 --- a/pom.xml +++ b/pom.xml @@ -398,6 +398,12 @@ mongo-spark-connector_2.13 10.5.0 + + org.apache.logging.log4j + log4j-core + 2.24.3 + compile + diff --git a/src/main/java/org/rumbledb/types/DerivedAtomicItemType.java b/src/main/java/org/rumbledb/types/DerivedAtomicItemType.java index dc602110a6..ae6c00b966 100644 --- a/src/main/java/org/rumbledb/types/DerivedAtomicItemType.java +++ b/src/main/java/org/rumbledb/types/DerivedAtomicItemType.java @@ -1,6 +1,9 @@ package org.rumbledb.types; -import org.apache.commons.collections.ListUtils; +import java.util.List; +import java.util.Set; + +import org.apache.commons.collections4.ListUtils; import org.rumbledb.api.Item; import org.rumbledb.config.RumbleRuntimeConfiguration; import org.rumbledb.context.DynamicContext; @@ -11,9 +14,6 @@ import org.rumbledb.expressions.comparison.ComparisonExpression; import org.rumbledb.runtime.misc.ComparisonIterator; -import java.util.List; -import java.util.Set; - public class DerivedAtomicItemType implements ItemType { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/rumbledb/types/ObjectItemType.java b/src/main/java/org/rumbledb/types/ObjectItemType.java index f6af9586e1..d6b9b41fe5 100644 --- a/src/main/java/org/rumbledb/types/ObjectItemType.java +++ b/src/main/java/org/rumbledb/types/ObjectItemType.java @@ -1,6 +1,15 @@ package org.rumbledb.types; -import org.apache.commons.collections.ListUtils; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.collections4.ListUtils; import org.rumbledb.api.Item; import org.rumbledb.config.RumbleRuntimeConfiguration; import org.rumbledb.context.DynamicContext; @@ -10,8 +19,6 @@ import org.rumbledb.exceptions.InvalidSchemaException; import org.rumbledb.exceptions.OurBadException; -import java.util.*; - public class ObjectItemType implements ItemType { private static final long serialVersionUID = 1L; From db33f0157098d135f26fa1706784a6ea3c3e41ae Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Fri, 13 Mar 2026 16:24:13 +0100 Subject: [PATCH 4/6] Fix build. --- src/main/java/org/rumbledb/types/ObjectItemType.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/rumbledb/types/ObjectItemType.java b/src/main/java/org/rumbledb/types/ObjectItemType.java index 14c98dea01..09801ba6e6 100644 --- a/src/main/java/org/rumbledb/types/ObjectItemType.java +++ b/src/main/java/org/rumbledb/types/ObjectItemType.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; From a8ea5dff4344233ed42c3bc74b7472afde8b2d80 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Fri, 13 Mar 2026 16:42:14 +0100 Subject: [PATCH 5/6] Fix test. --- .../RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq | 2 +- .../RumbleML/RumbleML/EstimatorTests/MLEstimator-PCA.jq | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq b/src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq index 656f36baaa..23bce27154 100644 --- a/src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq +++ b/src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq @@ -1,4 +1,4 @@ -(:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "scaled" : { } }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "scaled" : [ 0.2, 0.20703124999999992 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "scaled" : [ 0.4, 0.4140625000000001 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "scaled" : [ 0.6000000000000001, 0.6210937500000003 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "scaled" : [ 0.8, 0.79296875 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "scaled" : [ 1, 1 ] })" :) +(:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "scaled" : [ 0, 0 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "scaled" : [ 0.2, 0.20703124999999992 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "scaled" : [ 0.4, 0.4140625000000001 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "scaled" : [ 0.6000000000000001, 0.6210937500000003 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "scaled" : [ 0.8, 0.79296875 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "scaled" : [ 1, 1 ] })" :) let $data := annotate( json-lines("../../../../queries/rumbleML/sample-ml-data-flat.json"), { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"], "doubleArrayCol": ["double"], "doubleArrayArrayCol": [["double"]] } diff --git a/src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-PCA.jq b/src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-PCA.jq index 212d57db83..692ec61697 100644 --- a/src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-PCA.jq +++ b/src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-PCA.jq @@ -1,4 +1,4 @@ -(:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "pca" : { } }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "pca" : [ 0.2, 0.20703124999999992 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "pca" : [ 0.4, 0.4140625000000001 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "pca" : [ 0.6000000000000001, 0.6210937500000003 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "pca" : [ 0.8, 0.79296875 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "pca" : [ 1, 1 ] })" :) +(:JIQS: ShouldRun; Output="({ "label" : 0, "name" : "a", "age" : 20, "weight" : 50, "pca" : [ 0, 0 ] }, { "label" : 1, "name" : "b", "age" : 21, "weight" : 55.3, "pca" : [ 0.2, 0.20703124999999992 ] }, { "label" : 2, "name" : "c", "age" : 22, "weight" : 60.6, "pca" : [ 0.4, 0.4140625000000001 ] }, { "label" : 3, "name" : "d", "age" : 23, "weight" : 65.9, "pca" : [ 0.6000000000000001, 0.6210937500000003 ] }, { "label" : 4, "name" : "e", "age" : 24, "weight" : 70.3, "pca" : [ 0.8, 0.79296875 ] }, { "label" : 5, "name" : "f", "age" : 25, "weight" : 75.6, "pca" : [ 1, 1 ] })" :) let $data := annotate( json-lines("../../../../queries/rumbleML/sample-ml-data-flat.json"), { "label": "integer", "binaryLabel": "integer", "name": "string", "age": "double", "weight": "double", "booleanCol": "boolean", "nullCol": "null", "stringCol": "string", "stringArrayCol": ["string"], "intArrayCol": ["integer"], "doubleArrayCol": ["double"], "doubleArrayArrayCol": [["double"]] } From 2eb0c5795ca35a176712a8b30c6943f67cd40994 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Fri, 13 Mar 2026 16:50:25 +0100 Subject: [PATCH 6/6] Only execute tests on pull request to avoid redundancy. --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1ac9abad7b..6cf43c0505 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -3,7 +3,7 @@ name: Java CI with Maven -on: [push, pull_request] +on: [pull_request] jobs: build: