Skip to content

Commit 0af4013

Browse files
author
Gang Wu
committed
chore: bump arrow-cpp to 24.0.0
1 parent 65321e3 commit 0af4013

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ set(ICEBERG_ARROW_INSTALL_INTERFACE_LIBS)
3434
# ICEBERG_CPR_URL - cpr tarball URL
3535
#
3636
# Example usage:
37-
# export ICEBERG_ARROW_URL="https://your-mirror.com/apache-arrow-22.0.0.tar.gz"
37+
# export ICEBERG_ARROW_URL="https://your-mirror.com/apache-arrow-24.0.0.tar.gz"
3838
# cmake -S . -B build
3939
#
4040

41-
set(ICEBERG_ARROW_BUILD_VERSION "22.0.0")
41+
set(ICEBERG_ARROW_BUILD_VERSION "24.0.0")
4242
set(ICEBERG_ARROW_BUILD_SHA256_CHECKSUM
43-
"131250cd24dec0cddde04e2ad8c9e2bc43edc5e84203a81cf71cf1a33a6e7e0f")
43+
"9a8094d24fa33b90c672ab77fdda253f29300c8b0dd3f0b8e55a29dbd98b82c9")
4444

4545
if(DEFINED ENV{ICEBERG_ARROW_URL})
4646
set(ARROW_SOURCE_URL "$ENV{ICEBERG_ARROW_URL}")
@@ -112,7 +112,7 @@ function(resolve_arrow_dependency)
112112
set(ARROW_WITH_ZLIB ON)
113113
set(ZLIB_SOURCE "SYSTEM")
114114
set(ARROW_VERBOSE_THIRDPARTY_BUILD OFF)
115-
set(CMAKE_CXX_STANDARD 17)
115+
set(CMAKE_CXX_STANDARD 20)
116116

117117
fetchcontent_declare(VendoredArrow
118118
${FC_DECLARE_COMMON_OPTIONS}

src/iceberg/parquet/parquet_reader.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,10 @@ class ParquetReader::Impl {
131131
ICEBERG_ASSIGN_OR_RAISE(input_stream_, OpenInputStream(options));
132132
auto file_reader =
133133
::parquet::ParquetFileReader::Open(input_stream_, reader_properties);
134-
ICEBERG_ARROW_RETURN_NOT_OK(::parquet::arrow::FileReader::Make(
135-
pool_, std::move(file_reader), arrow_reader_properties, &reader_));
134+
ICEBERG_ARROW_ASSIGN_OR_RETURN(
135+
reader_,
136+
::parquet::arrow::FileReader::Make(pool_, std::move(file_reader),
137+
arrow_reader_properties));
136138

137139
// Project read schema onto the Parquet file schema
138140
ICEBERG_ASSIGN_OR_RAISE(projection_, BuildProjection(reader_.get(), *read_schema_));

src/iceberg/test/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18+
set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
19+
1820
fetchcontent_declare(googletest
1921
GIT_REPOSITORY https://github.com/google/googletest.git
2022
GIT_TAG b514bdc898e2951020cbdca1304b75f5950d1f59 # release-1.15.2

0 commit comments

Comments
 (0)