fix ci

Author: wgtmac

.clang-tidy

@@ -21,7 +21,6 @@ Checks: |
   clang-analyzer-*,
   google-*,
   modernize-*,
-  misc-include-cleaner,
   readability-identifier-naming,
   readability-isolate-declaration,
   -modernize-use-nodiscard,
@@ -42,7 +41,5 @@ CheckOptions:
     value:  '_'
   - key:    modernize-use-scoped-lock.WarnOnSingleLocks
     value:  'false'
-  - key:    misc-include-cleaner.IgnoreHeaders
-    value:  'arrow/.*;avro/.*;aws/.*;cpr/.*;gmock/.*;gtest/.*;nanoarrow/.*;nlohmann/.*;parquet/.*;roaring/.*;spdlog/.*;sqlpp23/.*;thrift/.*'
 
 HeaderFilterRegex: 'src/iceberg|example'

.github/workflows/aws_test.yml

@@ -137,78 +137,3 @@ jobs:
         with:
           path: ${{ github.workspace }}/.sccache
           key: sccache-aws-${{ matrix.runs-on }}-bundle${{ matrix.bundle_awssdk }}-s3${{ matrix.s3 }}-sigv4${{ matrix.sigv4 }}-${{ github.run_id }}
-
-  # Exercise the Meson build with SigV4 enabled (resolves aws-cpp-sdk-core via
-  # its CMake config, not pkg-config whose Cflags force -std=c++11).
-  meson-sigv4:
-    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
-    name: Meson SigV4 (AMD64 Ubuntu 26.04)
-    runs-on: ubuntu-26.04
-    timeout-minutes: 45
-    env:
-      SCCACHE_DIR: ${{ github.workspace }}/.sccache
-      SCCACHE_CACHE_SIZE: "2G"
-    steps:
-      - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
-        with:
-          python-version: '3.x'
-      - name: Checkout iceberg-cpp
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-      - name: Install build dependencies
-        shell: bash
-        run: |
-          sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev libjitterentropy3-dev
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements.txt
-      - name: Cache vcpkg packages
-        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        id: vcpkg-cache
-        with:
-          path: /usr/local/share/vcpkg/installed
-          key: vcpkg-x64-linux-aws-sdk-cpp-core-${{ hashFiles('.github/workflows/aws_test.yml') }}
-      - name: Install AWS SDK via vcpkg
-        if: ${{ steps.vcpkg-cache.outputs.cache-hit != 'true' }}
-        shell: bash
-        # Retry to ride out transient GitHub/mirror download failures (504s).
-        run: |
-          for attempt in 1 2 3; do
-            if vcpkg install aws-sdk-cpp[core]:x64-linux; then
-              exit 0
-            fi
-            echo "::warning::vcpkg install failed (attempt ${attempt}/3), retrying in 30s"
-            sleep 30
-          done
-          echo "::error::vcpkg install failed after 3 attempts"
-          exit 1
-      - name: Set Ubuntu Compilers
-        # Wrap the compiler with sccache: Meson uses an explicit CC/CXX verbatim,
-        # so the launcher must be prepended here to route compiles through sccache.
-        run: |
-          echo "CC=sccache gcc-14" >> $GITHUB_ENV
-          echo "CXX=sccache g++-14" >> $GITHUB_ENV
-      - name: Restore sccache cache
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: ${{ github.workspace }}/.sccache
-          key: sccache-meson-sigv4-${{ github.run_id }}
-          restore-keys: |
-            sccache-meson-sigv4-
-      - name: Setup sccache
-        uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10
-      - name: Build and test Iceberg
-        shell: bash
-        env:
-          CMAKE_PREFIX_PATH: /usr/local/share/vcpkg/installed/x64-linux
-        run: |
-          meson setup builddir -Dsigv4=enabled
-          meson compile -C builddir
-          sccache --show-stats
-          meson test -C builddir --timeout-multiplier 0 --print-errorlogs
-      - name: Save sccache cache
-        if: github.ref == 'refs/heads/main'
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: ${{ github.workspace }}/.sccache
-          key: sccache-meson-sigv4-${{ github.run_id }}

src/iceberg/transaction.cc

@@ -87,7 +87,8 @@ const TableMetadata& TransactionContext::current() const {
   return metadata_builder->current();
 }
 
-Result<std::unique_ptr<LocationProvider>> TransactionContext::LocationProvider() const {
+Result<std::unique_ptr<LocationProvider>> TransactionContext::NewLocationProvider()
+    const {
   return iceberg::LocationProvider::Make(current().location, current().properties);
 }
 

src/iceberg/transaction.h

@@ -188,7 +188,7 @@ class ICEBERG_EXPORT TransactionContext {
   const TableMetadata* base() const;
   const TableMetadata& current() const;
   std::string MetadataFileLocation(std::string_view filename) const;
-  Result<std::unique_ptr<LocationProvider>> LocationProvider() const;
+  Result<std::unique_ptr<LocationProvider>> NewLocationProvider() const;
 
   std::shared_ptr<Table> table;
   std::unique_ptr<TableMetadataBuilder> metadata_builder;

src/iceberg/update/merging_snapshot_update.cc

@@ -816,7 +816,7 @@ MergingSnapshotUpdate::MergeDVs() {
     return result;
   }
 
-  ICEBERG_ASSIGN_OR_RAISE(auto location_provider, ctx_->LocationProvider());
+  ICEBERG_ASSIGN_OR_RAISE(auto location_provider, ctx_->NewLocationProvider());
   auto output_path = location_provider->NewDataLocation(
       std::format("merged-dvs-{}-{}.puffin", SnapshotId(), ++dv_merge_attempt_));