Skip to content

Commit 3c9013c

Browse files
committed
frame/types: re-export pub types
Re-exported the Consistency and SerialConsistency types. Hidden utility functions such as `read/write_int`.
1 parent d0d02f6 commit 3c9013c

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

scylla/benches/benchmark.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use criterion::{criterion_group, criterion_main, Criterion};
22

33
use bytes::BytesMut;
4-
use scylla::{
5-
frame::types,
6-
transport::partitioner::{calculate_token_for_partition_key, Murmur3Partitioner},
4+
use scylla::transport::partitioner::{calculate_token_for_partition_key, Murmur3Partitioner};
5+
use scylla_cql::{
6+
frame::{response::result::ColumnType, types},
7+
types::serialize::row::SerializedValues,
78
};
8-
use scylla_cql::{frame::response::result::ColumnType, types::serialize::row::SerializedValues};
99

1010
fn types_benchmark(c: &mut Criterion) {
1111
let mut buf = BytesMut::with_capacity(64);

scylla/src/lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,15 @@ pub mod macros;
103103
pub use macros::*;
104104

105105
pub mod frame {
106-
pub use scylla_cql::frame::{frame_errors, response, types, value, Authenticator, Compression};
106+
pub use scylla_cql::frame::{frame_errors, response, value, Authenticator, Compression};
107107
pub(crate) use scylla_cql::frame::{
108108
parse_response_body_extensions, protocol_features, read_response_frame, request,
109109
server_event_type, FrameParams, SerializedRequest,
110110
};
111+
112+
pub mod types {
113+
pub use scylla_cql::frame::types::{Consistency, SerialConsistency};
114+
}
111115
}
112116

113117
pub use scylla_cql::types::serialize;

scylla/tests/integration/lwt_optimisation.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
use crate::utils::{setup_tracing, test_with_3_node_cluster};
2-
3-
use scylla::frame::types;
42
use scylla::retry_policy::FallthroughRetryPolicy;
53
use scylla::test_utils::unique_keyspace_name;
64
use scylla::transport::session::Session;
75
use scylla::{ExecutionProfile, SessionBuilder};
86
use scylla_cql::frame::protocol_features::ProtocolFeatures;
7+
use scylla_cql::frame::types;
98
use std::sync::Arc;
109
use tokio::sync::mpsc;
1110

0 commit comments

Comments
 (0)