Skip to content

Commit d4ebaf8

Browse files
committed
Add Spark 4.0 support
1 parent 84a85a4 commit d4ebaf8

File tree

39 files changed

+376
-164
lines changed

39 files changed

+376
-164
lines changed

.github/workflows/data/clickhouse/matrix.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
min: &min
1+
2x: &2x
22
# Clickhouse version with proper DateTime > DateTime64 comparison
33
clickhouse-image: yandex/clickhouse-server
44
clickhouse-version: '21.1-alpine'
@@ -8,7 +8,7 @@ min: &min
88
java-version: 8
99
os: ubuntu-22.04
1010

11-
max: &max
11+
3x: &3x
1212
clickhouse-image: clickhouse/clickhouse-server
1313
clickhouse-version: 25.1-alpine
1414
spark-version: 3.5.5
@@ -17,6 +17,16 @@ max: &max
1717
java-version: 20
1818
os: ubuntu-latest
1919

20+
4x: &4x
21+
clickhouse-image: clickhouse/clickhouse-server
22+
clickhouse-version: 25.1-alpine
23+
spark-version: 4.0.0
24+
pydantic-version: 2
25+
python-version: '3.13'
26+
# https://stackoverflow.com/a/79017758/23601543
27+
java-version: 22
28+
os: ubuntu-latest
29+
2030
latest: &latest
2131
clickhouse-image: clickhouse/clickhouse-server
2232
clickhouse-version: latest-alpine
@@ -27,6 +37,6 @@ latest: &latest
2737
os: ubuntu-latest
2838

2939
matrix:
30-
small: [*max]
31-
full: [*min, *max]
32-
nightly: [*min, *max, *latest]
40+
small: [*3x]
41+
full: [*2x, *3x, *4x]
42+
nightly: [*2x, *3x, *latest]
Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
1-
min: &min
1+
2x: &2x
22
# Minimal version with ivysettings.xml override support
33
spark-version: 2.3.1
44
pydantic-version: 1
55
python-version: '3.7'
66
java-version: 8
77
os: ubuntu-22.04
88

9-
max: &max
9+
3x: &3x
1010
spark-version: 3.5.5
1111
pydantic-version: 2
1212
python-version: '3.13'
1313
java-version: 20
1414
os: ubuntu-latest
1515

16+
4x: &4x
17+
spark-version: 4.0.0
18+
pydantic-version: 2
19+
python-version: '3.13'
20+
# https://stackoverflow.com/a/79017758/23601543
21+
java-version: 22
22+
os: ubuntu-latest
23+
1624
latest: &latest
1725
spark-version: latest
1826
pydantic-version: latest
@@ -21,6 +29,6 @@ latest: &latest
2129
os: ubuntu-latest
2230

2331
matrix:
24-
small: [*max]
25-
full: [*min, *max]
26-
nightly: [*min, *max, *latest]
32+
small: [*3x]
33+
full: [*2x, *3x, *4x]
34+
nightly: [*2x, *3x, *latest]

.github/workflows/data/greenplum/matrix.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
min: &min
1+
23: &23
22
greenplum-version: 6.23.1
33
package-version: 2.2.0
44
# Spark 2.3.0 does not support passing ivysettings.xml
@@ -8,7 +8,7 @@ min: &min
88
java-version: 8
99
os: ubuntu-22.04
1010

11-
max: &max
11+
32: &32
1212
greenplum-version: 7.0.0
1313
package-version: 2.3.1
1414
# Greenplum connector does not support Spark 3.3+
@@ -29,6 +29,6 @@ latest: &latest
2929
os: ubuntu-latest
3030

3131
matrix:
32-
small: [*max]
33-
full: [*min, *max]
34-
nightly: [*min, *latest]
32+
small: [*32]
33+
full: [*23, *32]
34+
nightly: [*23, *latest]
Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
1-
min: &min
1+
2x: &2x
22
hadoop-version: hadoop2-hdfs
33
spark-version: 2.3.1
44
pydantic-version: 1
55
python-version: '3.7'
66
java-version: 8
77
os: ubuntu-22.04
88

9-
max: &max
9+
3x: &3x
1010
hadoop-version: hadoop3-hdfs
1111
spark-version: 3.5.5
1212
pydantic-version: 2
1313
python-version: '3.13'
1414
java-version: 20
1515
os: ubuntu-latest
1616

17+
4x: &4x
18+
hadoop-version: hadoop3-hdfs
19+
spark-version: 4.0.0
20+
pydantic-version: 2
21+
python-version: '3.13'
22+
# https://stackoverflow.com/a/79017758/23601543
23+
java-version: 22
24+
os: ubuntu-latest
25+
1726
latest: &latest
1827
hadoop-version: hadoop3-hdfs
1928
spark-version: latest
@@ -23,6 +32,6 @@ latest: &latest
2332
os: ubuntu-latest
2433

2534
matrix:
26-
small: [*max]
27-
full: [*min, *max]
28-
nightly: [*min, *max, *latest]
35+
small: [*3x]
36+
full: [*2x, *3x, *4x]
37+
nightly: [*2x, *3x, *latest]
Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
1-
min: &min
1+
2x: &2x
22
spark-version: 2.3.1
33
pydantic-version: 1
44
python-version: '3.7'
55
java-version: 8
66
os: ubuntu-22.04
77

8-
max: &max
8+
3x: &3x
99
spark-version: 3.5.5
1010
pydantic-version: 2
1111
python-version: '3.13'
1212
java-version: 20
1313
os: ubuntu-latest
1414

15+
4x: &4x
16+
spark-version: 4.0.0
17+
pydantic-version: 2
18+
python-version: '3.13'
19+
# https://stackoverflow.com/a/79017758/23601543
20+
java-version: 22
21+
os: ubuntu-latest
22+
1523
latest: &latest
1624
spark-version: latest
1725
pydantic-version: latest
@@ -20,6 +28,6 @@ latest: &latest
2028
os: ubuntu-latest
2129

2230
matrix:
23-
small: [*max]
24-
full: [*min, *max]
25-
nightly: [*min, *latest]
31+
small: [*3x]
32+
full: [*2x, *3x, *4x]
33+
nightly: [*2x, *3x, *latest]
Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
min: &min
2-
# Headers are supported only since 2.x.
1+
2x: &2x
2+
# Headers are supported only since Kafka 2x.
33
# Images before 3.2.3 are not creating kafka_jaas.conf properly, and failing to start
44
# https://github.com/bitnami/containers/blob/9db9064668365cac89bff58259f63eb78bb97e79/bitnami/kafka/README.md?plain=1#L933
55
kafka-version: 3.2.3
@@ -9,14 +9,23 @@ min: &min
99
java-version: 8
1010
os: ubuntu-22.04
1111

12-
max: &max
12+
3x: &3x
1313
kafka-version: 3.9.0
1414
pydantic-version: 2
1515
spark-version: 3.5.5
1616
python-version: '3.13'
1717
java-version: 20
1818
os: ubuntu-latest
1919

20+
4x: &4x
21+
kafka-version: 3.9.0
22+
pydantic-version: 2
23+
spark-version: 4.0.0
24+
python-version: '3.13'
25+
# https://stackoverflow.com/a/79017758/23601543
26+
java-version: 22
27+
os: ubuntu-latest
28+
2029
latest: &latest
2130
kafka-version: latest
2231
pydantic-version: latest
@@ -26,6 +35,6 @@ latest: &latest
2635
os: ubuntu-latest
2736

2837
matrix:
29-
small: [*max]
30-
full: [*min, *max]
31-
nightly: [*min, *max, *latest]
38+
small: [*3x]
39+
full: [*2x, *3x, *4x]
40+
nightly: [*2x, *3x, *latest]
Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
1-
min: &min
1+
23: &23
22
spark-version: 2.3.1
33
pydantic-version: 1
44
python-version: '3.7'
55
java-version: 8
66
os: ubuntu-22.04
77

8-
min_avro: &min_avro
8+
24: &24
9+
# Avro supported only since Spark 2.4
910
spark-version: 2.4.8
1011
pydantic-version: 1
1112
python-version: '3.7'
1213
java-version: 8
1314
os: ubuntu-22.04
1415

15-
min_excel: &min_excel
16+
32: &32
17+
# Excel supported only since Spark 3.2
1618
spark-version: 3.2.4
1719
pydantic-version: 1
1820
python-version: '3.7'
1921
java-version: 8
2022
os: ubuntu-22.04
2123

22-
max: &max
24+
35: &35
2325
spark-version: 3.5.5
2426
pydantic-version: 2
2527
python-version: '3.13'
2628
java-version: 20
2729
os: ubuntu-latest
2830

31+
4x: &4x
32+
spark-version: 4.0.0
33+
pydantic-version: 2
34+
python-version: '3.13'
35+
# https://stackoverflow.com/a/79017758/23601543
36+
java-version: 22
37+
os: ubuntu-latest
38+
2939
latest: &latest
3040
spark-version: latest
3141
pydantic-version: latest
@@ -34,15 +44,6 @@ latest: &latest
3444
os: ubuntu-latest
3545

3646
matrix:
37-
small:
38-
- <<: *max
39-
full:
40-
- <<: *min
41-
- <<: *min_avro
42-
- <<: *min_excel
43-
- <<: *max
44-
nightly:
45-
- <<: *min
46-
- <<: *min_avro
47-
- <<: *min_excel
48-
- <<: *latest
47+
small: [*35]
48+
full: [*23, *24, *32, *35, *4x]
49+
nightly: [*23, *24, *32, *35, *latest]
Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
min: &min
1+
32: &32
22
mongodb-version: 4.0.0
33
# MongoDB connector does not support Spark 2.x
44
spark-version: 3.2.4
@@ -7,14 +7,23 @@ min: &min
77
java-version: 8
88
os: ubuntu-22.04
99

10-
max: &max
10+
35: &35
1111
mongodb-version: 8.0.4
1212
spark-version: 3.5.5
1313
pydantic-version: 2
1414
python-version: '3.13'
1515
java-version: 20
1616
os: ubuntu-latest
1717

18+
4x: &4x
19+
mongodb-version: 8.0.4
20+
spark-version: 4.0.0
21+
pydantic-version: 2
22+
python-version: '3.13'
23+
# https://stackoverflow.com/a/79017758/23601543
24+
java-version: 22
25+
os: ubuntu-latest
26+
1827
latest: &latest
1928
mongodb-version: latest
2029
spark-version: latest
@@ -24,6 +33,6 @@ latest: &latest
2433
os: ubuntu-latest
2534

2635
matrix:
27-
small: [*max]
28-
full: [*min, *max]
29-
nightly: [*min, *latest]
36+
small: [*35]
37+
full: [*32, *35, *4x]
38+
nightly: [*32, *35, *latest]
Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
1-
min: &min
1+
2x: &2x
22
mssql-version: 2017-latest
33
spark-version: 2.3.1
44
pydantic-version: 1
55
python-version: '3.7'
66
java-version: 8
77
os: ubuntu-22.04
88

9-
max: &max
9+
3x: &3x
1010
mssql-version: 2022-latest
1111
spark-version: 3.5.5
1212
pydantic-version: 2
1313
python-version: '3.13'
1414
java-version: 20
1515
os: ubuntu-latest
1616

17+
4x: &4x
18+
mssql-version: 2022-latest
19+
spark-version: 4.0.0
20+
pydantic-version: 2
21+
python-version: '3.13'
22+
# https://stackoverflow.com/a/79017758/23601543
23+
java-version: 22
24+
os: ubuntu-latest
25+
1726
latest: &latest
1827
mssql-version: latest
1928
spark-version: latest
@@ -23,6 +32,6 @@ latest: &latest
2332
os: ubuntu-latest
2433

2534
matrix:
26-
small: [*max]
27-
full: [*min, *max]
28-
nightly: [*min, *latest]
35+
small: [*3x]
36+
full: [*2x, *3x, *4x]
37+
nightly: [*2x, *3x, *latest]

0 commit comments

Comments
 (0)