diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake index d4f837d67..a0d418e05 100644 --- a/cmake_modules/IcebergThirdpartyToolchain.cmake +++ b/cmake_modules/IcebergThirdpartyToolchain.cmake @@ -34,13 +34,13 @@ set(ICEBERG_ARROW_INSTALL_INTERFACE_LIBS) # ICEBERG_CPR_URL - cpr tarball URL # # Example usage: -# export ICEBERG_ARROW_URL="https://your-mirror.com/apache-arrow-22.0.0.tar.gz" +# export ICEBERG_ARROW_URL="https://your-mirror.com/apache-arrow-24.0.0.tar.gz" # cmake -S . -B build # -set(ICEBERG_ARROW_BUILD_VERSION "22.0.0") +set(ICEBERG_ARROW_BUILD_VERSION "24.0.0") set(ICEBERG_ARROW_BUILD_SHA256_CHECKSUM - "131250cd24dec0cddde04e2ad8c9e2bc43edc5e84203a81cf71cf1a33a6e7e0f") + "9a8094d24fa33b90c672ab77fdda253f29300c8b0dd3f0b8e55a29dbd98b82c9") if(DEFINED ENV{ICEBERG_ARROW_URL}) set(ARROW_SOURCE_URL "$ENV{ICEBERG_ARROW_URL}") @@ -112,7 +112,7 @@ function(resolve_arrow_dependency) set(ARROW_WITH_ZLIB ON) set(ZLIB_SOURCE "SYSTEM") set(ARROW_VERBOSE_THIRDPARTY_BUILD OFF) - set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD 20) fetchcontent_declare(VendoredArrow ${FC_DECLARE_COMMON_OPTIONS} diff --git a/src/iceberg/parquet/parquet_reader.cc b/src/iceberg/parquet/parquet_reader.cc index 2fbf8e0a6..0e2808f59 100644 --- a/src/iceberg/parquet/parquet_reader.cc +++ b/src/iceberg/parquet/parquet_reader.cc @@ -131,8 +131,9 @@ class ParquetReader::Impl { ICEBERG_ASSIGN_OR_RAISE(input_stream_, OpenInputStream(options)); auto file_reader = ::parquet::ParquetFileReader::Open(input_stream_, reader_properties); - ICEBERG_ARROW_RETURN_NOT_OK(::parquet::arrow::FileReader::Make( - pool_, std::move(file_reader), arrow_reader_properties, &reader_)); + ICEBERG_ARROW_ASSIGN_OR_RETURN( + reader_, ::parquet::arrow::FileReader::Make(pool_, std::move(file_reader), + arrow_reader_properties)); // Project read schema onto the Parquet file schema ICEBERG_ASSIGN_OR_RAISE(projection_, BuildProjection(reader_.get(), *read_schema_)); diff --git a/src/iceberg/test/CMakeLists.txt b/src/iceberg/test/CMakeLists.txt index 149abb826..92fd0c1c2 100644 --- a/src/iceberg/test/CMakeLists.txt +++ b/src/iceberg/test/CMakeLists.txt @@ -15,6 +15,8 @@ # specific language governing permissions and limitations # under the License. +set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE) + fetchcontent_declare(googletest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG b514bdc898e2951020cbdca1304b75f5950d1f59 # release-1.15.2