From bd99075eb29ef4871aa5bbcfdee9ad0c5fc20aba Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Tue, 29 Jul 2025 14:07:38 -0400 Subject: [PATCH] ESQL: Bump Apache Arrow dependency --- gradle/verification-metadata.xml | 24 +++++++++---------- x-pack/plugin/esql/arrow/build.gradle | 18 ++++---------- .../esql/qa/server/single-node/build.gradle | 8 +++---- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index bb4ae5da279fb..f8f81bd90eeeb 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2150,24 +2150,24 @@ - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/x-pack/plugin/esql/arrow/build.gradle b/x-pack/plugin/esql/arrow/build.gradle index fac0bd0a77452..d6fa48982d029 100644 --- a/x-pack/plugin/esql/arrow/build.gradle +++ b/x-pack/plugin/esql/arrow/build.gradle @@ -12,9 +12,9 @@ dependencies { compileOnly project(':x-pack:plugin:esql:compute') compileOnly project(':x-pack:plugin:esql-core') compileOnly project(':x-pack:plugin:mapper-version') - implementation('org.apache.arrow:arrow-vector:16.1.0') - implementation('org.apache.arrow:arrow-format:16.1.0') - implementation('org.apache.arrow:arrow-memory-core:16.1.0') + implementation('org.apache.arrow:arrow-vector:18.3.0') + implementation('org.apache.arrow:arrow-format:18.3.0') + implementation('org.apache.arrow:arrow-memory-core:18.3.0') implementation('org.checkerframework:checker-qual:3.42.0') implementation('com.google.flatbuffers:flatbuffers-java:23.5.26') // Needed for the json arrow serialization, and loaded even if we don't use it. @@ -25,7 +25,7 @@ dependencies { runtimeOnly "org.slf4j:slf4j-nop:${versions.slf4j}" testImplementation project(':test:framework') - testImplementation('org.apache.arrow:arrow-memory-unsafe:16.1.0') + testImplementation('org.apache.arrow:arrow-memory-unsafe:18.3.0') testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson}") } @@ -38,18 +38,8 @@ tasks.named("dependencyLicenses").configure { tasks.named("thirdPartyAudit").configure { ignoreViolations( // uses sun.misc.Unsafe. Only used in tests. - 'org.apache.arrow.memory.util.hash.SimpleHasher', - 'org.apache.arrow.memory.util.hash.MurmurHasher', 'org.apache.arrow.memory.util.MemoryUtil', 'org.apache.arrow.memory.util.MemoryUtil$1', - 'org.apache.arrow.vector.DecimalVector', - 'org.apache.arrow.vector.BaseFixedWidthVector', - 'org.apache.arrow.vector.util.DecimalUtility', - 'org.apache.arrow.vector.Decimal256Vector', - 'org.apache.arrow.vector.util.VectorAppender', - 'org.apache.arrow.memory.ArrowBuf', - 'org.apache.arrow.vector.BitVectorHelper', - 'org.apache.arrow.memory.util.ByteFunctionHelpers', ) ignoreMissingClasses( 'org.apache.commons.codec.binary.Hex' diff --git a/x-pack/plugin/esql/qa/server/single-node/build.gradle b/x-pack/plugin/esql/qa/server/single-node/build.gradle index 977955ed69e52..ce962ef4c7e74 100644 --- a/x-pack/plugin/esql/qa/server/single-node/build.gradle +++ b/x-pack/plugin/esql/qa/server/single-node/build.gradle @@ -16,9 +16,9 @@ dependencies { javaRestTestImplementation project(xpackModule('esql')) yamlRestTestImplementation project(xpackModule('esql:qa:server')) - javaRestTestImplementation('org.apache.arrow:arrow-vector:16.1.0') - javaRestTestImplementation('org.apache.arrow:arrow-format:16.1.0') - javaRestTestImplementation('org.apache.arrow:arrow-memory-core:16.1.0') + javaRestTestImplementation('org.apache.arrow:arrow-vector:18.3.0') + javaRestTestImplementation('org.apache.arrow:arrow-format:18.3.0') + javaRestTestImplementation('org.apache.arrow:arrow-memory-core:18.3.0') javaRestTestImplementation('org.checkerframework:checker-qual:3.42.0') javaRestTestImplementation('com.google.flatbuffers:flatbuffers-java:23.5.26') javaRestTestImplementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") @@ -26,7 +26,7 @@ dependencies { javaRestTestImplementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}") javaRestTestImplementation("org.slf4j:slf4j-api:${versions.slf4j}") javaRestTestImplementation("org.slf4j:slf4j-nop:${versions.slf4j}") - javaRestTestImplementation('org.apache.arrow:arrow-memory-unsafe:16.1.0') + javaRestTestImplementation('org.apache.arrow:arrow-memory-unsafe:18.3.0') clusterPlugins project(':plugins:mapper-size') clusterPlugins project(':plugins:mapper-murmur3')