Skip to content

Commit 85d4eb8

Browse files
authored
Merge pull request #328 from wprzytula/fix-session-close
session: fix closing semantics
2 parents eb6ee2d + 42d7cc4 commit 85d4eb8

File tree

3 files changed

+265
-68
lines changed

3 files changed

+265
-68
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
3737
:DisconnectedNullStringApiArgsTest.*\
3838
:MetricsTests.*\
3939
:DcAwarePolicyTest.*\
40+
:AsyncTests.*\
4041
:-SchemaMetadataTest.Integration_Cassandra_RegularMetadataNotMarkedVirtual\
4142
:SchemaMetadataTest.Integration_Cassandra_VirtualMetadata\
4243
:HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
@@ -95,6 +96,7 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
9596
:DisconnectedNullStringApiArgsTest.*\
9697
:MetricsTests.*\
9798
:DcAwarePolicyTest.*\
99+
:AsyncTests.*\
98100
:-PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\
99101
:SchemaMetadataTest.Integration_Cassandra_RegularMetadataNotMarkedVirtual\
100102
:SchemaMetadataTest.Integration_Cassandra_VirtualMetadata\

scylla-rust-wrapper/src/future.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ enum FutureError {
7979
struct JoinHandleTimeout(JoinHandle<()>);
8080

8181
impl CassFuture {
82+
pub(crate) fn make_ready_raw(res: CassFutureResult) -> CassOwnedSharedPtr<CassFuture, CMut> {
83+
Self::new_ready(res).into_raw()
84+
}
85+
8286
pub(crate) fn make_raw(
8387
fut: impl Future<Output = CassFutureResult> + Send + 'static,
8488
#[cfg(cpp_integration_testing)] recording_listener: Option<
@@ -133,8 +137,6 @@ impl CassFuture {
133137
cass_fut
134138
}
135139

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

0 commit comments

Comments
 (0)