statement: rename query.rs -> unprepared.rs

muzarski · muzarski · commit adc9c041147c · 2025-02-26T17:13:17.000+01:00
diff --git a/docs/source/execution-profiles/create-and-use.md b/docs/source/execution-profiles/create-and-use.md
@@ -33,7 +33,7 @@ To create an `ExecutionProfile` and attach it to a `Query`:
 # extern crate scylla;
 # use std::error::Error;
 # async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::Consistency;
 use scylla::client::execution_profile::ExecutionProfile;
 use std::time::Duration;
diff --git a/docs/source/execution-profiles/maximal-example.md b/docs/source/execution-profiles/maximal-example.md
@@ -6,7 +6,7 @@
 # extern crate scylla;
 # use std::error::Error;
 # async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::policies::speculative_execution::SimpleSpeculativeExecutionPolicy;
 use scylla::statement::{Consistency, SerialConsistency};
 use scylla::client::execution_profile::ExecutionProfile;
diff --git a/docs/source/execution-profiles/priority.md b/docs/source/execution-profiles/priority.md
@@ -15,7 +15,7 @@ Priorities of execution profiles and directly set options:
 # async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::Consistency;
 use scylla::client::execution_profile::ExecutionProfile;
 
diff --git a/docs/source/execution-profiles/remap.md b/docs/source/execution-profiles/remap.md
@@ -25,7 +25,7 @@ Below, the remaps described above are followed in code.
 # async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::Consistency;
 use scylla::client::execution_profile::ExecutionProfile;
 
diff --git a/docs/source/queries/batch.md b/docs/source/queries/batch.md
@@ -10,7 +10,7 @@ Only `INSERT`, `UPDATE` and `DELETE` statements are allowed.
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
 use scylla::statement::batch::Batch;
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::prepared::PreparedStatement;
 
 // Create a batch statement
diff --git a/docs/source/queries/lwt.md b/docs/source/queries/lwt.md
@@ -10,7 +10,7 @@ A lightweight transaction query is not a separate type - it can be expressed jus
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::{Consistency, SerialConsistency};
 
 // Create a Query manually to change the Consistency to ONE
diff --git a/docs/source/queries/paged.md b/docs/source/queries/paged.md
@@ -105,7 +105,7 @@ On a `Query`:
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 
 let mut query: Statement = Statement::new("SELECT a, b FROM ks.t");
 query.set_page_size(16);
@@ -145,7 +145,7 @@ On a `Query`:
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::response::{PagingState, PagingStateResponse};
 use std::ops::ControlFlow;
 
@@ -188,7 +188,7 @@ On a `PreparedStatement`:
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::response::{PagingState, PagingStateResponse};
 use std::ops::ControlFlow;
 
diff --git a/docs/source/queries/simple.md b/docs/source/queries/simple.md
@@ -36,7 +36,7 @@ You can create a query manually to set custom options. For example to change que
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::Consistency;
 
 // Create a Query manually to change the Consistency to ONE
diff --git a/docs/source/queries/timeouts.md b/docs/source/queries/timeouts.md
@@ -20,7 +20,7 @@ However, setting per-statement timeout to `None` results in falling back to per-
 use scylla::client::execution_profile::ExecutionProfile;
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use std::time::Duration;
 
 let uri = std::env::var("SCYLLA_URI")
diff --git a/docs/source/queries/timestamp-generators.md b/docs/source/queries/timestamp-generators.md
@@ -33,7 +33,7 @@ be warned about the clock skew, the warnings can be turned off with `without_war
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
 use scylla::policies::timestamp_generator::MonotonicTimestampGenerator;
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use std::sync::Arc;
 
 let session: Session = SessionBuilder::new()
diff --git a/docs/source/retry-policy/default.md b/docs/source/retry-policy/default.md
@@ -37,7 +37,7 @@ To use in a [simple query](../queries/simple.md):
 # use std::error::Error;
 # use std::sync::Arc;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::client::execution_profile::ExecutionProfile;
 use scylla::policies::retry::DefaultRetryPolicy;
 
diff --git a/docs/source/retry-policy/downgrading-consistency.md b/docs/source/retry-policy/downgrading-consistency.md
@@ -78,7 +78,7 @@ To use in a [simple query](../queries/simple.md):
 # use std::error::Error;
 # use std::sync::Arc;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::client::execution_profile::ExecutionProfile;
 use scylla::policies::retry::DowngradingConsistencyRetryPolicy;
 
diff --git a/docs/source/retry-policy/fallthrough.md b/docs/source/retry-policy/fallthrough.md
@@ -36,7 +36,7 @@ To use in a [simple query](../queries/simple.md):
 # use std::error::Error;
 # use std::sync::Arc;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::client::execution_profile::ExecutionProfile;
 use scylla::policies::retry::FallthroughRetryPolicy;
 
diff --git a/docs/source/retry-policy/retry-policy.md b/docs/source/retry-policy/retry-policy.md
@@ -24,7 +24,7 @@ Idempotence has to be specified manually, the driver is not able to figure it ou
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::prepared::PreparedStatement;
 
 // Specify that a Query is idempotent
diff --git a/docs/source/tracing/basic.md b/docs/source/tracing/basic.md
@@ -10,7 +10,7 @@ return a `QueryResult` which contains a `tracing_id` if tracing was enabled.
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::response::query_result::QueryResult;
 use scylla::observability::tracing::TracingInfo;
 use uuid::Uuid;
diff --git a/docs/source/tracing/paged.md b/docs/source/tracing/paged.md
@@ -12,7 +12,7 @@ If tracing is enabled the row iterator will contain a list of tracing ids for al
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::observability::tracing::TracingInfo;
 use futures::StreamExt;
 use uuid::Uuid;
diff --git a/docs/source/tracing/prepare.md b/docs/source/tracing/prepare.md
@@ -8,7 +8,7 @@
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::prepared::PreparedStatement;
 use scylla::observability::tracing::TracingInfo;
 use uuid::Uuid;
diff --git a/docs/source/tracing/query-history.md b/docs/source/tracing/query-history.md
@@ -11,7 +11,7 @@ This history includes all requests sent, decisions to retry and speculative exec
 # use scylla::client::session::Session;
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::observability::history::{HistoryCollector, StructuredHistory};
 use std::sync::Arc;
 
diff --git a/examples/execution_profile.rs b/examples/execution_profile.rs
@@ -5,7 +5,7 @@ use scylla::client::session_builder::SessionBuilder;
 use scylla::policies::load_balancing;
 use scylla::policies::retry::{DefaultRetryPolicy, FallthroughRetryPolicy};
 use scylla::policies::speculative_execution::PercentileSpeculativeExecutionPolicy;
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::{Consistency, SerialConsistency};
 use std::env;
 use std::sync::Arc;
diff --git a/examples/query_history.rs b/examples/query_history.rs
@@ -5,7 +5,7 @@ use futures::StreamExt as _;
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
 use scylla::observability::history::{HistoryCollector, StructuredHistory};
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::value::Row;
 use std::env;
 use std::sync::Arc;
diff --git a/examples/select-paging.rs b/examples/select-paging.rs
@@ -3,7 +3,7 @@ use futures::StreamExt as _;
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
 use scylla::response::PagingState;
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use std::env;
 use std::ops::ControlFlow;
 
diff --git a/examples/tower.rs b/examples/tower.rs
@@ -14,7 +14,7 @@ struct SessionService {
 }
 
 // A trivial service implementation for sending parameterless simple string requests to Scylla.
-impl Service<scylla::statement::query::Statement> for SessionService {
+impl Service<scylla::statement::unprepared::Statement> for SessionService {
     type Response = scylla::response::query_result::QueryResult;
     type Error = scylla::errors::ExecutionError;
     type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>>>>;
@@ -23,7 +23,7 @@ impl Service<scylla::statement::query::Statement> for SessionService {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: scylla::statement::query::Statement) -> Self::Future {
+    fn call(&mut self, req: scylla::statement::unprepared::Statement) -> Self::Future {
         let session = self.session.clone();
         Box::pin(async move { session.query_unpaged(req, &[]).await })
     }
diff --git a/examples/tracing.rs b/examples/tracing.rs
@@ -9,7 +9,7 @@ use scylla::observability::tracing::TracingInfo;
 use scylla::response::query_result::QueryResult;
 use scylla::statement::batch::Batch;
 use scylla::statement::prepared::PreparedStatement;
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::{Consistency, SerialConsistency};
 use std::env;
 use std::num::NonZeroU32;
diff --git a/scylla/src/client/caching_session.rs b/scylla/src/client/caching_session.rs
@@ -4,7 +4,7 @@ use crate::response::{PagingState, PagingStateResponse};
 use crate::routing::partitioner::PartitionerName;
 use crate::statement::batch::{Batch, BatchStatement};
 use crate::statement::prepared::PreparedStatement;
-use crate::statement::query::Statement;
+use crate::statement::unprepared::Statement;
 use bytes::Bytes;
 use dashmap::DashMap;
 use futures::future::try_join_all;
@@ -254,7 +254,7 @@ mod tests {
     use crate::routing::partitioner::PartitionerName;
     use crate::statement::batch::{Batch, BatchStatement};
     use crate::statement::prepared::PreparedStatement;
-    use crate::statement::query::Statement;
+    use crate::statement::unprepared::Statement;
     use crate::test_utils::{
         create_new_session_builder, scylla_supports_tablets, setup_tracing, PerformDDL,
     };
diff --git a/scylla/src/client/execution_profile.rs b/scylla/src/client/execution_profile.rs
@@ -43,7 +43,7 @@
 //! # extern crate scylla;
 //! # use std::error::Error;
 //! # async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
-//! use scylla::statement::query::Statement;
+//! use scylla::statement::unprepared::Statement;
 //! use scylla::statement::Consistency;
 //! use scylla::client::execution_profile::ExecutionProfile;
 //! use std::time::Duration;
@@ -112,7 +112,7 @@
 //! # async fn check_only_compiles() -> Result<(), Box<dyn Error>> {
 //! use scylla::client::session::Session;
 //! use scylla::client::session_builder::SessionBuilder;
-//! use scylla::statement::query::Statement;
+//! use scylla::statement::unprepared::Statement;
 //! use scylla::statement::Consistency;
 //! use scylla::client::execution_profile::ExecutionProfile;
 //!
diff --git a/scylla/src/client/pager.rs b/scylla/src/client/pager.rs
@@ -38,7 +38,7 @@ use crate::policies::retry::{RequestInfo, RetryDecision, RetrySession};
 use crate::response::query_result::ColumnSpecs;
 use crate::response::{NonErrorQueryResponse, QueryResponse};
 use crate::statement::prepared::{PartitionKeyError, PreparedStatement};
-use crate::statement::query::Statement;
+use crate::statement::unprepared::Statement;
 use tracing::{trace, trace_span, warn, Instrument};
 use uuid::Uuid;
 
diff --git a/scylla/src/client/session.rs b/scylla/src/client/session.rs
@@ -35,7 +35,7 @@ use crate::routing::Shard;
 use crate::statement::batch::batch_values;
 use crate::statement::batch::{Batch, BatchStatement};
 use crate::statement::prepared::{PartitionKeyError, PreparedStatement};
-use crate::statement::query::Statement;
+use crate::statement::unprepared::Statement;
 use crate::statement::{Consistency, PageSize, StatementConfig};
 use arc_swap::ArcSwapOption;
 use futures::future::join_all;
@@ -602,7 +602,7 @@ impl Session {
     /// # use std::error::Error;
     /// # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
     /// use std::ops::ControlFlow;
-    /// use scylla::statement::query::Statement;
+    /// use scylla::statement::unprepared::Statement;
     /// use scylla::response::{PagingState, PagingStateResponse};
     ///
     /// let paged_prepared = session
diff --git a/scylla/src/client/session_test.rs b/scylla/src/client/session_test.rs
@@ -19,7 +19,7 @@ use crate::routing::partitioner::{
 use crate::routing::Token;
 use crate::statement::batch::{Batch, BatchStatement, BatchType};
 use crate::statement::prepared::PreparedStatement;
-use crate::statement::query::Statement;
+use crate::statement::unprepared::Statement;
 use crate::statement::Consistency;
 use crate::utils::test_utils::{
     create_new_session_builder, scylla_supports_tablets, setup_tracing, supports_feature,
diff --git a/scylla/src/cluster/metadata.rs b/scylla/src/cluster/metadata.rs
@@ -26,7 +26,7 @@ use crate::frame::response::event::Event;
 use crate::network::{Connection, ConnectionConfig, NodeConnectionPool, PoolConfig, PoolSize};
 use crate::policies::host_filter::HostFilter;
 use crate::routing::Token;
-use crate::statement::query::Statement;
+use crate::statement::unprepared::Statement;
 use crate::utils::parse::{ParseErrorCause, ParseResult, ParserState};
 
 use futures::future::{self, FutureExt};
diff --git a/scylla/src/lib.rs b/scylla/src/lib.rs
@@ -45,7 +45,7 @@
 //! * [Batch](crate::client::session::Session::batch)
 //!
 //! To specify options for a single query create the query object and configure it:
-//! * For simple: [`Statement`](crate::statement::query::Statement)
+//! * For simple: [`Statement`](crate::statement::unprepared::Statement)
 //! * For prepared: [PreparedStatement](crate::statement::prepared::PreparedStatement)
 //! * For batch: [Batch](crate::statement::batch::Batch)
 //!
diff --git a/scylla/src/network/connection.rs b/scylla/src/network/connection.rs
@@ -29,7 +29,7 @@ use crate::routing::locator::tablets::{RawTablet, TabletParsingError};
 use crate::routing::{Shard, ShardInfo, Sharder, ShardingError};
 use crate::statement::batch::{Batch, BatchStatement};
 use crate::statement::prepared::PreparedStatement;
-use crate::statement::query::Statement;
+use crate::statement::unprepared::Statement;
 use crate::statement::{Consistency, PageSize};
 use bytes::Bytes;
 use futures::{future::RemoteHandle, FutureExt};
@@ -2262,7 +2262,7 @@ mod tests {
     use super::{open_connection, HostConnectionConfig};
     use crate::cluster::metadata::UntranslatedEndpoint;
     use crate::cluster::node::ResolvedContactPoint;
-    use crate::statement::query::Statement;
+    use crate::statement::unprepared::Statement;
     use crate::test_utils::setup_tracing;
     use crate::utils::test_utils::{unique_keyspace_name, PerformDDL};
     use futures::{StreamExt, TryStreamExt};
diff --git a/scylla/src/statement/batch.rs b/scylla/src/statement/batch.rs
@@ -5,7 +5,7 @@ use crate::client::execution_profile::ExecutionProfileHandle;
 use crate::observability::history::HistoryListener;
 use crate::policies::retry::RetryPolicy;
 use crate::statement::prepared::PreparedStatement;
-use crate::statement::query::Statement;
+use crate::statement::unprepared::Statement;
 
 use super::StatementConfig;
 use super::{Consistency, SerialConsistency};
diff --git a/scylla/src/statement/mod.rs b/scylla/src/statement/mod.rs
@@ -15,9 +15,10 @@ use crate::policies::retry::RetryPolicy;
 
 pub mod batch;
 pub mod prepared;
-pub mod query;
+pub mod unprepared;
 
 pub use crate::frame::types::{Consistency, SerialConsistency};
+pub use unprepared::Statement;
 
 // This is the default common to drivers.
 const DEFAULT_PAGE_SIZE: i32 = 5000;
diff --git a/scylla/src/statement/unprepared.rs b/scylla/src/statement/unprepared.rs
diff --git a/scylla/src/utils/test_utils.rs b/scylla/src/utils/test_utils.rs
@@ -12,7 +12,7 @@ use crate::network::Connection;
 use crate::policies::load_balancing::{FallbackPlan, LoadBalancingPolicy, RoutingInfo};
 use crate::policies::retry::{RequestInfo, RetryDecision, RetryPolicy, RetrySession};
 use crate::routing::Shard;
-use crate::statement::query::Statement;
+use crate::statement::unprepared::Statement;
 use std::sync::Arc;
 use std::{num::NonZeroU32, time::Duration};
 use std::{
diff --git a/scylla/tests/integration/batch.rs b/scylla/tests/integration/batch.rs
@@ -2,7 +2,7 @@ use scylla::errors::{ExecutionError, RequestAttemptError};
 use scylla::frame::frame_errors::BatchSerializationError;
 use scylla::frame::frame_errors::CqlRequestSerializationError;
 use scylla::statement::batch::{Batch, BatchType};
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 
 use crate::utils::create_new_session_builder;
 use crate::utils::setup_tracing;
diff --git a/scylla/tests/integration/consistency.rs b/scylla/tests/integration/consistency.rs
@@ -10,7 +10,7 @@ use scylla::routing::{Shard, Token};
 use scylla::statement::batch::BatchStatement;
 use scylla::statement::batch::{Batch, BatchType};
 use scylla::statement::prepared::PreparedStatement;
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::SerialConsistency;
 use scylla_cql::frame::response::result::TableSpec;
 use scylla_cql::Consistency;
diff --git a/scylla/tests/integration/execution_profiles.rs b/scylla/tests/integration/execution_profiles.rs
@@ -12,7 +12,7 @@ use scylla::policies::retry::{RetryPolicy, RetrySession};
 use scylla::policies::speculative_execution::SpeculativeExecutionPolicy;
 use scylla::routing::Shard;
 use scylla::statement::batch::{Batch, BatchStatement, BatchType};
-use scylla::statement::query::Statement;
+use scylla::statement::unprepared::Statement;
 use scylla::statement::SerialConsistency;
 use scylla_cql::Consistency;
 use tokio::sync::mpsc;
diff --git a/scylla/tests/integration/history.rs b/scylla/tests/integration/history.rs
diff --git a/scylla/tests/integration/large_batch_statements.rs b/scylla/tests/integration/large_batch_statements.rs
diff --git a/scylla/tests/integration/retries.rs b/scylla/tests/integration/retries.rs
diff --git a/scylla/tests/integration/silent_prepare_query.rs b/scylla/tests/integration/silent_prepare_query.rs
diff --git a/scylla/tests/integration/tablets.rs b/scylla/tests/integration/tablets.rs
diff --git a/scylla/tests/integration/utils.rs b/scylla/tests/integration/utils.rs
