Merge branch 'main' into docs_catalog_example

Author: timsaucer

.cargo/config.toml

@@ -68,7 +68,7 @@ jobs:
         with:
           python-version: "3.12"
 
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@5a095e7a2014a4212f075830d4f7277575a9d098
         with:
           enable-cache: true
 
@@ -99,7 +99,7 @@ jobs:
         run: taplo format --check
 
   check-crates-patch:
-    if: inputs.build_mode == 'release'
+    if: inputs.build_mode == 'release' && startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -112,7 +112,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@5a095e7a2014a4212f075830d4f7277575a9d098
         with:
           enable-cache: true
 
@@ -154,7 +154,7 @@ jobs:
         with:
           key: ${{ inputs.build_mode }}
 
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@5a095e7a2014a4212f075830d4f7277575a9d098
         with:
           enable-cache: true
 
@@ -222,10 +222,23 @@ jobs:
         with:
           key: ${{ inputs.build_mode }}
 
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@5a095e7a2014a4212f075830d4f7277575a9d098
         with:
           enable-cache: true
 
+      - name: Add extra swap for release build
+        if: inputs.build_mode == 'release'
+        run: |
+          set -euxo pipefail
+          sudo swapoff -a || true
+          sudo rm -f /swapfile
+          sudo fallocate -l 16G /swapfile || sudo dd if=/dev/zero of=/swapfile bs=1M count=16384
+          sudo chmod 600 /swapfile
+          sudo mkswap /swapfile
+          sudo swapon /swapfile
+          free -h
+          swapon --show
+
       - name: Build (release mode)
         uses: PyO3/maturin-action@v1
         if: inputs.build_mode == 'release'
@@ -280,7 +293,7 @@ jobs:
         with:
           key: ${{ inputs.build_mode }}
 
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@5a095e7a2014a4212f075830d4f7277575a9d098
         with:
           enable-cache: true
 
@@ -354,7 +367,7 @@ jobs:
         with:
           key: ${{ inputs.build_mode }}
 
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@5a095e7a2014a4212f075830d4f7277575a9d098
         with:
           enable-cache: true
 
@@ -478,7 +491,7 @@ jobs:
           python-version: "3.10"
 
       - name: Install dependencies
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@5a095e7a2014a4212f075830d4f7277575a9d098
         with:
           enable-cache: true
 

.github/workflows/build.yml

@@ -41,18 +41,6 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Verify example datafusion version
-        run: |
-          MAIN_VERSION=$(grep -A 1 "name = \"datafusion-common\"" Cargo.lock | grep "version = " | head -1 | sed 's/.*version = "\(.*\)"/\1/')
-          EXAMPLE_VERSION=$(grep -A 1 "name = \"datafusion-common\"" examples/datafusion-ffi-example/Cargo.lock | grep "version = " | head -1 | sed 's/.*version = "\(.*\)"/\1/')
-          echo "Main crate datafusion version: $MAIN_VERSION"
-          echo "FFI example datafusion version: $EXAMPLE_VERSION"
-
-          if [ "$MAIN_VERSION" != "$EXAMPLE_VERSION" ]; then
-            echo "❌ Error: FFI example datafusion versions don't match!"
-            exit 1
-          fi
-
       - name: Setup Python
         uses: actions/setup-python@v6
         with:
@@ -65,7 +53,7 @@ jobs:
           key: cargo-cache-${{ matrix.toolchain }}-${{ hashFiles('Cargo.lock') }}
 
       - name: Install dependencies
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@5a095e7a2014a4212f075830d4f7277575a9d098
         with:
           enable-cache: true
 
@@ -113,21 +101,14 @@ jobs:
           cd examples/datafusion-ffi-example
           uv run --no-project pytest python/tests/_test*.py
 
-      - name: Cache the generated dataset
-        id: cache-tpch-dataset
-        uses: actions/cache@v5
-        with:
-          path: benchmarks/tpch/data
-          key: tpch-data-2.18.0
-
-      - name: Run dbgen to create 1 Gb dataset
-        if: ${{ steps.cache-tpch-dataset.outputs.cache-hit != 'true' }}
+      - name: Run tpchgen-cli to create 1 Gb dataset
         run: |
-          cd benchmarks/tpch
-          RUN_IN_CI=TRUE ./tpch-gen.sh 1
+          mkdir examples/tpch/data
+          cd examples/tpch/data
+          uv pip install tpchgen-cli
+          uv run --no-project tpchgen-cli -s 1 --format=parquet
 
       - name: Run TPC-H examples
         run: |
           cd examples/tpch
-          uv run --no-project python convert_data_to_parquet.py
           uv run --no-project pytest _tests.py