Skip to content

Commit c57c90e

Browse files
authored
chore: drop fork submodules from vortex (#3666)
- Drops DuckDB related forks from the Vortex repo. - Removes the following submodules: ``` [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 [submodule "duckdb-vortex/vcpkg"] path = duckdb-vortex/vcpkg url = https://github.com/microsoft/vcpkg.git ``` - Moves the DuckDB repo from duckdb-vortex to vortex-duckdb/duckdb (switches to the original repo as part of that). - Bumps duckdb dep in vortex-duckdb to v1.3.1 - Updates ruff exclude paths to: `extend-exclude = [".venv", "vortex-duckdb/duckdb/**"]` --------- Signed-off-by: Alexander Droste <[email protected]>
1 parent e42a241 commit c57c90e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+13
-2364
lines changed

.gitmodules

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
[submodule "duckdb"]
2-
path = duckdb-vortex/duckdb
3-
url = https://github.com/spiraldb/duckdb
4-
[submodule "extension-ci-tools"]
5-
path = duckdb-vortex/extension-ci-tools
6-
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
10-
[submodule "duckdb-vortex/vcpkg"]
11-
path = duckdb-vortex/vcpkg
12-
url = https://github.com/microsoft/vcpkg.git
1+
[submodule "vortex-duckdb/duckdb"]
2+
path = vortex-duckdb/duckdb
3+
url = [email protected]:duckdb/duckdb.git

bench-vortex/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use std::path::PathBuf;
1919
/// static lib is not self-contained. This means that it includes symbols which
2020
/// are not defined as part of the static library.
2121
fn main() {
22-
const DUCKDB_VERSION: &str = "v1.3.0";
22+
const DUCKDB_VERSION: &str = "v1.3.1";
2323
let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
2424
let target_dir = manifest_dir.parent().unwrap().join("target");
2525
let lib_path = target_dir.join(format!("duckdb-{DUCKDB_VERSION}"));

bench-vortex/src/bin/tpch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ async fn bench_main(
463463

464464
fn verify_duckdb_tpch_results(scale_factor: u8, duckdb_path: PathBuf) -> anyhow::Result<()> {
465465
let query_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
466-
.join("../duckdb-vortex/duckdb/extension/tpch/dbgen/queries");
466+
.join("../vortex-duckdb/duckdb/extension/tpch/dbgen/queries");
467467

468468
let tmp_dir = format!(
469469
"{}/spiral-tpch",

duckdb-vortex/.clang-format

Lines changed: 0 additions & 1 deletion
This file was deleted.

duckdb-vortex/.clang-tidy

Lines changed: 0 additions & 1 deletion
This file was deleted.

duckdb-vortex/.editorconfig

Lines changed: 0 additions & 1 deletion
This file was deleted.

duckdb-vortex/.github/workflows/MainDistributionPipeline.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

duckdb-vortex/.gitignore

Lines changed: 0 additions & 16 deletions
This file was deleted.

duckdb-vortex/CMakeLists.txt

Lines changed: 0 additions & 64 deletions
This file was deleted.

duckdb-vortex/LICENSE

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)