Skip to content

session: fix closing semantics #328

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

Merged
merged 7 commits into from
Jul 15, 2025
Merged

session: fix closing semantics #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
151f07a
session: use close_fut in cass_session_close
wprzytula Jun 24, 2025
04784a5
session: test_with_one_proxy_one -> "_one$"/""
wprzytula Jul 14, 2025
96f1c21
session: introduce mock_init_rules
wprzytula Jul 14, 2025
6c5b2a2
future: introduce CassFuture::make_ready_raw()
wprzytula Jul 7, 2025
b9b57ee
session: lock session for reading nonblockingly
wprzytula Jul 14, 2025
f1acf67
IT: enable AsyncTests suite
wprzytula Jun 24, 2025
42d7cc4
session: unit test for `cass_session_free`
wprzytula Jun 26, 2025
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
:DisconnectedNullStringApiArgsTest.*\
:MetricsTests.*\
:DcAwarePolicyTest.*\
:AsyncTests.*\
:-SchemaMetadataTest.Integration_Cassandra_RegularMetadataNotMarkedVirtual\
:SchemaMetadataTest.Integration_Cassandra_VirtualMetadata\
:HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
Expand Down Expand Up @@ -95,6 +96,7 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
:DisconnectedNullStringApiArgsTest.*\
:MetricsTests.*\
:DcAwarePolicyTest.*\
:AsyncTests.*\
:-PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\
:SchemaMetadataTest.Integration_Cassandra_RegularMetadataNotMarkedVirtual\
:SchemaMetadataTest.Integration_Cassandra_VirtualMetadata\
Expand Down
6 changes: 4 additions & 2 deletions scylla-rust-wrapper/src/future.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ enum FutureError {
struct JoinHandleTimeout(JoinHandle<()>);

impl CassFuture {
pub(crate) fn make_ready_raw(res: CassFutureResult) -> CassOwnedSharedPtr<CassFuture, CMut> {
Self::new_ready(res).into_raw()
}

pub(crate) fn make_raw(
fut: impl Future<Output = CassFutureResult> + Send + 'static,
#[cfg(cpp_integration_testing)] recording_listener: Option<
Expand Down Expand Up @@ -133,8 +137,6 @@ impl CassFuture {
cass_fut
}

// This is left just because it might be useful in tests.
#[expect(unused)]
pub(crate) fn new_ready(r: CassFutureResult) -> Arc<Self> {
Arc::new(CassFuture {
state: Mutex::new(CassFutureState::default()),
Expand Down
Loading