Skip to content

Spark 4.1 #1390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghislainfourny wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Spark 4.1 #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
aa4c1b6
Prepare Spark 4.1 release.
Oct 30, 2025
cfd9672
Update versions.
Mar 13, 2026
645d1e4
Fix build.
Mar 13, 2026
4caf8c2
Merge branch 'master' of github.com:RumbleDB/rumble into spark4.1.0
Mar 13, 2026
db33f01
Fix build.
Mar 13, 2026
a8ea5df
Fix test.
Mar 13, 2026
2eb0c57
Only execute tests on pull request to avoid redundancy.
Mar 13, 2026
5cac77c
Merge branch 'master' into Spark4.1.0
ghislainfourny Mar 13, 2026
471012d
Merge branch 'master' into Spark4.1.0
ghislainfourny Mar 18, 2026
8dbbf68
Merge branch 'master' into Spark4.1.0
ghislainfourny Mar 30, 2026
1e53b17
Merge branch 'master' into Spark4.1.0
ghislainfourny Apr 2, 2026
df882b3
Merge branch 'master' into Spark4.1.0
ghislainfourny Apr 15, 2026
98a34f8
Merge branch 'master' into Spark4.1.0
ghislainfourny Apr 21, 2026
a05920b
Merge branch 'master' into Spark4.1.0
ghislainfourny Apr 24, 2026
ce606ae
Merge branch 'master' into Spark4.1.0
ghislainfourny May 6, 2026
481b3d8
Merge branch 'master' into Spark4.1.0
ghislainfourny May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
pull_request:
branches:
- '**'

jobs:
build:
runs-on: ubuntu-latest
Expand Down
20 changes: 13 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<version>3.43.0</version>
<version>3.43.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -278,25 +278,25 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.13</artifactId>
<version>4.0.1</version>
<version>4.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.13</artifactId>
<version>4.0.1</version>
<version>4.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-mllib_2.13</artifactId>
<version>4.0.1</version>
<version>4.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-hive_2.13</artifactId>
<version>4.0.1</version>
<version>4.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -308,7 +308,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-avro_2.13</artifactId>
<version>4.0.1</version>
<version>4.1.1</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand Down Expand Up @@ -375,7 +375,7 @@
<dependency>
<groupId>io.delta</groupId>
<artifactId>delta-spark_2.13</artifactId>
<version>4.0.0</version>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
Expand Down Expand Up @@ -405,6 +405,12 @@
<artifactId>mongo-spark-connector_2.13</artifactId>
<version>10.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.24.3</version>
<scope>compile</scope>
</dependency>
</dependencies>

<distributionManagement>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/rumbledb/types/DerivedAtomicItemType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
14 changes: 11 additions & 3 deletions src/main/java/org/rumbledb/types/ObjectItemType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
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.LinkedHashMap;
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;
Expand All @@ -10,8 +20,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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-MinMaxScaler.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]] }
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/test_files/RumbleML/RumbleML/EstimatorTests/MLEstimator-PCA.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]] }
Expand Down
Loading