From 7547a21b582ed22c5d448e1bfbad758994d73357 Mon Sep 17 00:00:00 2001 From: Guotao Yu Date: Wed, 16 Jul 2025 10:16:59 +0800 Subject: [PATCH 1/5] chore: upgrade nanoarrow dependency --- cmake_modules/IcebergThirdpartyToolchain.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake index e37d09f94..d51487c17 100644 --- a/cmake_modules/IcebergThirdpartyToolchain.cmake +++ b/cmake_modules/IcebergThirdpartyToolchain.cmake @@ -238,7 +238,7 @@ function(resolve_nanoarrow_dependency) fetchcontent_declare(nanoarrow ${FC_DECLARE_COMMON_OPTIONS} - URL "https://dlcdn.apache.org/arrow/apache-arrow-nanoarrow-0.6.0/apache-arrow-nanoarrow-0.6.0.tar.gz" + URL "https://dlcdn.apache.org/arrow/apache-arrow-nanoarrow-0.7.0/apache-arrow-nanoarrow-0.7.0.tar.gz" ) fetchcontent_makeavailable(nanoarrow) From 84f1068352e59fa641396a9be2b7867f7fc05f87 Mon Sep 17 00:00:00 2001 From: Guotao Yu Date: Wed, 16 Jul 2025 10:31:52 +0800 Subject: [PATCH 2/5] chore: update nanoarrow download URL --- cmake_modules/IcebergThirdpartyToolchain.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake index d51487c17..08bf603df 100644 --- a/cmake_modules/IcebergThirdpartyToolchain.cmake +++ b/cmake_modules/IcebergThirdpartyToolchain.cmake @@ -238,7 +238,7 @@ function(resolve_nanoarrow_dependency) fetchcontent_declare(nanoarrow ${FC_DECLARE_COMMON_OPTIONS} - URL "https://dlcdn.apache.org/arrow/apache-arrow-nanoarrow-0.7.0/apache-arrow-nanoarrow-0.7.0.tar.gz" + URL "https://archive.apache.org/dist/arrow/apache-arrow-nanoarrow-0.6.0/apache-arrow-nanoarrow-0.6.0.tar.gz" ) fetchcontent_makeavailable(nanoarrow) From a256acf7e91a4205fad44f7a2875e8476ff0d5b8 Mon Sep 17 00:00:00 2001 From: Guotao Yu Date: Wed, 16 Jul 2025 12:19:21 +0800 Subject: [PATCH 3/5] chore: upgrade nanoarrow dependency --- cmake_modules/IcebergThirdpartyToolchain.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake index 08bf603df..8e7284c6f 100644 --- a/cmake_modules/IcebergThirdpartyToolchain.cmake +++ b/cmake_modules/IcebergThirdpartyToolchain.cmake @@ -238,13 +238,13 @@ function(resolve_nanoarrow_dependency) fetchcontent_declare(nanoarrow ${FC_DECLARE_COMMON_OPTIONS} - URL "https://archive.apache.org/dist/arrow/apache-arrow-nanoarrow-0.6.0/apache-arrow-nanoarrow-0.6.0.tar.gz" + URL "https://dlcdn.apache.org/arrow/apache-arrow-nanoarrow-0.7.0/apache-arrow-nanoarrow-0.7.0.tar.gz" ) fetchcontent_makeavailable(nanoarrow) - set_target_properties(nanoarrow PROPERTIES OUTPUT_NAME "iceberg_vendored_nanoarrow" + set_target_properties(nanoarrow_static PROPERTIES OUTPUT_NAME "iceberg_vendored_nanoarrow" POSITION_INDEPENDENT_CODE ON) - install(TARGETS nanoarrow + install(TARGETS nanoarrow_static EXPORT iceberg_targets RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}" ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}" From ff8fa827f1051608a5c8a5b576ee0a15eb5fc527 Mon Sep 17 00:00:00 2001 From: Guotao Yu Date: Wed, 16 Jul 2025 12:21:20 +0800 Subject: [PATCH 4/5] fix format --- cmake_modules/IcebergThirdpartyToolchain.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake index 8e7284c6f..a900207a9 100644 --- a/cmake_modules/IcebergThirdpartyToolchain.cmake +++ b/cmake_modules/IcebergThirdpartyToolchain.cmake @@ -242,8 +242,9 @@ function(resolve_nanoarrow_dependency) ) fetchcontent_makeavailable(nanoarrow) - set_target_properties(nanoarrow_static PROPERTIES OUTPUT_NAME "iceberg_vendored_nanoarrow" - POSITION_INDEPENDENT_CODE ON) + set_target_properties(nanoarrow_static + PROPERTIES OUTPUT_NAME "iceberg_vendored_nanoarrow" + POSITION_INDEPENDENT_CODE ON) install(TARGETS nanoarrow_static EXPORT iceberg_targets RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}" From 1870ef76f9a13b0bae0895efdb8b3f33540baeca Mon Sep 17 00:00:00 2001 From: Guotao Yu Date: Wed, 16 Jul 2025 13:12:46 +0800 Subject: [PATCH 5/5] fix build fail in example --- src/iceberg/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/iceberg/CMakeLists.txt b/src/iceberg/CMakeLists.txt index 013fa0007..9af350971 100644 --- a/src/iceberg/CMakeLists.txt +++ b/src/iceberg/CMakeLists.txt @@ -55,24 +55,24 @@ set(ICEBERG_SHARED_INSTALL_INTERFACE_LIBS) list(APPEND ICEBERG_STATIC_BUILD_INTERFACE_LIBS - nanoarrow::nanoarrow + nanoarrow::nanoarrow_static nlohmann_json::nlohmann_json spdlog::spdlog ZLIB::ZLIB) list(APPEND ICEBERG_SHARED_BUILD_INTERFACE_LIBS - nanoarrow::nanoarrow + nanoarrow::nanoarrow_shared nlohmann_json::nlohmann_json spdlog::spdlog ZLIB::ZLIB) list(APPEND ICEBERG_STATIC_INSTALL_INTERFACE_LIBS - "Iceberg::nanoarrow" + "Iceberg::nanoarrow_static" "Iceberg::nlohmann_json" "$,Iceberg::spdlog,spdlog::spdlog>") list(APPEND ICEBERG_SHARED_INSTALL_INTERFACE_LIBS - "Iceberg::nanoarrow" + "Iceberg::nanoarrow_shared" "Iceberg::nlohmann_json" "$,Iceberg::spdlog,spdlog::spdlog>")