Try and replace the vortex submodule with a staticlib

.gitignore

@@ -7,6 +7,7 @@ testext
 test/python/__pycache__/
 .Rhistory
 compile_commands.json
+vortex-extension/target/
 
 #proto gen folder
-gen/
+gen/

.gitmodules

@@ -8,6 +8,3 @@
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git
-[submodule "vortex"]
-	path = vortex
-	url = https://github.com/vortex-data/vortex.git

CMakeLists.txt

@@ -67,8 +67,8 @@ if(EXISTS "/.dockerenv")
 endif()
 
 corrosion_import_crate(
-    MANIFEST_PATH vortex/Cargo.toml
-    CRATES vortex-duckdb
+    MANIFEST_PATH vortex-extension/Cargo.toml
+    CRATES vortex-extension
     CRATE_TYPES ${VORTEX_LIB_TYPE}
     FLAGS --crate-type=${VORTEX_LIB_TYPE}
 )
@@ -82,7 +82,7 @@ corrosion_set_env_vars(
     "DUCKDB_SOURCE_DIR=${DUCKDB_MODULE_BASE_DIR}"
 )
 
-include_directories(src/include vortex/vortex-duckdb/include vortex/vortex-duckdb/cpp/include)
+include_directories(src/include)
 
 set(EXTENSION_NAME ${TARGET_NAME}_extension)
 set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)

README.md

@@ -158,3 +158,13 @@ lldb -- ./build/debug/duckdb -unsigned
 When a PR is merged to `main`, the cherry-pick workflow automatically applies the squash commit to the current release branch.
 
 The current release branch is configured in `.github/workflows/CherryPick.yml` via the `RELEASE_BRANCH` env var.
+
+## Changing Vortex version
+
+The Vortex version is defined in `vortex-extension/Cargo.toml`. It can be a git commit, tag, branch or even a local path:
+
+```toml
+vortex-duckdb = { path = "<path/to/vortex/vortex-duckdb`>}
+```
+
+See the Cargo docs for [git](https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#specifying-dependencies-from-git-repositories) or [path](https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#specifying-path-dependencies) dependencies for full details.

rust-toolchain.toml

@@ -0,0 +1,5 @@
+[toolchain]
+channel = "1.91.0"
+components = ["rust-src", "rustfmt", "clippy", "rust-analyzer"]
+profile = "minimal"
+

src/include/vortex_rust.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+extern "C" {
+
+void vortex_init_rust(void *db);
+const char *vortex_version_rust();
+const char *vortex_extension_version_rust();
+
+}

src/vortex_extension.cpp

@@ -1,8 +1,7 @@
 #define DUCKDB_EXTENSION_MAIN
 
 #include "vortex_extension.hpp"
-#include "duckdb_vx/table_function.h"
-#include "vortex.h"
+#include "vortex_rust.hpp"
 
 using namespace duckdb;