From 1c2d1db4cc72ec7065ddc66bb4b0b6831b58e837 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 02:23:37 +0000
Subject: [PATCH 1/2] build: Fix nanoarrow download URL pattern

The current nanoarrow download logic hardcoded a specific download URL
which would break CI when a new nanoarrow version is released and the
old one is removed from the primary Apache download mirror.

This commit refactors the nanoarrow toolchain resolution to follow
the exact same pattern as the arrow dependency, which includes robust
fallback URLs (including archive.apache.org) to ensure the dependency
can always be downloaded even after newer versions are released.

The ARROW_SOURCE_URL has also been updated to include the archive
fallback URL to improve its resiliency.

Co-authored-by: wgtmac <4684607+wgtmac@users.noreply.github.com>
---
 .../IcebergThirdpartyToolchain.cmake          | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake
index e852ffe57..d5ffec782 100644
--- a/cmake_modules/IcebergThirdpartyToolchain.cmake
+++ b/cmake_modules/IcebergThirdpartyToolchain.cmake
@@ -48,6 +48,21 @@ else()
   set(ARROW_SOURCE_URL
       "https://www.apache.org/dyn/closer.lua?action=download&filename=/arrow/arrow-${ICEBERG_ARROW_BUILD_VERSION}/apache-arrow-${ICEBERG_ARROW_BUILD_VERSION}.tar.gz"
       "https://downloads.apache.org/arrow/arrow-${ICEBERG_ARROW_BUILD_VERSION}/apache-arrow-${ICEBERG_ARROW_BUILD_VERSION}.tar.gz"
+      "https://archive.apache.org/dist/arrow/arrow-${ICEBERG_ARROW_BUILD_VERSION}/apache-arrow-${ICEBERG_ARROW_BUILD_VERSION}.tar.gz"
+  )
+endif()
+
+set(ICEBERG_NANOARROW_BUILD_VERSION "0.8.0")
+set(ICEBERG_NANOARROW_BUILD_SHA256_CHECKSUM
+    "6e61e2819c9138e9092ba32b568ed6f4594928b306171937251eaaafa7dc2b8c")
+
+if(DEFINED ENV{ICEBERG_NANOARROW_URL})
+  set(NANOARROW_SOURCE_URL "$ENV{ICEBERG_NANOARROW_URL}")
+else()
+  set(NANOARROW_SOURCE_URL
+      "https://www.apache.org/dyn/closer.lua?action=download&filename=/arrow/apache-arrow-nanoarrow-${ICEBERG_NANOARROW_BUILD_VERSION}/apache-arrow-nanoarrow-${ICEBERG_NANOARROW_BUILD_VERSION}.tar.gz"
+      "https://downloads.apache.org/arrow/apache-arrow-nanoarrow-${ICEBERG_NANOARROW_BUILD_VERSION}/apache-arrow-nanoarrow-${ICEBERG_NANOARROW_BUILD_VERSION}.tar.gz"
+      "https://archive.apache.org/dist/arrow/apache-arrow-nanoarrow-${ICEBERG_NANOARROW_BUILD_VERSION}/apache-arrow-nanoarrow-${ICEBERG_NANOARROW_BUILD_VERSION}.tar.gz"
   )
 endif()
 
@@ -256,17 +271,10 @@ endfunction()
 function(resolve_nanoarrow_dependency)
   prepare_fetchcontent()
 
-  if(DEFINED ENV{ICEBERG_NANOARROW_URL})
-    set(NANOARROW_URL "$ENV{ICEBERG_NANOARROW_URL}")
-  else()
-    set(NANOARROW_URL
-        "https://dlcdn.apache.org/arrow/apache-arrow-nanoarrow-0.8.0/apache-arrow-nanoarrow-0.8.0.tar.gz"
-    )
-  endif()
-
   fetchcontent_declare(nanoarrow
                        ${FC_DECLARE_COMMON_OPTIONS}
-                       URL ${NANOARROW_URL}
+                       URL ${NANOARROW_SOURCE_URL}
+                       URL_HASH "SHA256=${ICEBERG_NANOARROW_BUILD_SHA256_CHECKSUM}"
                            FIND_PACKAGE_ARGS
                            NAMES
                            nanoarrow

From 6245ca736603f52e6cf9542afcfb2ac4faa928d8 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 02:25:44 +0000
Subject: [PATCH 2/2] build: Fix nanoarrow download URL pattern and formatting

The current nanoarrow download logic hardcoded a specific download URL
which would break CI when a new nanoarrow version is released and the
old one is removed from the primary Apache download mirror.

This commit refactors the nanoarrow toolchain resolution to follow
the exact same pattern as the arrow dependency, which includes robust
fallback URLs (including archive.apache.org) to ensure the dependency
can always be downloaded even after newer versions are released.

The ARROW_SOURCE_URL has also been updated to include the archive
fallback URL to improve its resiliency.

Additionally, this ensures proper CMake formatting based on the pre-commit checks.

Co-authored-by: wgtmac <4684607+wgtmac@users.noreply.github.com>
---
 cmake_modules/IcebergThirdpartyToolchain.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake
index d5ffec782..8b32eb749 100644
--- a/cmake_modules/IcebergThirdpartyToolchain.cmake
+++ b/cmake_modules/IcebergThirdpartyToolchain.cmake
@@ -275,10 +275,10 @@ function(resolve_nanoarrow_dependency)
                        ${FC_DECLARE_COMMON_OPTIONS}
                        URL ${NANOARROW_SOURCE_URL}
                        URL_HASH "SHA256=${ICEBERG_NANOARROW_BUILD_SHA256_CHECKSUM}"
-                           FIND_PACKAGE_ARGS
-                           NAMES
-                           nanoarrow
-                           CONFIG)
+                       FIND_PACKAGE_ARGS
+                       NAMES
+                       nanoarrow
+                       CONFIG)
   fetchcontent_makeavailable(nanoarrow)
 
   if(nanoarrow_SOURCE_DIR)