Skip to content

Commit cfd696b

Browse files
robert3005robert3005
authored
Upgrade vortex to 0.72.0
1 parent 26fbb1b commit cfd696b

49 files changed

Lines changed: 1538 additions & 3480 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,14 @@ project(':iceberg-vortex') {
980980
implementation(libs.vortex.jni) {
981981
exclude group: 'com.google.protobuf', module: 'protobuf-java'
982982
}
983-
implementation(libs.arrow.vector) {
983+
// VortexFormatModel exposes Arrow types in its public API, so Arrow must be
984+
// visible to consumers of iceberg-vortex.
985+
api(libs.arrow.vector) {
986+
exclude group: 'io.netty', module: 'netty-buffer'
987+
exclude group: 'io.netty', module: 'netty-common'
988+
exclude group: 'com.google.code.findbugs', module: 'jsr305'
989+
}
990+
implementation(libs.arrow.c.data) {
984991
exclude group: 'io.netty', module: 'netty-buffer'
985992
exclude group: 'io.netty', module: 'netty-common'
986993
exclude group: 'com.google.code.findbugs', module: 'jsr305'

‎core/src/main/java/org/apache/iceberg/TableProperties.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,10 @@ private TableProperties() {}
262262
public static final String ORC_BATCH_SIZE = "read.orc.vectorization.batch-size";
263263
public static final int ORC_BATCH_SIZE_DEFAULT = 5000;
264264

265+
public static final String READ_VORTEX_WORKER_THREADS = "read.vortex.worker-threads";
266+
public static final String WRITE_VORTEX_WORKER_THREADS = "write.vortex.worker-threads";
267+
public static final int VORTEX_WORKER_THREADS_DEFAULT = 4;
268+
265269
public static final String DATA_PLANNING_MODE = "read.data-planning-mode";
266270
public static final String DELETE_PLANNING_MODE = "read.delete-planning-mode";
267271
public static final String PLANNING_MODE_DEFAULT = PlanningMode.AUTO.modeName();

‎flink/v1.20/flink-runtime/runtime-deps.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ com.fasterxml.jackson.core:jackson-databind:2.21
44
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21
55
com.github.ben-manes.caffeine:caffeine:2.9
66
com.github.luben:zstd-jni:1.5
7-
com.google.errorprone:error_prone_annotations:2.41
7+
com.google.errorprone:error_prone_annotations:2.47
88
com.google.flatbuffers:flatbuffers-java:25.2
99
com.google.guava:failureaccess:1.0
10-
com.google.guava:guava:33.5
10+
com.google.guava:guava:33.6
1111
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
1212
com.google.j2objc:j2objc-annotations:3.1
1313
dev.failsafe:failsafe:3.3
14-
dev.vortex:vortex-jni:0.67
14+
dev.vortex:vortex-jni:0.72
1515
io.airlift:aircompressor:2.0
1616
io.netty:netty-buffer:4.2
1717
io.netty:netty-common:4.2
18-
org.apache.arrow:arrow-c-data:18.3
19-
org.apache.arrow:arrow-format:18.3
20-
org.apache.arrow:arrow-memory-core:18.3
21-
org.apache.arrow:arrow-memory-netty-buffer-patch:18.3
22-
org.apache.arrow:arrow-memory-netty:18.3
23-
org.apache.arrow:arrow-vector:18.3
18+
org.apache.arrow:arrow-c-data:19.0
19+
org.apache.arrow:arrow-format:19.0
20+
org.apache.arrow:arrow-memory-core:19.0
21+
org.apache.arrow:arrow-memory-netty-buffer-patch:19.0
22+
org.apache.arrow:arrow-memory-netty:19.0
23+
org.apache.arrow:arrow-vector:19.0
2424
org.apache.avro:avro:1.12
2525
org.apache.datasketches:datasketches-java:6.2
2626
org.apache.datasketches:datasketches-memory:3.0

‎flink/v2.0/flink-runtime/runtime-deps.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ com.fasterxml.jackson.core:jackson-databind:2.21
44
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21
55
com.github.ben-manes.caffeine:caffeine:2.9
66
com.github.luben:zstd-jni:1.5
7-
com.google.errorprone:error_prone_annotations:2.41
7+
com.google.errorprone:error_prone_annotations:2.47
88
com.google.flatbuffers:flatbuffers-java:25.2
99
com.google.guava:failureaccess:1.0
10-
com.google.guava:guava:33.5
10+
com.google.guava:guava:33.6
1111
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
1212
com.google.j2objc:j2objc-annotations:3.1
1313
dev.failsafe:failsafe:3.3
14-
dev.vortex:vortex-jni:0.67
14+
dev.vortex:vortex-jni:0.72
1515
io.airlift:aircompressor:2.0
1616
io.netty:netty-buffer:4.2
1717
io.netty:netty-common:4.2
18-
org.apache.arrow:arrow-c-data:18.3
19-
org.apache.arrow:arrow-format:18.3
20-
org.apache.arrow:arrow-memory-core:18.3
21-
org.apache.arrow:arrow-memory-netty-buffer-patch:18.3
22-
org.apache.arrow:arrow-memory-netty:18.3
23-
org.apache.arrow:arrow-vector:18.3
18+
org.apache.arrow:arrow-c-data:19.0
19+
org.apache.arrow:arrow-format:19.0
20+
org.apache.arrow:arrow-memory-core:19.0
21+
org.apache.arrow:arrow-memory-netty-buffer-patch:19.0
22+
org.apache.arrow:arrow-memory-netty:19.0
23+
org.apache.arrow:arrow-vector:19.0
2424
org.apache.avro:avro:1.12
2525
org.apache.datasketches:datasketches-java:6.2
2626
org.apache.datasketches:datasketches-memory:3.0

‎flink/v2.1/flink-runtime/runtime-deps.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ com.fasterxml.jackson.core:jackson-databind:2.21
44
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21
55
com.github.ben-manes.caffeine:caffeine:2.9
66
com.github.luben:zstd-jni:1.5
7-
com.google.errorprone:error_prone_annotations:2.41
7+
com.google.errorprone:error_prone_annotations:2.47
88
com.google.flatbuffers:flatbuffers-java:25.2
99
com.google.guava:failureaccess:1.0
10-
com.google.guava:guava:33.5
10+
com.google.guava:guava:33.6
1111
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
1212
com.google.j2objc:j2objc-annotations:3.1
1313
dev.failsafe:failsafe:3.3
14-
dev.vortex:vortex-jni:0.67
14+
dev.vortex:vortex-jni:0.72
1515
io.airlift:aircompressor:2.0
1616
io.netty:netty-buffer:4.2
1717
io.netty:netty-common:4.2
18-
org.apache.arrow:arrow-c-data:18.3
19-
org.apache.arrow:arrow-format:18.3
20-
org.apache.arrow:arrow-memory-core:18.3
21-
org.apache.arrow:arrow-memory-netty-buffer-patch:18.3
22-
org.apache.arrow:arrow-memory-netty:18.3
23-
org.apache.arrow:arrow-vector:18.3
18+
org.apache.arrow:arrow-c-data:19.0
19+
org.apache.arrow:arrow-format:19.0
20+
org.apache.arrow:arrow-memory-core:19.0
21+
org.apache.arrow:arrow-memory-netty-buffer-patch:19.0
22+
org.apache.arrow:arrow-memory-netty:19.0
23+
org.apache.arrow:arrow-vector:19.0
2424
org.apache.avro:avro:1.12
2525
org.apache.datasketches:datasketches-java:6.2
2626
org.apache.datasketches:datasketches-memory:3.0

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ spark41 = "4.1.1"
9292
sqlite-jdbc = "3.53.1.0"
9393
testcontainers = "2.0.5"
9494
tez08 = { strictly = "0.8.4"} # see rich version usage explanation above
95-
vortex = "0.67.0"
95+
vortex = "0.72.0"
9696

9797
[libraries]
9898
activation = { module = "javax.activation:activation", version.ref = "activation" }
@@ -105,6 +105,7 @@ antlr-antlr4 = { module = "org.antlr:antlr4", version.ref = "antlr" }
105105
antlr-runtime = { module = "org.antlr:antlr4-runtime", version.ref = "antlr" }
106106
antlr-antlr413 = { module = "org.antlr:antlr4", version.ref = "antlr413" }
107107
antlr-runtime413 = { module = "org.antlr:antlr4-runtime", version.ref = "antlr413" }
108+
arrow-c-data = { module = "org.apache.arrow:arrow-c-data", version.ref = "arrow" }
108109
arrow-memory-netty = { module = "org.apache.arrow:arrow-memory-netty", version.ref = "arrow" }
109110
arrow-vector = { module = "org.apache.arrow:arrow-vector", version.ref = "arrow" }
110111
avro-avro = { module = "org.apache.avro:avro", version.ref = "avro" }

‎kafka-connect/kafka-connect-runtime/baseline-class-uniqueness.lock‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎kafka-connect/kafka-connect-runtime/runtime-deps.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ com.google.code.gson:gson:2.13
5656
com.google.errorprone:error_prone_annotations:2.48
5757
com.google.flatbuffers:flatbuffers-java:25.2
5858
com.google.guava:failureaccess:1.0
59-
com.google.guava:guava:33.5
59+
com.google.guava:guava:33.6
6060
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
6161
com.google.http-client:google-http-client-apache-v2:2.1
6262
com.google.http-client:google-http-client-appengine:2.1
@@ -73,13 +73,13 @@ com.microsoft.azure:msal4j-persistence-extension:1.3
7373
com.microsoft.azure:msal4j:1.23
7474
com.sun.xml.bind:jaxb-impl:2.2
7575
commons-cli:commons-cli:1.9
76-
commons-codec:commons-codec:1.19
76+
commons-codec:commons-codec:1.21
7777
commons-io:commons-io:2.20
7878
commons-logging:commons-logging:1.2
7979
commons-net:commons-net:3.9
8080
commons-pool:commons-pool:1.6
8181
dev.failsafe:failsafe:3.3
82-
dev.vortex:vortex-jni:0.67
82+
dev.vortex:vortex-jni:0.72
8383
dnsjava:dnsjava:3.6
8484
io.airlift:aircompressor:2.0
8585
io.dropwizard.metrics:metrics-core:3.2
@@ -150,12 +150,12 @@ javax.xml.bind:jaxb-api:2.2
150150
javax.xml.stream:stax-api:1.0-2
151151
net.java.dev.jna:jna-platform:5.17
152152
net.java.dev.jna:jna:5.17
153-
org.apache.arrow:arrow-c-data:18.3
154-
org.apache.arrow:arrow-format:18.3
155-
org.apache.arrow:arrow-memory-core:18.3
156-
org.apache.arrow:arrow-memory-netty-buffer-patch:18.3
157-
org.apache.arrow:arrow-memory-netty:18.3
158-
org.apache.arrow:arrow-vector:18.3
153+
org.apache.arrow:arrow-c-data:19.0
154+
org.apache.arrow:arrow-format:19.0
155+
org.apache.arrow:arrow-memory-core:19.0
156+
org.apache.arrow:arrow-memory-netty-buffer-patch:19.0
157+
org.apache.arrow:arrow-memory-netty:19.0
158+
org.apache.arrow:arrow-vector:19.0
159159
org.apache.avro:avro:1.12
160160
org.apache.commons:commons-collections4:4.4
161161
org.apache.commons:commons-compress:1.28

0 commit comments

Comments
 (0)