Skip to content

Commit 281c5d9

Browse files
authored
feat: include duckdb-rs as a submodule (#2662)
1 parent d292c65 commit 281c5d9

File tree

8 files changed

+50
-22
lines changed

8 files changed

+50
-22
lines changed

.github/workflows/ci.yml

+24
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- uses: actions/checkout@v4
34+
with:
35+
submodules: "recursive"
3436
- name: Validate YAML file
3537
run: |
3638
# Lint the workflows and yamllint's configuration file.
@@ -44,6 +46,8 @@ jobs:
4446
runs-on: ubuntu-latest
4547
steps:
4648
- uses: actions/checkout@v4
49+
with:
50+
submodules: "recursive"
4751
- uses: spiraldb/actions/.github/actions/[email protected]
4852
- name: Python Lint - Format
4953
run: uv run ruff format --check .
@@ -55,6 +59,8 @@ jobs:
5559
runs-on: ubuntu-latest
5660
steps:
5761
- uses: actions/checkout@v4
62+
with:
63+
submodules: "recursive"
5864
- uses: ./.github/actions/cleanup
5965
- uses: rui314/setup-mold@v1
6066
- uses: ./.github/actions/setup-rust
@@ -113,6 +119,8 @@ jobs:
113119
- tag=rust-docs
114120
steps:
115121
- uses: actions/checkout@v4
122+
with:
123+
submodules: "recursive"
116124
- uses: ./.github/actions/setup-rust
117125
- name: Docs
118126
run: cargo doc --no-deps
@@ -159,6 +167,8 @@ jobs:
159167
steps:
160168
- uses: runs-on/action@v1
161169
- uses: actions/checkout@v4
170+
with:
171+
submodules: "recursive"
162172
- uses: rui314/setup-mold@v1
163173
with:
164174
targets: ${{matrix.config.target || ''}}
@@ -184,6 +194,8 @@ jobs:
184194
steps:
185195
- uses: runs-on/action@v1
186196
- uses: actions/checkout@v4
197+
with:
198+
submodules: "recursive"
187199
- uses: rui314/setup-mold@v1
188200
- uses: ./.github/actions/setup-c++
189201
- uses: taiki-e/install-action@cargo-hack
@@ -203,6 +215,8 @@ jobs:
203215
steps:
204216
- uses: runs-on/action@v1
205217
- uses: actions/checkout@v4
218+
with:
219+
submodules: "recursive"
206220
- uses: rui314/setup-mold@v1
207221
- uses: ./.github/actions/setup-c++
208222
- name: Rust Lint - Format
@@ -236,6 +250,8 @@ jobs:
236250
GRCOV_OUTPUT_FILE: "target/coverage/vortex.lcov"
237251
steps:
238252
- uses: actions/checkout@v4
253+
with:
254+
submodules: "recursive"
239255
- uses: ./.github/actions/cleanup
240256
- uses: rui314/setup-mold@v1
241257
- uses: ./.github/actions/setup-rust
@@ -272,6 +288,8 @@ jobs:
272288
steps:
273289
- uses: runs-on/action@v1
274290
- uses: actions/checkout@v4
291+
with:
292+
submodules: "recursive"
275293
# rustup is pre-installed on the ubuntu24-full-x64 image.
276294

277295
- name: Install Codspeed
@@ -311,6 +329,8 @@ jobs:
311329
continue-on-error: ${{ matrix.checks == 'advisories' }}
312330
steps:
313331
- uses: actions/checkout@v4
332+
with:
333+
submodules: "recursive"
314334
- uses: EmbarkStudios/cargo-deny-action@v2
315335
with:
316336
command: check ${{ matrix.checks }}
@@ -340,6 +360,8 @@ jobs:
340360
steps:
341361
- uses: rui314/setup-mold@v1
342362
- uses: actions/checkout@v4
363+
with:
364+
submodules: "recursive"
343365
- uses: ./.github/actions/setup-rust
344366
- uses: taiki-e/install-action@v2
345367
with:
@@ -356,6 +378,8 @@ jobs:
356378
runs-on: ubuntu-latest
357379
steps:
358380
- uses: actions/checkout@v4
381+
with:
382+
submodules: "recursive"
359383
- uses: ./.github/actions/cleanup
360384
- uses: rui314/setup-mold@v1
361385
- uses: ./.github/actions/setup-rust

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "extension-ci-tools"]
55
path = duckdb-vortex/extension-ci-tools
66
url = https://github.com/duckdb/extension-ci-tools
7+
[submodule "duckdb-vortex/duckdb-rs"]
8+
path = duckdb-vortex/duckdb-rs
9+
url = https://github.com/spiraldb/duckdb-rs

Cargo.lock

+14-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+5-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ members = [
2626
"vortex-tui",
2727
"xtask",
2828
]
29-
exclude = ["wasm-test"]
29+
exclude = ["duckdb-vortex/duckdb-rs", "wasm-test"]
3030
resolver = "2"
3131

3232
[workspace.package]
@@ -81,7 +81,10 @@ datafusion-expr = { version = "46" }
8181
datafusion-physical-expr = { version = "46" }
8282
datafusion-physical-plan = { version = "46" }
8383
divan = { package = "codspeed-divan-compat", version = "2.8.0" }
84-
duckdb = "1.2.0"
84+
duckdb = { path = "duckdb-vortex/duckdb-rs/crates/duckdb", features = [
85+
"vtab-full",
86+
"bundled",
87+
] }
8588
dyn-hash = "0.2.0"
8689
enum-iterator = "2.0.0"
8790
exponential-decay-histogram = "=0.1.13"

duckdb-vortex/duckdb-rs

Submodule duckdb-rs added at 4ce50fa

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ docs = { workspace = true }
4040

4141
[tool.ruff]
4242
line-length = 120
43-
extend-exclude = [".venv"]
43+
extend-exclude = [".venv", "duckdb-vortex/**"]
4444

4545
[tool.ruff.lint]
4646
select = ["F", "E", "W", "UP", "I"]

taplo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include = ["**/Cargo.toml", "deny.toml"]
2+
exclude = ["duckdb-vortex/duckdb-rs/**"]
23

34
[formatting]
45
allowed_blank_lines = 1

vortex-duckdb/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ vortex-dtype = { workspace = true }
2525
vortex-error = { workspace = true }
2626

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

3030
[dev-dependencies]
3131

0 commit comments

Comments
 (0)