Skip to content

Commit 01c67a1

Browse files
committed
scylla: dont't re-export statement submodules
So the statement are accessible only via `scylla::statement::` prefix.
1 parent 58d1aef commit 01c67a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+103
-109
lines changed

docs/source/execution-profiles/create-and-use.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To create an `ExecutionProfile` and attach it to a `Query`:
3333
# extern crate scylla;
3434
# use std::error::Error;
3535
# async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
36-
use scylla::query::Query;
36+
use scylla::statement::query::Query;
3737
use scylla::statement::Consistency;
3838
use scylla::client::execution_profile::ExecutionProfile;
3939
use std::time::Duration;

docs/source/execution-profiles/maximal-example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# extern crate scylla;
77
# use std::error::Error;
88
# async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
9-
use scylla::query::Query;
9+
use scylla::statement::query::Query;
1010
use scylla::policies::speculative_execution::SimpleSpeculativeExecutionPolicy;
1111
use scylla::statement::{Consistency, SerialConsistency};
1212
use scylla::client::execution_profile::ExecutionProfile;

docs/source/execution-profiles/priority.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Priorities of execution profiles and directly set options:
1515
# async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
1616
use scylla::client::session::Session;
1717
use scylla::client::session_builder::SessionBuilder;
18-
use scylla::query::Query;
18+
use scylla::statement::query::Query;
1919
use scylla::statement::Consistency;
2020
use scylla::client::execution_profile::ExecutionProfile;
2121

docs/source/execution-profiles/remap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Below, the remaps described above are followed in code.
2525
# async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
2626
use scylla::client::session::Session;
2727
use scylla::client::session_builder::SessionBuilder;
28-
use scylla::query::Query;
28+
use scylla::statement::query::Query;
2929
use scylla::statement::Consistency;
3030
use scylla::client::execution_profile::ExecutionProfile;
3131

docs/source/queries/batch.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Only `INSERT`, `UPDATE` and `DELETE` statements are allowed.
99
# use scylla::client::session::Session;
1010
# use std::error::Error;
1111
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
12-
use scylla::batch::Batch;
13-
use scylla::query::Query;
14-
use scylla::prepared_statement::PreparedStatement;
12+
use scylla::statement::batch::Batch;
13+
use scylla::statement::query::Query;
14+
use scylla::statement::prepared_statement::PreparedStatement;
1515

1616
// Create a batch statement
1717
let mut batch: Batch = Default::default();
@@ -55,7 +55,7 @@ Instead of preparing each statement individually, it's possible to prepare a who
5555
# use scylla::client::session::Session;
5656
# use std::error::Error;
5757
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
58-
use scylla::batch::Batch;
58+
use scylla::statement::batch::Batch;
5959

6060
// Create a batch statement with unprepared statements
6161
let mut batch: Batch = Default::default();
@@ -83,7 +83,7 @@ For example to change consistency:
8383
# use scylla::client::session::Session;
8484
# use std::error::Error;
8585
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
86-
use scylla::batch::Batch;
86+
use scylla::statement::batch::Batch;
8787
use scylla::statement::Consistency;
8888

8989
// Create a batch
@@ -117,7 +117,7 @@ Example:
117117
# use scylla::client::session::Session;
118118
# use std::error::Error;
119119
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
120-
use scylla::batch::Batch;
120+
use scylla::statement::batch::Batch;
121121

122122
let mut batch: Batch = Default::default();
123123

docs/source/queries/lwt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A lightweight transaction query is not a separate type - it can be expressed jus
1010
# use scylla::client::session::Session;
1111
# use std::error::Error;
1212
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
13-
use scylla::query::Query;
13+
use scylla::statement::query::Query;
1414
use scylla::statement::{Consistency, SerialConsistency};
1515

1616
// Create a Query manually to change the Consistency to ONE

docs/source/queries/paged.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Use `execute_iter` to perform a [prepared query](prepared.md) with paging:
7474
# use scylla::client::session::Session;
7575
# use std::error::Error;
7676
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
77-
use scylla::prepared_statement::PreparedStatement;
77+
use scylla::statement::prepared_statement::PreparedStatement;
7878
use futures::stream::StreamExt;
7979

8080
let prepared: PreparedStatement = session
@@ -105,7 +105,7 @@ On a `Query`:
105105
# use scylla::client::session::Session;
106106
# use std::error::Error;
107107
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
108-
use scylla::query::Query;
108+
use scylla::statement::query::Query;
109109

110110
let mut query: Query = Query::new("SELECT a, b FROM ks.t");
111111
query.set_page_size(16);
@@ -121,7 +121,7 @@ On a `PreparedStatement`:
121121
# use scylla::client::session::Session;
122122
# use std::error::Error;
123123
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
124-
use scylla::prepared_statement::PreparedStatement;
124+
use scylla::statement::prepared_statement::PreparedStatement;
125125

126126
let mut prepared: PreparedStatement = session
127127
.prepare("SELECT a, b FROM ks.t")
@@ -145,7 +145,7 @@ On a `Query`:
145145
# use scylla::client::session::Session;
146146
# use std::error::Error;
147147
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
148-
use scylla::query::Query;
148+
use scylla::statement::query::Query;
149149
use scylla::response::{PagingState, PagingStateResponse};
150150
use std::ops::ControlFlow;
151151

@@ -188,7 +188,7 @@ On a `PreparedStatement`:
188188
# use scylla::client::session::Session;
189189
# use std::error::Error;
190190
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
191-
use scylla::query::Query;
191+
use scylla::statement::query::Query;
192192
use scylla::response::{PagingState, PagingStateResponse};
193193
use std::ops::ControlFlow;
194194

docs/source/queries/prepared.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ prepares the statement before execution. The reason for this is to provide type
1414
# use scylla::client::session::Session;
1515
# use std::error::Error;
1616
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
17-
use scylla::prepared_statement::PreparedStatement;
17+
use scylla::statement::prepared_statement::PreparedStatement;
1818

1919
// Prepare the query for later execution
2020
let prepared: PreparedStatement = session
@@ -57,7 +57,7 @@ For example to change the consistency:
5757
# use scylla::client::session::Session;
5858
# use std::error::Error;
5959
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
60-
use scylla::prepared_statement::PreparedStatement;
60+
use scylla::statement::prepared_statement::PreparedStatement;
6161
use scylla::statement::Consistency;
6262

6363
// Prepare the query for later execution
@@ -109,7 +109,7 @@ TABLE ks.prepare_table (
109109
# use scylla::client::session::Session;
110110
# use std::error::Error;
111111
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
112-
use scylla::prepared_statement::PreparedStatement;
112+
use scylla::statement::prepared_statement::PreparedStatement;
113113

114114
// WRONG - partition key value is passed in query string
115115
// Load balancing will compute the wrong partition key

docs/source/queries/simple.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ You can create a query manually to set custom options. For example to change que
3636
# use scylla::client::session::Session;
3737
# use std::error::Error;
3838
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
39-
use scylla::query::Query;
39+
use scylla::statement::query::Query;
4040
use scylla::statement::Consistency;
4141

4242
// Create a Query manually to change the Consistency to ONE

docs/source/queries/timeouts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ However, setting per-statement timeout to `None` results in falling back to per-
2020
use scylla::client::execution_profile::ExecutionProfile;
2121
use scylla::client::session::Session;
2222
use scylla::client::session_builder::SessionBuilder;
23-
use scylla::query::Query;
23+
use scylla::statement::query::Query;
2424
use std::time::Duration;
2525

2626
let uri = std::env::var("SCYLLA_URI")

0 commit comments

Comments
 (0)