Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,14 @@ project(':iceberg-vortex') {
implementation(libs.vortex.jni) {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
}
implementation(libs.arrow.vector) {
// VortexFormatModel exposes Arrow types in its public API, so Arrow must be
// visible to consumers of iceberg-vortex.
api(libs.arrow.vector) {
exclude group: 'io.netty', module: 'netty-buffer'
exclude group: 'io.netty', module: 'netty-common'
exclude group: 'com.google.code.findbugs', module: 'jsr305'
}
implementation(libs.arrow.c.data) {
exclude group: 'io.netty', module: 'netty-buffer'
exclude group: 'io.netty', module: 'netty-common'
exclude group: 'com.google.code.findbugs', module: 'jsr305'
Expand Down
4 changes: 4 additions & 0 deletions core/src/main/java/org/apache/iceberg/TableProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@ private TableProperties() {}
public static final String ORC_BATCH_SIZE = "read.orc.vectorization.batch-size";
public static final int ORC_BATCH_SIZE_DEFAULT = 5000;

public static final String READ_VORTEX_WORKER_THREADS = "read.vortex.worker-threads";
public static final String WRITE_VORTEX_WORKER_THREADS = "write.vortex.worker-threads";
public static final int VORTEX_WORKER_THREADS_DEFAULT = 4;

public static final String DATA_PLANNING_MODE = "read.data-planning-mode";
public static final String DELETE_PLANNING_MODE = "read.delete-planning-mode";
public static final String PLANNING_MODE_DEFAULT = PlanningMode.AUTO.modeName();
Expand Down
18 changes: 9 additions & 9 deletions flink/v1.20/flink-runtime/runtime-deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ com.fasterxml.jackson.core:jackson-databind:2.21
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21
com.github.ben-manes.caffeine:caffeine:2.9
com.github.luben:zstd-jni:1.5
com.google.errorprone:error_prone_annotations:2.41
com.google.errorprone:error_prone_annotations:2.47
com.google.flatbuffers:flatbuffers-java:25.2
com.google.guava:failureaccess:1.0
com.google.guava:guava:33.5
com.google.guava:guava:33.6
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:3.1
dev.failsafe:failsafe:3.3
dev.vortex:vortex-jni:0.67
dev.vortex:vortex-jni:0.72
io.airlift:aircompressor:2.0
io.netty:netty-buffer:4.2
io.netty:netty-common:4.2
org.apache.arrow:arrow-c-data:18.3
org.apache.arrow:arrow-format:18.3
org.apache.arrow:arrow-memory-core:18.3
org.apache.arrow:arrow-memory-netty-buffer-patch:18.3
org.apache.arrow:arrow-memory-netty:18.3
org.apache.arrow:arrow-vector:18.3
org.apache.arrow:arrow-c-data:19.0
org.apache.arrow:arrow-format:19.0
org.apache.arrow:arrow-memory-core:19.0
org.apache.arrow:arrow-memory-netty-buffer-patch:19.0
org.apache.arrow:arrow-memory-netty:19.0
org.apache.arrow:arrow-vector:19.0
org.apache.avro:avro:1.12
org.apache.datasketches:datasketches-java:6.2
org.apache.datasketches:datasketches-memory:3.0
Expand Down
18 changes: 9 additions & 9 deletions flink/v2.0/flink-runtime/runtime-deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ com.fasterxml.jackson.core:jackson-databind:2.21
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21
com.github.ben-manes.caffeine:caffeine:2.9
com.github.luben:zstd-jni:1.5
com.google.errorprone:error_prone_annotations:2.41
com.google.errorprone:error_prone_annotations:2.47
com.google.flatbuffers:flatbuffers-java:25.2
com.google.guava:failureaccess:1.0
com.google.guava:guava:33.5
com.google.guava:guava:33.6
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:3.1
dev.failsafe:failsafe:3.3
dev.vortex:vortex-jni:0.67
dev.vortex:vortex-jni:0.72
io.airlift:aircompressor:2.0
io.netty:netty-buffer:4.2
io.netty:netty-common:4.2
org.apache.arrow:arrow-c-data:18.3
org.apache.arrow:arrow-format:18.3
org.apache.arrow:arrow-memory-core:18.3
org.apache.arrow:arrow-memory-netty-buffer-patch:18.3
org.apache.arrow:arrow-memory-netty:18.3
org.apache.arrow:arrow-vector:18.3
org.apache.arrow:arrow-c-data:19.0
org.apache.arrow:arrow-format:19.0
org.apache.arrow:arrow-memory-core:19.0
org.apache.arrow:arrow-memory-netty-buffer-patch:19.0
org.apache.arrow:arrow-memory-netty:19.0
org.apache.arrow:arrow-vector:19.0
org.apache.avro:avro:1.12
org.apache.datasketches:datasketches-java:6.2
org.apache.datasketches:datasketches-memory:3.0
Expand Down
18 changes: 9 additions & 9 deletions flink/v2.1/flink-runtime/runtime-deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ com.fasterxml.jackson.core:jackson-databind:2.21
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21
com.github.ben-manes.caffeine:caffeine:2.9
com.github.luben:zstd-jni:1.5
com.google.errorprone:error_prone_annotations:2.41
com.google.errorprone:error_prone_annotations:2.47
com.google.flatbuffers:flatbuffers-java:25.2
com.google.guava:failureaccess:1.0
com.google.guava:guava:33.5
com.google.guava:guava:33.6
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:3.1
dev.failsafe:failsafe:3.3
dev.vortex:vortex-jni:0.67
dev.vortex:vortex-jni:0.72
io.airlift:aircompressor:2.0
io.netty:netty-buffer:4.2
io.netty:netty-common:4.2
org.apache.arrow:arrow-c-data:18.3
org.apache.arrow:arrow-format:18.3
org.apache.arrow:arrow-memory-core:18.3
org.apache.arrow:arrow-memory-netty-buffer-patch:18.3
org.apache.arrow:arrow-memory-netty:18.3
org.apache.arrow:arrow-vector:18.3
org.apache.arrow:arrow-c-data:19.0
org.apache.arrow:arrow-format:19.0
org.apache.arrow:arrow-memory-core:19.0
org.apache.arrow:arrow-memory-netty-buffer-patch:19.0
org.apache.arrow:arrow-memory-netty:19.0
org.apache.arrow:arrow-vector:19.0
org.apache.avro:avro:1.12
org.apache.datasketches:datasketches-java:6.2
org.apache.datasketches:datasketches-memory:3.0
Expand Down
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ spark41 = "4.1.1"
sqlite-jdbc = "3.53.1.0"
testcontainers = "2.0.5"
tez08 = { strictly = "0.8.4"} # see rich version usage explanation above
vortex = "0.67.0"
vortex = "0.72.0"

[libraries]
activation = { module = "javax.activation:activation", version.ref = "activation" }
Expand All @@ -105,6 +105,7 @@ antlr-antlr4 = { module = "org.antlr:antlr4", version.ref = "antlr" }
antlr-runtime = { module = "org.antlr:antlr4-runtime", version.ref = "antlr" }
antlr-antlr413 = { module = "org.antlr:antlr4", version.ref = "antlr413" }
antlr-runtime413 = { module = "org.antlr:antlr4-runtime", version.ref = "antlr413" }
arrow-c-data = { module = "org.apache.arrow:arrow-c-data", version.ref = "arrow" }
arrow-memory-netty = { module = "org.apache.arrow:arrow-memory-netty", version.ref = "arrow" }
arrow-vector = { module = "org.apache.arrow:arrow-vector", version.ref = "arrow" }
avro-avro = { module = "org.apache.avro:avro", version.ref = "avro" }
Expand Down
60 changes: 0 additions & 60 deletions kafka-connect/kafka-connect-runtime/baseline-class-uniqueness.lock

This file was deleted.

18 changes: 9 additions & 9 deletions kafka-connect/kafka-connect-runtime/runtime-deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ com.google.code.gson:gson:2.13
com.google.errorprone:error_prone_annotations:2.48
com.google.flatbuffers:flatbuffers-java:25.2
com.google.guava:failureaccess:1.0
com.google.guava:guava:33.5
com.google.guava:guava:33.6
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.http-client:google-http-client-apache-v2:2.1
com.google.http-client:google-http-client-appengine:2.1
Expand All @@ -73,13 +73,13 @@ com.microsoft.azure:msal4j-persistence-extension:1.3
com.microsoft.azure:msal4j:1.23
com.sun.xml.bind:jaxb-impl:2.2
commons-cli:commons-cli:1.9
commons-codec:commons-codec:1.19
commons-codec:commons-codec:1.21
commons-io:commons-io:2.20
commons-logging:commons-logging:1.2
commons-net:commons-net:3.9
commons-pool:commons-pool:1.6
dev.failsafe:failsafe:3.3
dev.vortex:vortex-jni:0.67
dev.vortex:vortex-jni:0.72
dnsjava:dnsjava:3.6
io.airlift:aircompressor:2.0
io.dropwizard.metrics:metrics-core:3.2
Expand Down Expand Up @@ -150,12 +150,12 @@ javax.xml.bind:jaxb-api:2.2
javax.xml.stream:stax-api:1.0-2
net.java.dev.jna:jna-platform:5.17
net.java.dev.jna:jna:5.17
org.apache.arrow:arrow-c-data:18.3
org.apache.arrow:arrow-format:18.3
org.apache.arrow:arrow-memory-core:18.3
org.apache.arrow:arrow-memory-netty-buffer-patch:18.3
org.apache.arrow:arrow-memory-netty:18.3
org.apache.arrow:arrow-vector:18.3
org.apache.arrow:arrow-c-data:19.0
org.apache.arrow:arrow-format:19.0
org.apache.arrow:arrow-memory-core:19.0
org.apache.arrow:arrow-memory-netty-buffer-patch:19.0
org.apache.arrow:arrow-memory-netty:19.0
org.apache.arrow:arrow-vector:19.0
org.apache.avro:avro:1.12
org.apache.commons:commons-collections4:4.4
org.apache.commons:commons-compress:1.28
Expand Down
Loading
Loading