Skip to content

Commit 913cb58

Browse files
authored
apacheGH-45204: [Integration][Archery] Remove skips for nanoarrow IPC compression ZSTD/uncompressible golden files (apache#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 apache/arrow-nanoarrow#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: apache#45204 Lead-authored-by: Dewey Dunnington <[email protected]> Co-authored-by: Dewey Dunnington <[email protected]> Signed-off-by: Dewey Dunnington <[email protected]>
1 parent d0b11bb commit 913cb58

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

ci/docker/conda-integration.dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ RUN mamba install -q -y \
3838
maven=${maven} \
3939
nodejs=${node} \
4040
yarn=${yarn} \
41-
openjdk=${jdk} && \
41+
openjdk=${jdk} \
42+
zstd && \
4243
mamba clean --all --force-pkgs-dirs
4344

4445
# Install Rust with only the needed components

ci/scripts/nanoarrow_build.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ set -x
4646
mkdir -p ${build_dir}
4747
pushd ${build_dir}
4848

49-
cmake ${source_dir} -DNANOARROW_IPC=ON -DNANOARROW_BUILD_INTEGRATION_TESTS=ON
49+
cmake ${source_dir} \
50+
-DNANOARROW_IPC=ON \
51+
-DNANOARROW_IPC_WITH_ZSTD=ON \
52+
-DNANOARROW_BUILD_INTEGRATION_TESTS=ON
5053
cmake --build .
5154

5255
popd

dev/archery/archery/integration/runner.py

+1
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ def _gold_tests(self, gold_dir):
200200
skip_testers.add("Rust")
201201
if prefix == '2.0.0-compression':
202202
skip_testers.add("JS")
203+
if prefix == '2.0.0-compression' and 'lz4' in name:
203204
# https://github.com/apache/arrow-nanoarrow/issues/621
204205
skip_testers.add("nanoarrow")
205206

0 commit comments

Comments
 (0)