move partitioner.rs to routing mod

Author: wprzytula

scylla/benches/benchmark.rs

@@ -1,7 +1,7 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use bytes::BytesMut;
-use scylla::transport::partitioner::{calculate_token_for_partition_key, Murmur3Partitioner};
+use scylla::routing::partitioner::{calculate_token_for_partition_key, Murmur3Partitioner};
 use scylla_cql::{
     frame::{response::result::ColumnType, types},
     types::serialize::row::SerializedValues,

scylla/src/client/caching_session.rs

@@ -4,8 +4,8 @@ use crate::client::pager::LegacyRowIterator;
 use crate::errors::QueryError;
 use crate::prepared_statement::PreparedStatement;
 use crate::query::Query;
+use crate::routing::partitioner::PartitionerName;
 use crate::statement::{PagingState, PagingStateResponse};
-use crate::transport::partitioner::PartitionerName;
 #[allow(deprecated)]
 use crate::LegacyQueryResult;
 use crate::QueryResult;
@@ -347,11 +347,11 @@ mod tests {
     use crate::client::session::Session;
     use crate::prepared_statement::PreparedStatement;
     use crate::query::Query;
+    use crate::routing::partitioner::PartitionerName;
     use crate::statement::PagingState;
     use crate::test_utils::{
         create_new_session_builder, scylla_supports_tablets, setup_tracing, PerformDDL,
     };
-    use crate::transport::partitioner::PartitionerName;
     use crate::utils::test_utils::unique_keyspace_name;
     use futures::TryStreamExt;
     use scylla_cql::frame::response::result::Row;

scylla/src/client/session.rs

@@ -35,10 +35,10 @@ use crate::policies::retry::{QueryInfo, RetryDecision, RetrySession};
 use crate::policies::speculative_execution;
 use crate::prepared_statement::PreparedStatement;
 use crate::query::Query;
+use crate::routing::partitioner::PartitionerName;
 use crate::routing::Shard;
 use crate::statement::StatementConfig;
 use crate::statement::{Consistency, PageSize, PagingState, PagingStateResponse};
-use crate::transport::partitioner::PartitionerName;
 use crate::transport::query_result::{MaybeFirstRowError, QueryResult, RowsError};
 #[allow(deprecated)]
 use crate::LegacyQueryResult;

scylla/src/client/session_test.rs

@@ -11,11 +11,11 @@ use crate::observability::tracing::TracingInfo;
 use crate::policies::retry::{QueryInfo, RetryDecision, RetryPolicy, RetrySession};
 use crate::prepared_statement::PreparedStatement;
 use crate::query::Query;
-use crate::routing::Token;
-use crate::statement::Consistency;
-use crate::transport::partitioner::{
+use crate::routing::partitioner::{
     calculate_token_for_partition_key, Murmur3Partitioner, Partitioner, PartitionerName,
 };
+use crate::routing::Token;
+use crate::statement::Consistency;
 use crate::utils::test_utils::{
     create_new_session_builder, scylla_supports_tablets, setup_tracing, supports_feature,
     unique_keyspace_name, PerformDDL,

scylla/src/cluster/state.rs

@@ -2,11 +2,10 @@ use crate::errors::{BadQuery, QueryError};
 use crate::network::{Connection, PoolConfig, VerifiedKeyspaceName};
 use crate::policies::host_filter::HostFilter;
 use crate::prepared_statement::TokenCalculationError;
+use crate::routing::partitioner::{calculate_token_for_partition_key, PartitionerName};
 use crate::routing::{Shard, Token};
 use crate::transport::locator::tablets::{RawTablet, Tablet, TabletsInfo};
 use crate::transport::locator::ReplicaLocator;
-use crate::transport::partitioner::calculate_token_for_partition_key;
-use crate::transport::partitioner::PartitionerName;
 
 use itertools::Itertools;
 use scylla_cql::frame::response::result::TableSpec;

scylla/src/routing/mod.rs

@@ -1,3 +1,4 @@
+pub mod partitioner;
 mod sharding;
 
 pub(crate) use sharding::ShardInfo;

scylla/src/transport/partitioner.rs renamed to scylla/src/routing/partitioner.rs

@@ -369,9 +369,9 @@ mod tests {
     use rand::Rng;
     use rand_pcg::Pcg32;
 
-    use crate::{test_utils::setup_tracing, transport::partitioner::PartitionerHasher};
+    use crate::test_utils::setup_tracing;
 
-    use super::{CDCPartitioner, Murmur3Partitioner, Partitioner};
+    use super::{CDCPartitioner, Murmur3Partitioner, Partitioner, PartitionerHasher};
 
     fn assert_correct_murmur3_hash(pk: &'static str, expected_hash: i64) {
         let hash = Murmur3Partitioner.hash_one(pk.as_bytes()).value();

scylla/src/statement/prepared_statement.rs

@@ -19,8 +19,8 @@ use crate::frame::response::result::PreparedMetadata;
 use crate::frame::types::{Consistency, SerialConsistency};
 use crate::observability::history::HistoryListener;
 use crate::policies::retry::RetryPolicy;
+use crate::routing::partitioner::{Partitioner, PartitionerHasher, PartitionerName};
 use crate::routing::Token;
-use crate::transport::partitioner::{Partitioner, PartitionerHasher, PartitionerName};
 
 /// Represents a statement prepared on the server.
 ///

scylla/src/transport/mod.rs

@@ -1,6 +1,5 @@
 pub mod legacy_query_result;
 pub mod locator;
-pub mod partitioner;
 pub mod query_result;
 
 pub use crate::frame::Authenticator;