This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 913cb58756 GH-45204: [Integration][Archery] Remove skips for nanoarrow
IPC compression ZSTD/uncompressible golden files (#45205)
913cb58756 is described below
commit 913cb58756fb08ea2b44dee5c8de6cc42f828bb5
Author: Dewey Dunnington <[email protected]>
AuthorDate: Fri Jan 10 09:14:25 2025 -0600
GH-45204: [Integration][Archery] Remove skips for nanoarrow IPC compression
ZSTD/uncompressible golden files (#45205)
### Rationale for this change
After apache/arrow-nanoarrow#693 , ZSTD compression is now supported in the
nanoarrow IPC reader. The list of skips lives in archery, though, and I'd like
those checks to run (here and on our own CI!).
### What changes are included in this PR?
The line skipping compression checks for nanoarrow IPC were modified to
only skip lz4 (which is not yet implemented).
### Are these changes tested?
Yes, this code runs as part of the integration CI job. The skipped tester
is not run in the Arrow repo, though (because of the "target implementations",
which correctly doesn't include nanoarrow here); however, the changes are
tested in https://github.com/apache/arrow-nanoarrow/pull/704 .
(That PR will need to merge before this one because this PR updates the
nanoarrow build script in a way will cause the integration job to fail before
that PR is merged)
### Are there any user-facing changes?
No!
* GitHub Issue: #45204
Lead-authored-by: Dewey Dunnington <[email protected]>
Co-authored-by: Dewey Dunnington <[email protected]>
Signed-off-by: Dewey Dunnington <[email protected]>
---
ci/docker/conda-integration.dockerfile | 3 ++-
ci/scripts/nanoarrow_build.sh | 5 ++++-
dev/archery/archery/integration/runner.py | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ci/docker/conda-integration.dockerfile
b/ci/docker/conda-integration.dockerfile
index bc268e484d..3645e6911e 100644
--- a/ci/docker/conda-integration.dockerfile
+++ b/ci/docker/conda-integration.dockerfile
@@ -38,7 +38,8 @@ RUN mamba install -q -y \
maven=${maven} \
nodejs=${node} \
yarn=${yarn} \
- openjdk=${jdk} && \
+ openjdk=${jdk} \
+ zstd && \
mamba clean --all --force-pkgs-dirs
# Install Rust with only the needed components
diff --git a/ci/scripts/nanoarrow_build.sh b/ci/scripts/nanoarrow_build.sh
index ed5cf6298f..6f7c82b099 100755
--- a/ci/scripts/nanoarrow_build.sh
+++ b/ci/scripts/nanoarrow_build.sh
@@ -46,7 +46,10 @@ set -x
mkdir -p ${build_dir}
pushd ${build_dir}
-cmake ${source_dir} -DNANOARROW_IPC=ON -DNANOARROW_BUILD_INTEGRATION_TESTS=ON
+cmake ${source_dir} \
+ -DNANOARROW_IPC=ON \
+ -DNANOARROW_IPC_WITH_ZSTD=ON \
+ -DNANOARROW_BUILD_INTEGRATION_TESTS=ON
cmake --build .
popd
diff --git a/dev/archery/archery/integration/runner.py
b/dev/archery/archery/integration/runner.py
index 6597183b2c..4a323291c9 100644
--- a/dev/archery/archery/integration/runner.py
+++ b/dev/archery/archery/integration/runner.py
@@ -200,6 +200,7 @@ class IntegrationRunner(object):
skip_testers.add("Rust")
if prefix == '2.0.0-compression':
skip_testers.add("JS")
+ if prefix == '2.0.0-compression' and 'lz4' in name:
# https://github.com/apache/arrow-nanoarrow/issues/621
skip_testers.add("nanoarrow")
