move locator.rs to routing module

Author: wprzytula

scylla/src/cluster/state.rs

@@ -2,10 +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::locator::tablets::{RawTablet, Tablet, TabletsInfo};
+use crate::routing::locator::ReplicaLocator;
 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 itertools::Itertools;
 use scylla_cql::frame::response::result::TableSpec;

scylla/src/cluster/worker.rs

@@ -3,7 +3,7 @@ use crate::errors::{NewSessionError, QueryError};
 use crate::frame::response::event::{Event, StatusChangeEvent};
 use crate::network::{PoolConfig, VerifiedKeyspaceName};
 use crate::policies::host_filter::HostFilter;
-use crate::transport::locator::tablets::{RawTablet, TabletsInfo};
+use crate::routing::locator::tablets::{RawTablet, TabletsInfo};
 
 use arc_swap::ArcSwap;
 use futures::future::join_all;

scylla/src/network/connection.rs

@@ -23,10 +23,10 @@ use crate::frame::{
 };
 use crate::policies::address_translator::AddressTranslator;
 use crate::query::Query;
+use crate::routing::locator::tablets::{RawTablet, TabletParsingError};
 use crate::routing::{Shard, ShardInfo, Sharder};
 use crate::statement::prepared_statement::PreparedStatement;
 use crate::statement::{Consistency, PageSize, PagingState, PagingStateResponse};
-use crate::transport::locator::tablets::{RawTablet, TabletParsingError};
 use crate::transport::query_result::QueryResult;
 use bytes::Bytes;
 use futures::{future::RemoteHandle, FutureExt};

scylla/src/policies/load_balancing/default.rs

@@ -7,8 +7,8 @@ use crate::{
     cluster::metadata::Strategy,
     cluster::node::Node,
     errors::QueryError,
+    routing::locator::ReplicaSet,
     routing::{Shard, Token},
-    transport::locator::ReplicaSet,
 };
 use itertools::{Either, Itertools};
 use rand::{prelude::SliceRandom, thread_rng, Rng};
@@ -1165,8 +1165,8 @@ mod tests {
         ExpectedGroups, ExpectedGroupsBuilder,
     };
     use crate::policies::host_filter::HostFilter;
-    use crate::transport::locator::tablets::TabletsInfo;
-    use crate::transport::locator::test::{
+    use crate::routing::locator::tablets::TabletsInfo;
+    use crate::routing::locator::test::{
         id_to_invalid_addr, mock_metadata_for_token_aware_tests, TABLE_NTS_RF_2, TABLE_NTS_RF_3,
         TABLE_SS_RF_2,
     };
@@ -1182,6 +1182,9 @@ mod tests {
     use super::{DefaultPolicy, NodeLocationPreference};
 
     pub(crate) mod framework {
+        use crate::routing::locator::test::{
+            id_to_invalid_addr, mock_metadata_for_token_aware_tests,
+        };
         use std::collections::{HashMap, HashSet};
 
         use uuid::Uuid;
@@ -1194,7 +1197,6 @@ mod tests {
             policies::load_balancing::{LoadBalancingPolicy, Plan, RoutingInfo},
             routing::Token,
             test_utils::setup_tracing,
-            transport::locator::test::{id_to_invalid_addr, mock_metadata_for_token_aware_tests},
         };
 
         use super::TabletsInfo;
@@ -1545,7 +1547,7 @@ mod tests {
     async fn test_default_policy_with_token_aware_statements() {
         setup_tracing();
 
-        use crate::transport::locator::test::{A, B, C, D, E, F, G};
+        use crate::routing::locator::test::{A, B, C, D, E, F, G};
         let cluster = mock_cluster_data_for_token_aware_tests().await;
 
         #[derive(Debug)]
@@ -2018,7 +2020,7 @@ mod tests {
     #[tokio::test]
     async fn test_default_policy_with_lwt_statements() {
         setup_tracing();
-        use crate::transport::locator::test::{A, B, C, D, E, F, G};
+        use crate::routing::locator::test::{A, B, C, D, E, F, G};
 
         let cluster = mock_cluster_data_for_token_aware_tests().await;
         struct Test<'a> {
@@ -3134,11 +3136,11 @@ mod latency_awareness {
                 default::tests::test_default_policy_with_given_cluster_and_routing_info,
                 RoutingInfo,
             },
+            routing::locator::test::{id_to_invalid_addr, A, B, C, D, E, F, G},
+            routing::locator::test::{TABLE_INVALID, TABLE_NTS_RF_2, TABLE_NTS_RF_3},
             routing::Shard,
             routing::Token,
             test_utils::setup_tracing,
-            transport::locator::test::{id_to_invalid_addr, A, B, C, D, E, F, G},
-            transport::locator::test::{TABLE_INVALID, TABLE_NTS_RF_2, TABLE_NTS_RF_3},
         };
         use tokio::time::Instant;
 

scylla/src/policies/load_balancing/plan.rs

@@ -168,8 +168,8 @@ mod tests {
 
     use crate::{
         cluster::{Node, NodeAddr},
+        routing::locator::test::{create_locator, mock_metadata_for_token_aware_tests},
         test_utils::setup_tracing,
-        transport::locator::test::{create_locator, mock_metadata_for_token_aware_tests},
     };
 
     use super::*;

scylla/src/transport/locator/mod.rs renamed to scylla/src/routing/locator/mod.rs

@@ -830,7 +830,7 @@ impl<'a> IntoIterator for ReplicasOrdered<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{routing::Token, test_utils::setup_tracing, transport::locator::test::*};
+    use crate::{routing::locator::test::*, routing::Token, test_utils::setup_tracing};
 
     #[tokio::test]
     async fn test_replicas_ordered() {

scylla/src/transport/locator/precomputed_replicas.rs renamed to scylla/src/routing/locator/precomputed_replicas.rs

@@ -216,11 +216,11 @@ mod tests {
 
     use crate::{
         cluster::metadata::{Keyspace, Strategy},
-        routing::Token,
-        test_utils::setup_tracing,
-        transport::locator::test::{
+        routing::locator::test::{
             create_ring, mock_metadata_for_token_aware_tests, A, C, D, E, F, G,
         },
+        routing::Token,
+        test_utils::setup_tracing,
     };
 
     use super::{PrecomputedReplicas, ReplicationInfo};

scylla/src/transport/locator/replicas.rs renamed to scylla/src/routing/locator/replicas.rs

@@ -204,11 +204,11 @@ where
 #[cfg(test)]
 mod tests {
     use crate::{
-        routing::Token,
-        test_utils::setup_tracing,
-        transport::locator::test::{
+        routing::locator::test::{
             create_ring, mock_metadata_for_token_aware_tests, A, B, C, D, E, F, G,
         },
+        routing::Token,
+        test_utils::setup_tracing,
     };
 
     use super::ReplicationInfo;

scylla/src/transport/locator/replication_info.rs renamed to scylla/src/routing/locator/replication_info.rs

@@ -615,12 +615,12 @@ mod tests {
     use uuid::Uuid;
 
     use crate::cluster::Node;
-    use crate::routing::Token;
-    use crate::test_utils::setup_tracing;
-    use crate::transport::locator::tablets::{
+    use crate::routing::locator::tablets::{
         RawTablet, RawTabletReplicas, TabletParsingError, CUSTOM_PAYLOAD_TABLETS_V1_KEY,
         RAW_TABLETS_CQL_TYPE,
     };
+    use crate::routing::Token;
+    use crate::test_utils::setup_tracing;
 
     use super::{TableTablets, Tablet, TabletReplicas, TabletsInfo};