From fd022b57bb33608e34f84e137cf8226df854e2c4 Mon Sep 17 00:00:00 2001 From: QP Hou Date: Sun, 24 Mar 2024 20:29:25 -0700 Subject: [PATCH 01/11] fix docker release --- .github/workflows/roapi_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/roapi_release.yml b/.github/workflows/roapi_release.yml index 030f4c968..29a52ecd9 100644 --- a/.github/workflows/roapi_release.yml +++ b/.github/workflows/roapi_release.yml @@ -273,7 +273,7 @@ jobs: images: ghcr.io/${{ github.repository_owner }}/roapi - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + uses: docker/build-push-action@v5 with: context: . push: true From ffc794c43b574151bb38825db72ab6b965c88689 Mon Sep 17 00:00:00 2001 From: QP Hou Date: Sun, 28 Apr 2024 00:03:34 -0700 Subject: [PATCH 02/11] support partition filter pushdown (#326) --- Cargo.lock | 60 ++++++++++++---------------------------------- Cargo.toml | 9 +++++++ columnq/Cargo.toml | 2 +- roapi/Cargo.toml | 2 +- 4 files changed, 26 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4069fbc0f..a313a7902 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1065,7 +1065,7 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "columnq" -version = "0.8.1" +version = "0.8.2" dependencies = [ "arrow-schema", "bytes", @@ -1090,7 +1090,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "snafu 0.8.2", + "snafu", "sqlparser 0.41.0", "tempfile", "thiserror", @@ -1405,8 +1405,7 @@ dependencies = [ [[package]] name = "datafusion" version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4328f5467f76d890fe3f924362dbc3a838c6a733f762b32d87f9e0b7bef5fb49" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" dependencies = [ "ahash 0.8.11", "arrow", @@ -1453,8 +1452,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29a7752143b446db4a2cccd9a6517293c6b97e8c39e520ca43ccd07135a4f7e" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" dependencies = [ "ahash 0.8.11", "arrow", @@ -1473,8 +1471,7 @@ dependencies = [ [[package]] name = "datafusion-execution" version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d447650af16e138c31237f53ddaef6dd4f92f0e2d3f2f35d190e16c214ca496" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" dependencies = [ "arrow", "chrono", @@ -1494,8 +1491,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d19598e48a498850fb79f97a9719b1f95e7deb64a7a06f93f313e8fa1d524b" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" dependencies = [ "ahash 0.8.11", "arrow", @@ -1510,8 +1506,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7feb0391f1fc75575acb95b74bfd276903dc37a5409fcebe160bc7ddff2010" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" dependencies = [ "arrow", "async-trait", @@ -1528,8 +1523,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e911bca609c89a54e8f014777449d8290327414d3e10c57a3e3c2122e38878d0" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" dependencies = [ "ahash 0.8.11", "arrow", @@ -1562,8 +1556,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b546b8a02e9c2ab35ac6420d511f12a4701950c1eb2e568c122b4fefb0be3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" dependencies = [ "ahash 0.8.11", "arrow", @@ -1593,8 +1586,7 @@ dependencies = [ [[package]] name = "datafusion-proto" version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5742f993d1812d6bb3cdc4ce2a0aa99e10f6dc0daa11dd69b0ff57f2d8e7518c" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" dependencies = [ "arrow", "chrono", @@ -1608,8 +1600,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d18d36f260bbbd63aafdb55339213a23d540d3419810575850ef0a798a6b768" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" dependencies = [ "arrow", "arrow-schema", @@ -3235,7 +3226,7 @@ dependencies = [ "rustls-pemfile 2.1.1", "serde", "serde_json", - "snafu 0.7.5", + "snafu", "tokio", "tracing", "url", @@ -4026,7 +4017,7 @@ dependencies = [ [[package]] name = "roapi" -version = "0.11.1" +version = "0.11.2" dependencies = [ "arrow-cast", "arrow-flight", @@ -4053,7 +4044,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "snafu 0.8.2", + "snafu", "snmalloc-rs", "tempfile", "thiserror", @@ -4668,16 +4659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" dependencies = [ "doc-comment", - "snafu-derive 0.7.5", -] - -[[package]] -name = "snafu" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" -dependencies = [ - "snafu-derive 0.8.2", + "snafu-derive", ] [[package]] @@ -4692,18 +4674,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "snafu-derive" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.53", -] - [[package]] name = "snap" version = "1.1.1" diff --git a/Cargo.toml b/Cargo.toml index cc67237a6..01cdfd045 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,3 +11,12 @@ split-debuginfo = "unpacked" [profile.release] lto = true codegen-units = 1 + +[patch.crates-io] +datafusion = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } +datafusion-common = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } +datafusion-proto = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } +datafusion-expr = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } +datafusion-physical-expr = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } +datafusion-physical-plan = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } +datafusion-sql = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } diff --git a/columnq/Cargo.toml b/columnq/Cargo.toml index 9d8a53e4e..dd4be8770 100644 --- a/columnq/Cargo.toml +++ b/columnq/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "columnq" -version = "0.8.1" +version = "0.8.2" homepage = "https://github.com/roapi/roapi" license = "MIT" authors = ["QP Hou "] diff --git a/roapi/Cargo.toml b/roapi/Cargo.toml index 0b09c933c..7e29d0aea 100644 --- a/roapi/Cargo.toml +++ b/roapi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "roapi" -version = "0.11.1" +version = "0.11.2" authors = ["QP Hou "] homepage = "https://github.com/roapi/roapi" license = "MIT" From be9b93c9d8b63fdc3af52284e05e5b314bb0c58f Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 28 Apr 2024 00:10:24 -0700 Subject: [PATCH 03/11] fix pypi release --- .github/workflows/columnq_cli_release.yml | 12 ++++++------ .github/workflows/roapi_release.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/columnq_cli_release.yml b/.github/workflows/columnq_cli_release.yml index 035d5bea3..103ee0a27 100644 --- a/.github/workflows/columnq_cli_release.yml +++ b/.github/workflows/columnq_cli_release.yml @@ -37,9 +37,9 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: - python-version: 3.6 + python-version: 3.10 - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: @@ -92,9 +92,9 @@ jobs: features: "database-sqlite" steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: - python-version: 3.6 + python-version: 3.10 architecture: ${{ matrix.platform.python-architecture }} - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -231,9 +231,9 @@ jobs: - uses: actions/download-artifact@v2 with: name: wheels - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.10 - name: Publish to PyPi env: TWINE_USERNAME: __token__ diff --git a/.github/workflows/roapi_release.yml b/.github/workflows/roapi_release.yml index 29a52ecd9..71a14467e 100644 --- a/.github/workflows/roapi_release.yml +++ b/.github/workflows/roapi_release.yml @@ -39,9 +39,9 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: - python-version: 3.6 + python-version: 3.10 - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: @@ -93,9 +93,9 @@ jobs: ] steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: - python-version: 3.6 + python-version: 3.10 architecture: ${{ matrix.platform.python-architecture }} - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -233,9 +233,9 @@ jobs: - uses: actions/download-artifact@v2 with: name: wheels - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.10 - name: Publish to PyPi env: TWINE_USERNAME: __token__ From a553521d617412afc0eda186eb34c082cd0d26a2 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 28 Apr 2024 00:16:44 -0700 Subject: [PATCH 04/11] fix python release for real --- .github/workflows/columnq_cli_release.yml | 6 +++--- .github/workflows/roapi_release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/columnq_cli_release.yml b/.github/workflows/columnq_cli_release.yml index 103ee0a27..f2bace7db 100644 --- a/.github/workflows/columnq_cli_release.yml +++ b/.github/workflows/columnq_cli_release.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: "3.10" - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: @@ -94,7 +94,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: "3.10" architecture: ${{ matrix.platform.python-architecture }} - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -233,7 +233,7 @@ jobs: name: wheels - uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: "3.10" - name: Publish to PyPi env: TWINE_USERNAME: __token__ diff --git a/.github/workflows/roapi_release.yml b/.github/workflows/roapi_release.yml index 71a14467e..73f80bd25 100644 --- a/.github/workflows/roapi_release.yml +++ b/.github/workflows/roapi_release.yml @@ -41,7 +41,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: "3.10" - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: @@ -95,7 +95,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: "3.10" architecture: ${{ matrix.platform.python-architecture }} - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -235,7 +235,7 @@ jobs: name: wheels - uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: "3.10" - name: Publish to PyPi env: TWINE_USERNAME: __token__ From 4c4999db685530ee7bf4e463a2199eeb64615fa8 Mon Sep 17 00:00:00 2001 From: QP Hou Date: Sun, 28 Apr 2024 01:03:05 -0700 Subject: [PATCH 05/11] update rust toolchain github action (#327) --- .github/workflows/build.yml | 13 +++++++------ .github/workflows/columnq_cli_release.yml | 6 +++--- .github/workflows/roapi_release.yml | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83ad1298a..5b4ce4420 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }} ${{ runner.os }}-cargo- - name: Install minimal stable with clippy and rustfmt - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: profile: default toolchain: stable @@ -69,10 +69,11 @@ jobs: database-1-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }} database-1-${{ runner.os }}-cargo- - name: Install nightly rust - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: profile: default toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }} + components: clippy override: true - name: Check run: cargo clippy --features database @@ -105,7 +106,7 @@ jobs: s3-1-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }} s3-1-${{ runner.os }}-cargo- - name: Install nightly rust - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: profile: default # toolchain: nightly @@ -166,7 +167,7 @@ jobs: s3-1-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }} s3-1-${{ runner.os }}-cargo- - name: Install nightly rust - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: profile: default # toolchain: nightly @@ -213,7 +214,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install minimal stable with clippy and rustfmt - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: profile: default toolchain: stable @@ -244,7 +245,7 @@ jobs: mac-1-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }} mac-1-${{ runner.os }}-cargo- - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }} target: aarch64-apple-darwin diff --git a/.github/workflows/columnq_cli_release.yml b/.github/workflows/columnq_cli_release.yml index f2bace7db..668d9ed25 100644 --- a/.github/workflows/columnq_cli_release.yml +++ b/.github/workflows/columnq_cli_release.yml @@ -41,10 +41,10 @@ jobs: with: python-version: "3.10" - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }} - target: aarch64-apple-darwin + target: aarch64-apple-darwin,x86_64-apple-darwin profile: minimal default: true - name: Install maturin @@ -97,7 +97,7 @@ jobs: python-version: "3.10" architecture: ${{ matrix.platform.python-architecture }} - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }} target: ${{ matrix.platform.target }} diff --git a/.github/workflows/roapi_release.yml b/.github/workflows/roapi_release.yml index 73f80bd25..3baac6e30 100644 --- a/.github/workflows/roapi_release.yml +++ b/.github/workflows/roapi_release.yml @@ -43,10 +43,10 @@ jobs: with: python-version: "3.10" - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }} - target: aarch64-apple-darwin + target: aarch64-apple-darwin,x86_64-apple-darwin profile: minimal default: true - name: Install maturin @@ -98,7 +98,7 @@ jobs: python-version: "3.10" architecture: ${{ matrix.platform.python-architecture }} - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }} target: ${{ matrix.platform.target }} From 44b7b57b2d389ecf070a45786adb205cedcc7ff4 Mon Sep 17 00:00:00 2001 From: QP Hou Date: Sun, 28 Apr 2024 12:17:43 -0700 Subject: [PATCH 06/11] fix macos python wheel release job (#328) --- .github/workflows/columnq_cli_release.yml | 1 - .github/workflows/roapi_release.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/columnq_cli_release.yml b/.github/workflows/columnq_cli_release.yml index 668d9ed25..0d74e4287 100644 --- a/.github/workflows/columnq_cli_release.yml +++ b/.github/workflows/columnq_cli_release.yml @@ -52,7 +52,6 @@ jobs: - name: Build wheels - x86_64 run: | maturin build -m columnq-cli/Cargo.toml -b bin --target x86_64-apple-darwin --release --out dist --cargo-extra-args="--features=database-sqlite" - pip install columnq-cli --no-index --find-links dist --force-reinstall - name: Build wheels - universal2 env: DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer diff --git a/.github/workflows/roapi_release.yml b/.github/workflows/roapi_release.yml index 3baac6e30..51cff332b 100644 --- a/.github/workflows/roapi_release.yml +++ b/.github/workflows/roapi_release.yml @@ -54,7 +54,6 @@ jobs: - name: Build wheels - x86_64 run: | maturin build -m roapi/Cargo.toml -b bin --target x86_64-apple-darwin --release --out dist --cargo-extra-args="--features=database-sqlite" - pip install roapi --no-index --find-links dist --force-reinstall - name: Build wheels - universal2 env: DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer From 9fbbd7fd35b85cd4ba145a1f607fb28be4aed291 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 28 Apr 2024 12:39:39 -0700 Subject: [PATCH 07/11] fix roapi release job change rule --- .github/workflows/build.yml | 2 +- .github/workflows/roapi_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b4ce4420..3f87cfbc9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ on: branches: [ main ] env: - # NOTE: the version is also defined in roapi_http_release.yml, columnq_cli_release.yml and Dockerfile + # NOTE: the version is also defined in roapi_release.yml, columnq_cli_release.yml and Dockerfile RUST_TC_NIGHTLY_VER: "2024-03-01" jobs: diff --git a/.github/workflows/roapi_release.yml b/.github/workflows/roapi_release.yml index 51cff332b..98a514e8c 100644 --- a/.github/workflows/roapi_release.yml +++ b/.github/workflows/roapi_release.yml @@ -3,7 +3,7 @@ name: roapi release on: push: paths: - - '.github/workflows/roapi_http_release.yml' + - '.github/workflows/roapi_release.yml' - 'columnq/**' - 'roapi/**' - 'Cargo.lock' From 5ff5ef76d00709ad7c0446f09e7f598374a97476 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 28 Apr 2024 15:49:01 -0700 Subject: [PATCH 08/11] bump columnq-cli version --- Cargo.lock | 2 +- columnq-cli/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a313a7902..ee03e74ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1104,7 +1104,7 @@ dependencies = [ [[package]] name = "columnq-cli" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "clap", diff --git a/columnq-cli/Cargo.toml b/columnq-cli/Cargo.toml index 907694c2a..335cd299f 100644 --- a/columnq-cli/Cargo.toml +++ b/columnq-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "columnq-cli" -version = "0.4.0" +version = "0.5.0" homepage = "https://github.com/roapi/roapi" license = "MIT" readme = "README.md" From 98b46f2ad5f140356e5ff196b5b164031c2344fc Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 28 Apr 2024 16:30:12 -0700 Subject: [PATCH 09/11] fix build cache export --- .github/workflows/roapi_release.yml | 4 +++- Cargo.lock | 2 +- roapi/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/roapi_release.yml b/.github/workflows/roapi_release.yml index 98a514e8c..f8db591b2 100644 --- a/.github/workflows/roapi_release.yml +++ b/.github/workflows/roapi_release.yml @@ -253,7 +253,9 @@ jobs: packages: write steps: - uses: actions/checkout@v2 - + # buildx setup required for build cache export + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Log in to the Container registry uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 with: diff --git a/Cargo.lock b/Cargo.lock index ee03e74ba..1a73e273d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4017,7 +4017,7 @@ dependencies = [ [[package]] name = "roapi" -version = "0.11.2" +version = "0.11.3" dependencies = [ "arrow-cast", "arrow-flight", diff --git a/roapi/Cargo.toml b/roapi/Cargo.toml index 7e29d0aea..6bbf915c7 100644 --- a/roapi/Cargo.toml +++ b/roapi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "roapi" -version = "0.11.2" +version = "0.11.3" authors = ["QP Hou "] homepage = "https://github.com/roapi/roapi" license = "MIT" From 40682d733af7f8140c80674fa3378947a3921680 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 28 Apr 2024 23:09:32 -0700 Subject: [PATCH 10/11] bump datafusion for partition filter fix --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 18 +++++++++++------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a73e273d..aa5d94fca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1405,7 +1405,7 @@ dependencies = [ [[package]] name = "datafusion" version = "35.0.0" -source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=4c4a77fb604bd1d74093da41b8b40f49549e8f84#4c4a77fb604bd1d74093da41b8b40f49549e8f84" dependencies = [ "ahash 0.8.11", "arrow", @@ -1452,7 +1452,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "35.0.0" -source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=4c4a77fb604bd1d74093da41b8b40f49549e8f84#4c4a77fb604bd1d74093da41b8b40f49549e8f84" dependencies = [ "ahash 0.8.11", "arrow", @@ -1471,7 +1471,7 @@ dependencies = [ [[package]] name = "datafusion-execution" version = "35.0.0" -source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=4c4a77fb604bd1d74093da41b8b40f49549e8f84#4c4a77fb604bd1d74093da41b8b40f49549e8f84" dependencies = [ "arrow", "chrono", @@ -1491,7 +1491,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "35.0.0" -source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=4c4a77fb604bd1d74093da41b8b40f49549e8f84#4c4a77fb604bd1d74093da41b8b40f49549e8f84" dependencies = [ "ahash 0.8.11", "arrow", @@ -1506,7 +1506,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "35.0.0" -source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=4c4a77fb604bd1d74093da41b8b40f49549e8f84#4c4a77fb604bd1d74093da41b8b40f49549e8f84" dependencies = [ "arrow", "async-trait", @@ -1523,7 +1523,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "35.0.0" -source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=4c4a77fb604bd1d74093da41b8b40f49549e8f84#4c4a77fb604bd1d74093da41b8b40f49549e8f84" dependencies = [ "ahash 0.8.11", "arrow", @@ -1556,7 +1556,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "35.0.0" -source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=4c4a77fb604bd1d74093da41b8b40f49549e8f84#4c4a77fb604bd1d74093da41b8b40f49549e8f84" dependencies = [ "ahash 0.8.11", "arrow", @@ -1586,7 +1586,7 @@ dependencies = [ [[package]] name = "datafusion-proto" version = "35.0.0" -source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=4c4a77fb604bd1d74093da41b8b40f49549e8f84#4c4a77fb604bd1d74093da41b8b40f49549e8f84" dependencies = [ "arrow", "chrono", @@ -1600,7 +1600,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "35.0.0" -source = "git+https://github.com/roapi/arrow-datafusion.git?rev=3873cc92cec9e0653362f1777035cd18a2e738b3#3873cc92cec9e0653362f1777035cd18a2e738b3" +source = "git+https://github.com/roapi/arrow-datafusion.git?rev=4c4a77fb604bd1d74093da41b8b40f49549e8f84#4c4a77fb604bd1d74093da41b8b40f49549e8f84" dependencies = [ "arrow", "arrow-schema", diff --git a/Cargo.toml b/Cargo.toml index 01cdfd045..20f5580b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,11 +12,15 @@ split-debuginfo = "unpacked" lto = true codegen-units = 1 +#[patch."https://github.com/sfu-db/connector-x.git"] +#connectorx = { path = "/home/houqp/Documents/code/roapi/connector-x/connectorx" } + [patch.crates-io] -datafusion = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } -datafusion-common = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } -datafusion-proto = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } -datafusion-expr = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } -datafusion-physical-expr = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } -datafusion-physical-plan = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } -datafusion-sql = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "3873cc92cec9e0653362f1777035cd18a2e738b3" } +datafusion = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "4c4a77fb604bd1d74093da41b8b40f49549e8f84" } +datafusion-common = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "4c4a77fb604bd1d74093da41b8b40f49549e8f84" } +datafusion-proto = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "4c4a77fb604bd1d74093da41b8b40f49549e8f84" } +datafusion-expr = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "4c4a77fb604bd1d74093da41b8b40f49549e8f84" } +datafusion-physical-expr = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "4c4a77fb604bd1d74093da41b8b40f49549e8f84" } +datafusion-physical-plan = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "4c4a77fb604bd1d74093da41b8b40f49549e8f84" } +datafusion-sql = { git = "https://github.com/roapi/arrow-datafusion.git", rev = "4c4a77fb604bd1d74093da41b8b40f49549e8f84" } +# object_store = { path = "/home/houqp/Documents/code/delta/arrow-rs/object_store" } From 76400b1d6001636a27532d4be9eba2f92dd917c9 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 28 Apr 2024 23:27:27 -0700 Subject: [PATCH 11/11] bump columnq-cli version --- Cargo.lock | 2 +- columnq-cli/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aa5d94fca..321ca1eba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1104,7 +1104,7 @@ dependencies = [ [[package]] name = "columnq-cli" -version = "0.5.0" +version = "0.5.2" dependencies = [ "anyhow", "clap", diff --git a/columnq-cli/Cargo.toml b/columnq-cli/Cargo.toml index 335cd299f..2fa334452 100644 --- a/columnq-cli/Cargo.toml +++ b/columnq-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "columnq-cli" -version = "0.5.0" +version = "0.5.2" homepage = "https://github.com/roapi/roapi" license = "MIT" readme = "README.md"