Merge origin/main into update-schema

Resolved conflicts by accepting origin/main changes for:
- src/iceberg/update/update_schema.h
- src/iceberg/update/update_schema.cc
- src/iceberg/table.h
- src/iceberg/table.cc
- src/iceberg/transaction.h
- src/iceberg/transaction.cc
- src/iceberg/update/pending_update.h

The main branch includes a more complete implementation with ApplyChangesVisitor
and additional features like ExpireSnapshots.

Author: gty404

.github/workflows/test.yml

@@ -77,9 +77,9 @@ jobs:
         shell: bash
         run: ci/scripts/build_example.sh $(pwd)/example
   windows:
-    name: AMD64 Windows 2022
-    runs-on: windows-2022
-    timeout-minutes: 30
+    name: AMD64 Windows 2025
+    runs-on: windows-2025
+    timeout-minutes: 60
     strategy:
       fail-fast: false
     steps:
@@ -89,11 +89,16 @@ jobs:
         shell: cmd
         run: |
           vcpkg install zlib:x64-windows nlohmann-json:x64-windows nanoarrow:x64-windows roaring:x64-windows cpr:x64-windows
+      - name: Setup sccache
+        uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9
       - name: Build Iceberg
         shell: cmd
+        env:
+          SCCACHE_GHA_ENABLED: "true"
         run: |
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-          bash -c "ci/scripts/build_iceberg.sh $(pwd)"
+          bash -c "ci/scripts/build_iceberg.sh $(pwd) OFF ON"
+          sccache --show-stats
       - name: Build Example
         shell: cmd
         run: |

CMakeLists.txt

@@ -69,6 +69,7 @@ endif()
 include(CMakeParseArguments)
 include(IcebergBuildUtils)
 include(IcebergSanitizer)
+include(IcebergSccache)
 include(IcebergThirdpartyToolchain)
 
 if(ICEBERG_BUILD_TESTS)

README.md

@@ -43,7 +43,6 @@ The following environment variables can be set to customize dependency URLs:
 - `ICEBERG_NANOARROW_URL`: Nanoarrow tarball URL
 - `ICEBERG_CROARING_URL`: CRoaring tarball URL
 - `ICEBERG_NLOHMANN_JSON_URL`: nlohmann-json tarball URL
-- `ICEBERG_SPDLOG_URL`: spdlog tarball URL
 - `ICEBERG_CPR_URL`: cpr tarball URL
 
 Example usage:

ci/scripts/build_iceberg.sh

@@ -22,6 +22,7 @@ set -eux
 source_dir=${1}
 build_dir=${1}/build
 build_rest_integration_test=${2:-OFF}
+build_enable_sccache=${3:-OFF}
 
 mkdir ${build_dir}
 pushd ${build_dir}
@@ -45,6 +46,11 @@ else
     CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Debug")
 fi
 
+if [[ "${build_enable_sccache}" == "ON" ]]; then
+    CMAKE_ARGS+=("-DCMAKE_CXX_COMPILER_LAUNCHER=sccache")
+    CMAKE_ARGS+=("-DCMAKE_C_COMPILER_LAUNCHER=sccache")
+fi
+
 cmake "${CMAKE_ARGS[@]}" ${source_dir}
 if is_windows; then
   cmake --build . --config Release --target install

cmake_modules/IcebergBuildUtils.cmake

@@ -157,6 +157,10 @@ function(add_iceberg_lib LIB_NAME)
                                                                 hidden
                                      VISIBILITY_INLINES_HIDDEN 1)
 
+    if(MSVC_TOOLCHAIN)
+      target_compile_options(${LIB_NAME}_shared PRIVATE /bigobj)
+    endif()
+
     install(TARGETS ${LIB_NAME}_shared
             EXPORT iceberg_targets
             ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
@@ -220,6 +224,10 @@ function(add_iceberg_lib LIB_NAME)
       target_compile_definitions(${LIB_NAME}_static PUBLIC ${VISIBILITY_NAME}_STATIC)
     endif()
 
+    if(MSVC_TOOLCHAIN)
+      target_compile_options(${LIB_NAME}_static PRIVATE /bigobj)
+    endif()
+
     install(TARGETS ${LIB_NAME}_static
             EXPORT iceberg_targets
             ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}

cmake_modules/IcebergSccache.cmake

@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+if(MSVC_TOOLCHAIN AND "${CMAKE_CXX_COMPILER_LAUNCHER}" STREQUAL "sccache")
+  message(STATUS "Configuring sccache for MSVC")
+
+  # Remove /Zi or /ZI
+  string(REGEX REPLACE "/Z[iI]" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+  string(REGEX REPLACE "/Z[iI]" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+
+  string(REGEX REPLACE "/Z[iI]" "" CMAKE_C_FLAGS_RELWITHDEBINFO
+                       "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  string(REGEX REPLACE "/Z[iI]" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
+                       "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+
+  # Add /Z7
+  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Z7")
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Z7")
+
+  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /Z7")
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Z7")
+endif()

cmake_modules/IcebergThirdpartyToolchain.cmake

@@ -31,7 +31,6 @@ set(ICEBERG_ARROW_INSTALL_INTERFACE_LIBS)
 # ICEBERG_NANOARROW_URL      - Nanoarrow tarball URL
 # ICEBERG_CROARING_URL       - CRoaring tarball URL
 # ICEBERG_NLOHMANN_JSON_URL  - nlohmann-json tarball URL
-# ICEBERG_SPDLOG_URL         - spdlog tarball URL
 # ICEBERG_CPR_URL            - cpr tarball URL
 #
 # Example usage:
@@ -427,61 +426,6 @@ function(resolve_nlohmann_json_dependency)
       PARENT_SCOPE)
 endfunction()
 
-# ----------------------------------------------------------------------
-# spdlog
-
-function(resolve_spdlog_dependency)
-  prepare_fetchcontent()
-
-  find_package(Threads REQUIRED)
-
-  set(SPDLOG_USE_STD_FORMAT
-      ON
-      CACHE BOOL "" FORCE)
-  set(SPDLOG_BUILD_PIC
-      ON
-      CACHE BOOL "" FORCE)
-
-  if(DEFINED ENV{ICEBERG_SPDLOG_URL})
-    set(SPDLOG_URL "$ENV{ICEBERG_SPDLOG_URL}")
-  else()
-    set(SPDLOG_URL "https://github.com/gabime/spdlog/archive/refs/tags/v1.15.3.tar.gz")
-  endif()
-
-  fetchcontent_declare(spdlog
-                       ${FC_DECLARE_COMMON_OPTIONS}
-                       URL ${SPDLOG_URL}
-                           FIND_PACKAGE_ARGS
-                           NAMES
-                           spdlog
-                           CONFIG)
-  fetchcontent_makeavailable(spdlog)
-
-  if(spdlog_SOURCE_DIR)
-    set_target_properties(spdlog PROPERTIES OUTPUT_NAME "iceberg_vendored_spdlog"
-                                            POSITION_INDEPENDENT_CODE ON)
-    target_link_libraries(spdlog INTERFACE Threads::Threads)
-    install(TARGETS spdlog
-            EXPORT iceberg_targets
-            RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
-            ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
-            LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
-    set(SPDLOG_VENDORED TRUE)
-  else()
-    set(SPDLOG_VENDORED FALSE)
-    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES spdlog)
-  endif()
-
-  list(APPEND ICEBERG_SYSTEM_DEPENDENCIES Threads)
-
-  set(ICEBERG_SYSTEM_DEPENDENCIES
-      ${ICEBERG_SYSTEM_DEPENDENCIES}
-      PARENT_SCOPE)
-  set(SPDLOG_VENDORED
-      ${SPDLOG_VENDORED}
-      PARENT_SCOPE)
-endfunction()
-
 # ----------------------------------------------------------------------
 # zlib
 
@@ -575,7 +519,6 @@ resolve_zlib_dependency()
 resolve_nanoarrow_dependency()
 resolve_croaring_dependency()
 resolve_nlohmann_json_dependency()
-resolve_spdlog_dependency()
 
 if(ICEBERG_BUILD_BUNDLE)
   resolve_arrow_dependency()

example/demo_example.cc

@@ -22,6 +22,7 @@
 #include "iceberg/arrow/arrow_file_io.h"
 #include "iceberg/avro/avro_register.h"
 #include "iceberg/catalog/memory/in_memory_catalog.h"
+#include "iceberg/manifest/manifest_entry.h"
 #include "iceberg/parquet/parquet_register.h"
 #include "iceberg/table.h"
 #include "iceberg/table_scan.h"

mkdocs/docs/index.md

@@ -73,9 +73,10 @@ We follow modern C++ best practices:
 - **C++23 Standard**: Use C++23 features where appropriate
 - **Naming Conventions**:
   - Classes: `PascalCase` (e.g., `TableScanBuilder`)
-  - Functions: `snake_case` (e.g., `find_field_by_name`)
+  - Functions/Methods: `PascalCase` (e.g., `CreateNamespace`, `ExtractYear`)
+  - Trivial getters: `snake_case` (e.g., `name()`, `type_id()`, `is_primitive()`)
   - Variables: `snake_case` (e.g., `file_io`)
-  - Constants: `UPPER_SNAKE_CASE` (e.g., `MAX_RETRIES`)
+  - Constants: `k` prefix with `PascalCase` (e.g., `kHeaderContentType`, `kMaxPrecision`)
 - **Memory Management**: Prefer smart pointers (`std::unique_ptr`, `std::shared_ptr`)
 - **Error Handling**: Use `Result<T>` types for error propagation
 - **Documentation**: Use Doxygen-style comments for public APIs

src/iceberg/CMakeLists.txt

@@ -20,6 +20,9 @@ set(ICEBERG_INCLUDES "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>"
 set(ICEBERG_SOURCES
     arrow_c_data_guard_internal.cc
     catalog/memory/in_memory_catalog.cc
+    data/data_writer.cc
+    data/equality_delete_writer.cc
+    data/position_delete_writer.cc
     data/writer.cc
     delete_file_index.cc
     expression/aggregate.cc
@@ -40,8 +43,10 @@ set(ICEBERG_SOURCES
     file_writer.cc
     inheritable_metadata.cc
     json_internal.cc
+    location_provider.cc
     manifest/manifest_adapter.cc
     manifest/manifest_entry.cc
+    manifest/manifest_group.cc
     manifest/manifest_list.cc
     manifest/manifest_reader.cc
     manifest/manifest_writer.cc
@@ -79,7 +84,9 @@ set(ICEBERG_SOURCES
     transform.cc
     transform_function.cc
     type.cc
+    update/expire_snapshots.cc
     update/pending_update.cc
+    update/snapshot_update.cc
     update/update_partition_spec.cc
     update/update_properties.cc
     update/update_schema.cc
@@ -94,8 +101,10 @@ set(ICEBERG_SOURCES
     util/snapshot_util.cc
     util/temporal_util.cc
     util/timepoint.cc
+    util/transform_util.cc
     util/truncate_util.cc
     util/type_util.cc
+    util/url_encoder.cc
     util/uuid.cc)
 
 set(ICEBERG_STATIC_BUILD_INTERFACE_LIBS)
@@ -108,27 +117,23 @@ list(APPEND
      nanoarrow::nanoarrow_static
      nlohmann_json::nlohmann_json
      roaring::roaring
-     spdlog::spdlog
      ZLIB::ZLIB)
 list(APPEND
      ICEBERG_SHARED_BUILD_INTERFACE_LIBS
      nanoarrow::nanoarrow_shared
      nlohmann_json::nlohmann_json
      roaring::roaring
-     spdlog::spdlog
      ZLIB::ZLIB)
 list(APPEND
      ICEBERG_STATIC_INSTALL_INTERFACE_LIBS
      "$<IF:$<BOOL:${NANOARROW_VENDORED}>,iceberg::nanoarrow_static,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_static>,nanoarrow::nanoarrow_static,nanoarrow::nanoarrow_shared>>"
      "$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>"
-     "$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>"
-     "$<IF:$<BOOL:${SPDLOG_VENDORED}>,iceberg::spdlog,spdlog::spdlog>")
+     "$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>")
 list(APPEND
      ICEBERG_SHARED_INSTALL_INTERFACE_LIBS
      "$<IF:$<BOOL:${NANOARROW_VENDORED}>,iceberg::nanoarrow_shared,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_shared>,nanoarrow::nanoarrow_shared,nanoarrow::nanoarrow_static>>"
      "$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>"
-     "$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>"
-     "$<IF:$<BOOL:${SPDLOG_VENDORED}>,iceberg::spdlog,spdlog::spdlog>")
+     "$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>")
 
 add_iceberg_lib(iceberg
                 SOURCES
@@ -159,8 +164,10 @@ add_subdirectory(util)
 if(ICEBERG_BUILD_BUNDLE)
   set(ICEBERG_BUNDLE_SOURCES
       arrow/arrow_fs_file_io.cc
+      arrow/metadata_column_util.cc
       avro/avro_data_util.cc
       avro/avro_direct_decoder.cc
+      avro/avro_direct_encoder.cc
       avro/avro_reader.cc
       avro/avro_writer.cc
       avro/avro_register.cc