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.

Sign up for GitHub

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

deser: lazy CassRow construction #213

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

deser: lazy CassRow construction #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
50bc10b
collection: allocate static empty collections
muzarski Nov 26, 2024
27d76c8
tuple: allocate empty tuple type
muzarski Nov 26, 2024
54df1bc
metadata: store CassDataType behind an Arc
muzarski Nov 26, 2024
9d956cb
metadata: try to upgrade Weak before returning a pointer
muzarski Nov 26, 2024
95299d2
future: pass future pointer to callback directly
muzarski Nov 26, 2024
f0492eb
argconv: pointers
muzarski Nov 26, 2024
cf2dcff
argconv: make FFI implementation mutually exclusive
muzarski Nov 29, 2024
4eca954
cargo: bump rust driver to 847e44d6
muzarski Dec 2, 2024
8fce81c
cmake: set cpp_rust_unstable cfg
muzarski Dec 3, 2024
19017dc
rows
muzarski Dec 3, 2024
da5ce8e
lifetimes
muzarski Dec 3, 2024
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
2 changes: 2 additions & 0 deletions scylla-rust-wrapper/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[build]
rustflags = ["--cfg", "cpp_rust_unstable"]
6 changes: 6 additions & 0 deletions scylla-rust-wrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ macro(create_copy source_file dest_name)
add_custom_target(${dest_name}_copy ALL DEPENDS ${CMAKE_BINARY_DIR}/${dest_name})
endmacro()

if(DEFINED CMAKE_Rust_FLAGS)
set(CMAKE_Rust_FLAGS "${CMAKE_Rust_FLAGS} --cfg cpp_rust_unstable")
else()
set(CMAKE_Rust_FLAGS "--cfg cpp_rust_unstable")
endif()

if(APPLE)
set(INSTALL_NAME_SHARED "libscylla-cpp-driver.${PROJECT_VERSION_STRING}.dylib")
set(INSTALL_NAME_SHARED_SYMLINK_VERSION "libscylla-cpp-driver.${PROJECT_VERSION_MAJOR}.dylib")
Expand Down
70 changes: 45 additions & 25 deletions scylla-rust-wrapper/Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions scylla-rust-wrapper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ categories = ["database"]
license = "MIT OR Apache-2.0"

[dependencies]
scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "v0.15.0", features = [
scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "847e44d6", features = [
"ssl",
] }
tokio = { version = "1.27.0", features = ["full"] }
Expand All @@ -25,14 +25,14 @@ openssl = "0.10.32"
tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
tracing = "0.1.37"
futures = "0.3"
thiserror = "1.0"
thiserror = "2.0"

[build-dependencies]
bindgen = "0.65"
chrono = "0.4.20"

[dev-dependencies]
scylla-proxy = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "v0.15.0" }
scylla-proxy = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "847e44d6" }

assert_matches = "1.5.0"
ntest = "0.9.3"
Expand Down
Loading