Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: include duckdb-rs as a submodule #2662

Merged
merged 9 commits into from
Mar 12, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -31,6 +31,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- name: Validate YAML file
run: |
# Lint the workflows and yamllint's configuration file.
@@ -44,6 +46,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: spiraldb/actions/.github/actions/[email protected]
- name: Python Lint - Format
run: uv run ruff format --check .
@@ -55,6 +59,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: ./.github/actions/cleanup
- uses: rui314/setup-mold@v1
- uses: ./.github/actions/setup-rust
@@ -113,6 +119,8 @@ jobs:
- tag=rust-docs
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: ./.github/actions/setup-rust
- name: Docs
run: cargo doc --no-deps
@@ -159,6 +167,8 @@ jobs:
steps:
- uses: runs-on/action@v1
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: rui314/setup-mold@v1
with:
targets: ${{matrix.config.target || ''}}
@@ -184,6 +194,8 @@ jobs:
steps:
- uses: runs-on/action@v1
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: rui314/setup-mold@v1
- uses: ./.github/actions/setup-c++
- uses: taiki-e/install-action@cargo-hack
@@ -203,6 +215,8 @@ jobs:
steps:
- uses: runs-on/action@v1
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: rui314/setup-mold@v1
- uses: ./.github/actions/setup-c++
- name: Rust Lint - Format
@@ -236,6 +250,8 @@ jobs:
GRCOV_OUTPUT_FILE: "target/coverage/vortex.lcov"
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: ./.github/actions/cleanup
- uses: rui314/setup-mold@v1
- uses: ./.github/actions/setup-rust
@@ -272,6 +288,8 @@ jobs:
steps:
- uses: runs-on/action@v1
- uses: actions/checkout@v4
with:
submodules: "recursive"
# rustup is pre-installed on the ubuntu24-full-x64 image.

- name: Install Codspeed
@@ -311,6 +329,8 @@ jobs:
continue-on-error: ${{ matrix.checks == 'advisories' }}
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: EmbarkStudios/cargo-deny-action@v2
with:
command: check ${{ matrix.checks }}
@@ -340,6 +360,8 @@ jobs:
steps:
- uses: rui314/setup-mold@v1
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: ./.github/actions/setup-rust
- uses: taiki-e/install-action@v2
with:
@@ -356,6 +378,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: ./.github/actions/cleanup
- uses: rui314/setup-mold@v1
- uses: ./.github/actions/setup-rust
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -4,3 +4,6 @@
[submodule "extension-ci-tools"]
path = duckdb-vortex/extension-ci-tools
url = https://github.com/duckdb/extension-ci-tools
[submodule "duckdb-vortex/duckdb-rs"]
path = duckdb-vortex/duckdb-rs
url = https://github.com/spiraldb/duckdb-rs
32 changes: 14 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ members = [
"vortex-tui",
"xtask",
]
exclude = ["wasm-test"]
exclude = ["duckdb-vortex/duckdb-rs", "wasm-test"]
resolver = "2"

[workspace.package]
@@ -81,7 +81,10 @@ datafusion-expr = { version = "46" }
datafusion-physical-expr = { version = "46" }
datafusion-physical-plan = { version = "46" }
divan = { package = "codspeed-divan-compat", version = "2.8.0" }
duckdb = "1.2.0"
duckdb = { path = "duckdb-vortex/duckdb-rs/crates/duckdb", features = [
"vtab-full",
"bundled",
] }
dyn-hash = "0.2.0"
enum-iterator = "2.0.0"
exponential-decay-histogram = "=0.1.13"
1 change: 1 addition & 0 deletions duckdb-vortex/duckdb-rs
Submodule duckdb-rs added at 4ce50f
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ docs = { workspace = true }

[tool.ruff]
line-length = 120
extend-exclude = [".venv"]
extend-exclude = [".venv", "duckdb-vortex/**"]

[tool.ruff.lint]
select = ["F", "E", "W", "UP", "I"]
1 change: 1 addition & 0 deletions taplo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include = ["**/Cargo.toml", "deny.toml"]
exclude = ["duckdb-vortex/duckdb-rs/**"]

[formatting]
allowed_blank_lines = 1
2 changes: 1 addition & 1 deletion vortex-duckdb/Cargo.toml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ vortex-dtype = { workspace = true }
vortex-error = { workspace = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
duckdb = { workspace = true, features = ["vtab-full", "bundled"] }
duckdb = { workspace = true }

[dev-dependencies]