Repository navigation
datalake_fdw: build against the Arrow the Rocky images carry - #2166
Merged
Merged
Conversation
The Rocky build images now ship Arrow and Parquet C++ themselves (apache#2155): 22.0.0 on Rocky 8 and 26.0.0 on Rocky 9 and 10, with the Arrow repository left disabled. The ic-datalake-fdw step still installed its own copy, so once the images were rebuilt it failed before building anything: on Rocky 9 and 10 EPEL's libarrow-devel conflicts with the image's arrow-devel over the same headers, and on Rocky 8 the pinned 17.0.0 is no longer reachable. The step now installs nothing and builds against the image's Arrow. Arrow 23 moved its headers to C++20 (std::span, std::bit_width), so the Makefile picks -std=c++20 when Arrow is 23 or newer and keeps C++17 below that. C++20 deprecates ++ and -- on a volatile, which the server's own HOLD_INTERRUPTS does, so -Wvolatile is off with it. Arrow 26 removed the FileReader::GetRecordBatchReader overload that returns its reader through an out parameter. The Result-returning form exists from Arrow 19, so the reader uses it from there and keeps the old spelling for older versions.
tuhaihe
approved these changes
Oct 22, 2026
yjhjstz
approved these changes
Oct 22, 2026
yjhjstz
enabled auto-merge (rebase)
October 22, 2026 02:20
Member
|
We can merge this PR first. Otherwise, other PRs may face test failures on |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Since the Rocky build images were rebuilt with Arrow and Parquet C++ (#2155), all three
ic-datalake-fdwjobs fail on main before anything is built, e.g. on 7facde1:libarrow-devel, which conflicts with the image'sarrow-devel-26.0.0over the same headers:file /usr/include/arrow/api.h from install of libarrow-devel-9.0.0-15.el9 conflicts with file from package arrow-devel-26.0.0-1.el9arrow-devel-17.0.0-1.el8, but the image leaves the Arrow repository disabled:No match for argument: arrow-devel-17.0.0-1.el8This PR:
-std=c++20 -Wno-volatilefor Arrow >= 23 and keeps-std=c++17below that.-Wno-volatileis for the server's ownHOLD_INTERRUPTS.FileReader::GetRecordBatchReader; the Result-returning form (Arrow >= 19) is used from 19 on, with the old spelling kept for older versions.Type of Change
Test Plan
Ran the
ic-datalake-fdwflow locally (build and install the server, PGXS-buildcontrib/datalake_fdwwith nothing installed, demo cluster withshared_preload_libraries='datalake_fdw',make -C contrib/datalake_fdw installcheck):cbdb-build-rocky8-latest(new)Rocky 10 is covered by CI only.
make installcheck(contrib/datalake_fdw)make -C src/test installcheck-cbdb-parallelImpact
Dependencies: none new; the Arrow version under test is now the build image's.
Checklist