Skip to content

Commit

Permalink
Work on storage engine
Browse files Browse the repository at this point in the history
Change bindings generation to opt in rather than opt out

Work on a storage engine

Updates for storage engine

Storage compilation is a WIP, I want to refactor this

Working comile for storage engine

Woohoo! Successfully loaded a Rust storage engine (crashed when you use it, but progress...)
  • Loading branch information
tgross35 committed Feb 29, 2024
1 parent 99f947b commit 451ecee
Show file tree
Hide file tree
Showing 49 changed files with 2,526 additions and 630 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/validation-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ jobs:
run: |
rm -rf target/doc/ rust/target/doc/
cargo doc --manifest-path rust/mariadb/Cargo.toml --no-deps
cargo doc --manifest-path rust/bindings/Cargo.toml --no-deps
cargo doc --manifest-path rust/mariadb-sys/Cargo.toml --no-deps
- run: |
echo `pwd`/rust/target/doc >> $GITHUB_PATH
# fake index.html so github likes us
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -629,4 +629,5 @@ versioninfo_exe.rc
win/packaging/ca/symlinks.cc

# rust output
rust/target
target/
rust_target
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ INCLUDE(pcre)
INCLUDE(libfmt)
INCLUDE(ctest)
INCLUDE(plugin)
INCLUDE(rust)
INCLUDE(install_macros)
INCLUDE(systemd)
INCLUDE(mysql_add_executable)
Expand Down Expand Up @@ -448,7 +447,6 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)

# Add storage engines and plugins.
CONFIGURE_PLUGINS()
CONFIGURE_RUST_PLUGINS()

ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(dbug)
Expand All @@ -460,6 +458,7 @@ ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(libservices)
ADD_SUBDIRECTORY(sql/share)
ADD_SUBDIRECTORY(rust)

IF(NOT WITHOUT_SERVER)
ADD_SUBDIRECTORY(tests)
Expand Down
126 changes: 66 additions & 60 deletions rust/Cargo.lock → Cargo.lock

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

20 changes: 20 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Define our crates within a workspace

[workspace]
resolver = "2"
members = [
"rust/mariadb-sys",
"rust/mariadb",
"rust/macros",
"rust/common/encryption-common",
"rust/examples/keymgt-basic-rs",
"rust/examples/keymgt-debug-rs",
"rust/examples/encryption-simple-rs",
"rust/examples/encryption-aes-rs",
"rust/examples/ftparser-simple",
"rust/examples/storage-simple",
"rust/examples/storage-csv",
"rust/plugins/keymgt-clevis",
"rust/plugins/encryption-file-chacha",
"rust/test-runner",
]
Loading

0 comments on commit 451ecee

Please sign in to comment.