Merge branch 'main' into test/integration-rest

Author: HeartLinked

.devcontainer/Dockerfile.template

@@ -26,10 +26,11 @@ RUN apt update && \
     bash-completion \
     build-essential \
     ccache \
+    clangd \
     cmake \
     curl \
-    gcc \
-    g++ \
+    gcc-14 \
+    g++-14 \
     git \
     htop \
     libboost-all-dev \

.github/workflows/cpp-linter.yml

@@ -36,6 +36,9 @@ jobs:
         shell: bash
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Run build
+        env:
+          CC: gcc-14
+          CXX: g++-14
         run: |
           mkdir build && cd build
           cmake .. -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
@@ -54,7 +57,8 @@ jobs:
           thread-comments: true
           ignore: 'build|cmake_modules|ci'
           database: build
-          extra-args: '-I$PWD/src -I$PWD/build/src'
+          # need '-fno-builtin-std-forward_like', see https://github.com/llvm/llvm-project/issues/101614
+          extra-args: '-I$PWD/src -I$PWD/build/src -fno-builtin-std-forward_like'
       - name: Fail fast?!
         if: steps.linter.outputs.checks-failed != 0
         run: |

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ permissions:
 
 jobs:
   docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v6.0.0

.github/workflows/license_check.yml

@@ -22,7 +22,7 @@ on: pull_request
 jobs:
   license-check:
     name: "License Check"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

.github/workflows/rc.yml

@@ -30,7 +30,7 @@ permissions:
 jobs:
   archive:
     name: Archive
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
     steps:
       - name: Checkout
@@ -77,6 +77,10 @@ jobs:
           - macos-26
           - ubuntu-24.04
           # - windows-latest
+        include:
+          - os: ubuntu-24.04
+            CC: gcc-14
+            CXX: g++-14
     steps:
       - name: Checkout
         uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
@@ -85,6 +89,12 @@ jobs:
         with:
           name: archive
 
+      - name: Set Ubuntu Compilers
+        if: ${{ startsWith(matrix.runs-on, 'ubuntu') }}
+        run: |
+          echo "CC=${{ matrix.CC }}" >> $GITHUB_ENV
+          echo "CXX=${{ matrix.CXX }}" >> $GITHUB_ENV
+
       - name: Verify
         run: |
           tar_gz=$(echo apache-iceberg-cpp-*.tar.gz)
@@ -109,7 +119,7 @@ jobs:
     if: github.ref_type == 'tag'
     needs:
       - verify
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
     steps:

.github/workflows/sanitizer_test.yml

@@ -46,6 +46,9 @@ jobs:
         shell: bash
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Configure and Build with ASAN & UBSAN
+        env:
+          CC: gcc-14
+          CXX: g++-14
         run: |
           mkdir build && cd build
           cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Debug -DICEBERG_ENABLE_ASAN=ON -DICEBERG_ENABLE_UBSAN=ON

.github/workflows/test.yml

@@ -54,6 +54,9 @@ jobs:
         run: ci/scripts/build_iceberg.sh $(pwd) ON
       - name: Build Example
         shell: bash
+        env:
+          CC: gcc-14
+          CXX: g++-14
         run: ci/scripts/build_example.sh $(pwd)/example
   macos:
     name: AArch64 macOS 26
@@ -102,6 +105,8 @@ jobs:
         include:
           - title: AMD64 Ubuntu 24.04
             runs-on: ubuntu-24.04
+            CC: gcc-14
+            CXX: g++-14
           - title: AMD64 Windows 2025
             runs-on: windows-2025
             meson-setup-args: --vsenv
@@ -117,6 +122,11 @@ jobs:
         run: |
           python3 -m pip install --upgrade pip
           python3 -m pip install -r requirements.txt
+      - name: Set Ubuntu Compilers
+        if: ${{ startsWith(matrix.runs-on, 'ubuntu') }}
+        run: |
+          echo "CC=${{ matrix.CC }}" >> $GITHUB_ENV
+          echo "CXX=${{ matrix.CXX }}" >> $GITHUB_ENV
       - name: Build Iceberg
         run: |
           meson setup builddir ${{ matrix.meson-setup-args || '' }}

cmake_modules/IcebergThirdpartyToolchain.cmake

@@ -97,6 +97,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)
 
   fetchcontent_declare(VendoredArrow
                        ${FC_DECLARE_COMMON_OPTIONS}
@@ -323,7 +324,7 @@ function(resolve_croaring_dependency)
     set(CROARING_URL "$ENV{ICEBERG_CROARING_URL}")
   else()
     set(CROARING_URL
-        "https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.3.11.tar.gz")
+        "https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.4.3.tar.gz")
   endif()
 
   fetchcontent_declare(croaring
@@ -542,7 +543,7 @@ function(resolve_cpr_dependency)
             RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
             ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
             LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
-    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL)
+    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL CURL)
   else()
     set(CPR_VENDORED FALSE)
     list(APPEND ICEBERG_SYSTEM_DEPENDENCIES cpr)

src/iceberg/CMakeLists.txt

@@ -20,6 +20,7 @@ set(ICEBERG_INCLUDES "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>"
 set(ICEBERG_SOURCES
     arrow_c_data_guard_internal.cc
     catalog/memory/in_memory_catalog.cc
+    expression/aggregate.cc
     expression/binder.cc
     expression/evaluator.cc
     expression/expression.cc

src/iceberg/catalog/rest/error_handlers.h

@@ -71,7 +71,7 @@ class ICEBERG_REST_EXPORT NamespaceErrorHandler : public DefaultErrorHandler {
 };
 
 /// \brief Error handler for drop namespace operations.
-class ICEBERG_REST_EXPORT DropNamespaceErrorHandler : public NamespaceErrorHandler {
+class ICEBERG_REST_EXPORT DropNamespaceErrorHandler final : public NamespaceErrorHandler {
  public:
   /// \brief Returns the singleton instance
   static const std::shared_ptr<DropNamespaceErrorHandler>& Instance();
@@ -83,7 +83,7 @@ class ICEBERG_REST_EXPORT DropNamespaceErrorHandler : public NamespaceErrorHandl
 };
 
 /// \brief Table-level error handler.
-class ICEBERG_REST_EXPORT TableErrorHandler : public DefaultErrorHandler {
+class ICEBERG_REST_EXPORT TableErrorHandler final : public DefaultErrorHandler {
  public:
   /// \brief Returns the singleton instance
   static const std::shared_ptr<TableErrorHandler>& Instance();
@@ -95,7 +95,7 @@ class ICEBERG_REST_EXPORT TableErrorHandler : public DefaultErrorHandler {
 };
 
 /// \brief View-level error handler.
-class ICEBERG_REST_EXPORT ViewErrorHandler : public DefaultErrorHandler {
+class ICEBERG_REST_EXPORT ViewErrorHandler final : public DefaultErrorHandler {
  public:
   /// \brief Returns the singleton instance
   static const std::shared_ptr<ViewErrorHandler>& Instance();
@@ -107,7 +107,7 @@ class ICEBERG_REST_EXPORT ViewErrorHandler : public DefaultErrorHandler {
 };
 
 /// \brief Table commit operation error handler.
-class ICEBERG_REST_EXPORT TableCommitErrorHandler : public DefaultErrorHandler {
+class ICEBERG_REST_EXPORT TableCommitErrorHandler final : public DefaultErrorHandler {
  public:
   /// \brief Returns the singleton instance
   static const std::shared_ptr<TableCommitErrorHandler>& Instance();
@@ -119,7 +119,7 @@ class ICEBERG_REST_EXPORT TableCommitErrorHandler : public DefaultErrorHandler {
 };
 
 /// \brief View commit operation error handler.
-class ICEBERG_REST_EXPORT ViewCommitErrorHandler : public DefaultErrorHandler {
+class ICEBERG_REST_EXPORT ViewCommitErrorHandler final : public DefaultErrorHandler {
  public:
   /// \brief Returns the singleton instance
   static const std::shared_ptr<ViewCommitErrorHandler>& Instance();