Skip to content

Commit 64a683a

Browse files
committed
statement: remove PagingState[Response] re-export
PagingState[Response] suit response module better, and it's better to have it re-exported from scylla-cql in only one place.
1 parent 99492dd commit 64a683a

File tree

6 files changed

+13
-14
lines changed

6 files changed

+13
-14
lines changed

docs/source/queries/paged.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ On a `Query`:
146146
# use std::error::Error;
147147
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
148148
use scylla::query::Query;
149-
use scylla::statement::{PagingState, PagingStateResponse};
149+
use scylla::response::{PagingState, PagingStateResponse};
150150
use std::ops::ControlFlow;
151151

152152
let paged_query = Query::new("SELECT a, b, c FROM ks.t").with_page_size(6);
@@ -189,7 +189,7 @@ On a `PreparedStatement`:
189189
# use std::error::Error;
190190
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
191191
use scylla::query::Query;
192-
use scylla::statement::{PagingState, PagingStateResponse};
192+
use scylla::response::{PagingState, PagingStateResponse};
193193
use std::ops::ControlFlow;
194194

195195
let paged_prepared = session

examples/select-paging.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use futures::StreamExt as _;
33
use scylla::client::session::Session;
44
use scylla::client::session_builder::SessionBuilder;
55
use scylla::query::Query;
6-
use scylla::statement::PagingState;
6+
use scylla::response::PagingState;
77
use std::env;
88
use std::ops::ControlFlow;
99

scylla/src/client/caching_session.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use crate::query::Query;
77
#[allow(deprecated)]
88
use crate::response::legacy_query_result::LegacyQueryResult;
99
use crate::response::query_result::QueryResult;
10+
use crate::response::{PagingState, PagingStateResponse};
1011
use crate::routing::partitioner::PartitionerName;
11-
use crate::statement::{PagingState, PagingStateResponse};
1212
use bytes::Bytes;
1313
use dashmap::DashMap;
1414
use futures::future::try_join_all;
@@ -347,8 +347,8 @@ mod tests {
347347
use crate::client::session::Session;
348348
use crate::prepared_statement::PreparedStatement;
349349
use crate::query::Query;
350+
use crate::response::PagingState;
350351
use crate::routing::partitioner::PartitionerName;
351-
use crate::statement::PagingState;
352352
use crate::test_utils::{
353353
create_new_session_builder, scylla_supports_tablets, setup_tracing, PerformDDL,
354354
};

scylla/src/client/session.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ use crate::query::Query;
3535
#[allow(deprecated)]
3636
use crate::response::legacy_query_result::LegacyQueryResult;
3737
use crate::response::query_result::{MaybeFirstRowError, QueryResult, RowsError};
38-
use crate::response::{NonErrorQueryResponse, QueryResponse};
38+
use crate::response::{NonErrorQueryResponse, PagingState, PagingStateResponse, QueryResponse};
3939
use crate::routing::partitioner::PartitionerName;
4040
use crate::routing::Shard;
41-
use crate::statement::StatementConfig;
42-
use crate::statement::{Consistency, PageSize, PagingState, PagingStateResponse};
41+
use crate::statement::{Consistency, PageSize, StatementConfig};
4342
use arc_swap::ArcSwapOption;
4443
use futures::future::join_all;
4544
use futures::future::try_join_all;
@@ -471,7 +470,7 @@ impl GenericSession<CurrentDeserializationApi> {
471470
/// # use std::error::Error;
472471
/// # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
473472
/// use std::ops::ControlFlow;
474-
/// use scylla::statement::PagingState;
473+
/// use scylla::response::PagingState;
475474
///
476475
/// // Manual paging in a loop, unprepared statement.
477476
/// let mut paging_state = PagingState::start();
@@ -625,7 +624,7 @@ impl GenericSession<CurrentDeserializationApi> {
625624
/// # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
626625
/// use std::ops::ControlFlow;
627626
/// use scylla::query::Query;
628-
/// use scylla::statement::{PagingState, PagingStateResponse};
627+
/// use scylla::response::{PagingState, PagingStateResponse};
629628
///
630629
/// let paged_prepared = session
631630
/// .prepare(

scylla/src/network/connection.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ use crate::frame::{
2424
use crate::policies::address_translator::AddressTranslator;
2525
use crate::query::Query;
2626
use crate::response::query_result::QueryResult;
27-
use crate::response::{NonErrorAuthResponse, NonErrorStartupResponse, QueryResponse};
27+
use crate::response::{
28+
NonErrorAuthResponse, NonErrorStartupResponse, PagingState, PagingStateResponse, QueryResponse,
29+
};
2830
use crate::routing::locator::tablets::{RawTablet, TabletParsingError};
2931
use crate::routing::{Shard, ShardInfo, Sharder};
3032
use crate::statement::prepared_statement::PreparedStatement;
31-
use crate::statement::{Consistency, PageSize, PagingState, PagingStateResponse};
33+
use crate::statement::{Consistency, PageSize};
3234
use bytes::Bytes;
3335
use futures::{future::RemoteHandle, FutureExt};
3436
use scylla_cql::frame::frame_errors::CqlResponseParseError;

scylla/src/statement/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ pub mod query;
1919

2020
pub use crate::frame::types::{Consistency, SerialConsistency};
2121

22-
pub use crate::frame::request::query::{PagingState, PagingStateResponse};
23-
2422
// This is the default common to drivers.
2523
const DEFAULT_PAGE_SIZE: i32 = 5000;
2624

0 commit comments

Comments
 (0)