resolve conflict

sfu-db · Mar 29, 2024 · cb29067 · cb29067
2 parents 739b8b5 + 6493400
commit cb29067
Show file tree

Hide file tree

Showing 71 changed files with 5,159 additions and 2,764 deletions.
diff --git a/.github/config/db1.json b/.github/config/db1.json
@@ -0,0 +1,15 @@
+{
+    "driver": "org.postgresql.Driver",
+    "url": "jdbc:postgresql://postgres:5432/postgres",
+    "username": "postgres",
+    "password": "postgres",
+    "costParams": {
+        "join": 10.0,
+        "agg": 20.0,
+        "sort": 20.0,
+        "trans": 3.0
+    },
+    "dialect": "postgres",
+    "cardEstType": "postgres",
+    "partitionType": "postgres"
+}
diff --git a/.github/config/db2.json b/.github/config/db2.json
@@ -0,0 +1,15 @@
+{
+    "driver": "org.postgresql.Driver",
+    "url": "jdbc:postgresql://postgres:5432/postgres",
+    "username": "postgres",
+    "password": "postgres",
+    "costParams": {
+        "join": 10.0,
+        "agg": 20.0,
+        "sort": 20.0,
+        "trans": 3.0
+    },
+    "dialect": "postgres",
+    "cardEstType": "postgres",
+    "partitionType": "postgres"
+}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,26 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: '/'
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: weekly
+
+  # copy over from https://github.com/pola-rs/polars/blob/main/.github/dependabot.yml
+  # Rust Polars
+  - package-ecosystem: cargo
+    directory: '/'
+    schedule:
+      interval: weekly
+    #ignore:
+    #  - dependency-name: '*'
+    #    update-types: ['version-update:semver-patch']
+    commit-message:
+      prefix: build(rust)
+      prefix-development: chore(rust)
+    #labels: ['skip changelog']
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -14,7 +14,7 @@ jobs:
   benchmark:
     runs-on: [self-hosted, linux, x64, connectorx-benchmark]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install tools
         run: |
@@ -26,7 +26,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.71.1
+          toolchain: stable
           components: rustfmt
           default: true
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
   #         --health-timeout 5s
   #         --health-retries 20
   #   steps:
-  #     - uses: actions/checkout@v2
+  #     - uses: actions/checkout@v4
 
   #     - name: Install tools
   #       run: |
@@ -69,11 +69,11 @@ jobs:
   #     - name: Install Rust
   #       uses: actions-rs/toolchain@v1
   #       with:
-  #         toolchain: 1.71.1
+  #         toolchain: stable
   #         components: rustfmt
   #         default: true
 
-  #     - uses: actions/cache@v2
+  #     - uses: actions/cache@v4
   #       with:
   #         path: |
   #           ~/.cargo/bin/
@@ -176,7 +176,7 @@ jobs:
           --health-retries 20
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install tools
         run: |
@@ -191,16 +191,16 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.71.1
+          toolchain: stable
           components: rustfmt
           default: true
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "8"
+          java-version: "17"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -238,7 +238,7 @@ jobs:
           args: --features all --all
 
       - name: Cache venv
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pypoetry/virtualenvs
           key: ${{ runner.os }}-venv-${{ secrets.CACHE_VERSION }}-${{ hashFiles('connectorx-python/poetry.lock') }}
@@ -255,4 +255,5 @@ jobs:
           MSSQL_URL: "mssql://sa:mssql!Password@mssql:1433/tempdb"
           DB1: "postgresql://postgres:postgres@postgres:5432/postgres"
           DB2: "postgresql://postgres:postgres@postgres:5432/postgres"
+          FED_CONFIG_PATH: ${{ github.workspace }}/.github/config
           SQLITE3_STATIC: 1
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -9,17 +9,17 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.71.1
+          toolchain: stable
           components: rustfmt
           default: true
 
       - name: Intall Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: 3.7
 
@@ -46,7 +46,7 @@ jobs:
         run: touch ./docs/_build/html/.nojekyll
 
       - name: Deploy Docs 🚀
-        uses: JamesIves/github-pages-deploy-action@4.0.0
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: ./docs/_build/html # The folder the action should deploy.

diff --git a/.github/workflows/import-test.yml b/.github/workflows/import-test.yml
@@ -20,10 +20,10 @@ jobs:
         os: [ubuntu-latest, macos-10.15, windows-latest]
         python-version: ["3.7", "3.8", "3.9", "3.10"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,24 +14,24 @@ jobs:
       matrix:
         python-version: [[38, "3.8"], [39, "3.9"], [310, "3.10"], [311, "3.11"]]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set python version
         run: |
           echo "/opt/python/cp${{ matrix.python-version[0] }}-cp${{ matrix.python-version[0] }}/bin" >> $GITHUB_PATH
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.71.1
+          toolchain: stable
           components: rustfmt
           target: aarch64-unknown-linux-gnu
           default: true
 
-      - uses: extractions/setup-just@v1
+      - uses: extractions/setup-just@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: Gr1N/setup-poetry@v8
+      - uses: Gr1N/setup-poetry@v9
 
       - name: Install tools
         run: |
@@ -44,7 +44,8 @@ jobs:
 
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.71.1
+          rust-toolchain: stable
+          maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
         env:
@@ -57,13 +58,14 @@ jobs:
       # rebuild the wheel to incorporate j4rs dependencies
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.71.1
+          rust-toolchain: stable
+          maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: "ubuntu-latest-${{ matrix.python-version[1] }}"
           path: connectorx-python/target/wheels/*.whl
@@ -139,36 +141,37 @@ jobs:
           - os: "macos-latest"
             features: "--features integrated-auth-gssapi"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: ankane/setup-mysql@v1
         with:
           mysql-version: 8
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.71.1
+          toolchain: stable
           components: rustfmt
           default: true
 
-      - uses: extractions/setup-just@v1
+      - uses: extractions/setup-just@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: Gr1N/setup-poetry@v8
+      - uses: Gr1N/setup-poetry@v9
 
       - name: Setup project
         run: |
           just bootstrap-python
 
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.71.1
+          rust-toolchain: stable
+          maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
         env:
@@ -181,13 +184,14 @@ jobs:
       # rebuild the wheel to incorporate j4rs dependencies
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.71.1
+          rust-toolchain: stable
+          maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
         env:
           SQLITE3_STATIC: 1
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.os }}-${{ matrix.python-version }}"
           path: connectorx-python/target/wheels/*.whl
@@ -198,36 +202,37 @@ jobs:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: ankane/setup-mysql@v1
         with:
           mysql-version: 8
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.71.1
+          toolchain: stable
           components: rustfmt
           target: aarch64-apple-darwin
           default: true
 
-      - uses: extractions/setup-just@v1
+      - uses: extractions/setup-just@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: Gr1N/setup-poetry@v8
+      - uses: Gr1N/setup-poetry@v9
 
       - name: Setup project
         run: |
           just bootstrap-python
 
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.71.1
+          rust-toolchain: stable
+          maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release  --features integrated-auth-gssapi
         env:
@@ -240,13 +245,14 @@ jobs:
       # rebuild the wheel to incorporate j4rs dependencies
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.71.1
+          rust-toolchain: stable
+          maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release  --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: "macos-${{ matrix.python-version }}"
           path: connectorx-python/target/wheels/*.whl
@@ -260,14 +266,14 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
         os: [macos-latest, ubuntu-latest, windows-latest]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: "${{ matrix.os }}-${{ matrix.python-version }}"
 
@@ -280,7 +286,7 @@ jobs:
     needs: [verify]
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Setup environment
         run: |