Merge pull request #726 from cvybhu/no-simple-strategy

piodul · web-flow · commit 3a6fb93f5e35 · 2023-06-16T09:16:59.000+02:00
treewide: remove usages of SimpleStrategy
diff --git a/docs/source/logging/logging.md b/docs/source/logging/logging.md
@@ -28,7 +28,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     session
         .query(
             "CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = \
-            {'class' : 'SimpleStrategy', 'replication_factor' : 1}",
+            {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}",
             &[],
         )
         .await?;
diff --git a/docs/source/quickstart/example.md b/docs/source/quickstart/example.md
@@ -24,7 +24,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     session
         .query(
             "CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = \
-            {'class' : 'SimpleStrategy', 'replication_factor' : 1}",
+            {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}",
             &[],
         )
         .await?;
diff --git a/examples/allocations.rs b/examples/allocations.rs
@@ -131,7 +131,7 @@ async fn main() -> Result<()> {
     let session: Session = SessionBuilder::new().known_node(args.node).build().await?;
     let session = Arc::new(session);
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
     session.await_schema_agreement().await.unwrap();
 
     session
diff --git a/examples/auth.rs b/examples/auth.rs
@@ -14,7 +14,7 @@ async fn main() -> Result<()> {
         .await
         .unwrap();
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await.unwrap();
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await.unwrap();
     session
         .query("DROP TABLE IF EXISTS ks.t;", &[])
         .await
diff --git a/examples/basic.rs b/examples/basic.rs
@@ -12,7 +12,7 @@ async fn main() -> Result<()> {
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/cloud.rs b/examples/cloud.rs
@@ -16,7 +16,7 @@ async fn main() -> Result<()> {
         .await
         .unwrap();
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}",
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}",
                     &[]).await.unwrap();
     session
         .query("DROP TABLE IF EXISTS ks.t;", &[])
diff --git a/examples/compare-tokens.rs b/examples/compare-tokens.rs
@@ -13,7 +13,7 @@ async fn main() -> Result<()> {
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/cql-time-types.rs b/examples/cql-time-types.rs
@@ -17,7 +17,7 @@ async fn main() -> Result<()> {
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     // Date
     // Date is a year, month and day in the range -5877641-06-23 to -5877641-06-23
diff --git a/examples/custom_deserialization.rs b/examples/custom_deserialization.rs
@@ -13,7 +13,7 @@ async fn main() -> Result<()> {
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
     session
         .query(
             "CREATE TABLE IF NOT EXISTS ks.t (pk int PRIMARY KEY, v text)",
diff --git a/examples/execution_profile.rs b/examples/execution_profile.rs
@@ -59,7 +59,7 @@ async fn main() -> Result<()> {
     session_3_config.add_known_node(uri);
     let session3: Session = Session::connect(session_3_config).await?;
 
-    session1.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session1.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session2
         .query(
diff --git a/examples/get_by_name.rs b/examples/get_by_name.rs
@@ -12,7 +12,7 @@ async fn main() -> Result<()> {
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/logging.rs b/examples/logging.rs
@@ -17,7 +17,7 @@ async fn main() -> Result<()> {
     info!("Connecting to {}", uri);
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session.query("USE ks", &[]).await?;
 
diff --git a/examples/parallel-prepared.rs b/examples/parallel-prepared.rs
@@ -14,7 +14,7 @@ async fn main() -> Result<()> {
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
     let session = Arc::new(session);
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/parallel.rs b/examples/parallel.rs
@@ -14,7 +14,7 @@ async fn main() -> Result<()> {
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
     let session = Arc::new(session);
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/query_history.rs b/examples/query_history.rs
@@ -17,7 +17,7 @@ async fn main() -> Result<()> {
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/schema_agreement.rs b/examples/schema_agreement.rs
@@ -21,7 +21,7 @@ async fn main() -> Result<()> {
     println!("Schema version: {}", schema_version);
 
     session.await_schema_agreement().await?; // without timeout example
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     if session
         .await_timed_schema_agreement(Duration::from_secs(5))
diff --git a/examples/select-paging.rs b/examples/select-paging.rs
@@ -11,7 +11,7 @@ async fn main() -> Result<()> {
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/speculative-execution.rs b/examples/speculative-execution.rs
@@ -26,7 +26,7 @@ async fn main() -> Result<()> {
         .build()
         .await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/tls.rs b/examples/tls.rs
@@ -49,7 +49,7 @@ async fn main() -> Result<()> {
         .build()
         .await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/tracing.rs b/examples/tracing.rs
@@ -23,7 +23,7 @@ async fn main() -> Result<()> {
     println!("Connecting to {} ...", uri);
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/user-defined-type.rs b/examples/user-defined-type.rs
@@ -11,7 +11,7 @@ async fn main() -> Result<()> {
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await?;
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await?;
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await?;
 
     session
         .query(
diff --git a/examples/value_list.rs b/examples/value_list.rs
@@ -9,7 +9,7 @@ async fn main() {
 
     let session: Session = SessionBuilder::new().known_node(uri).build().await.unwrap();
 
-    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor' : 1}", &[]).await.unwrap();
+    session.query("CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}", &[]).await.unwrap();
 
     session
         .query(
diff --git a/scylla/src/history.rs b/scylla/src/history.rs
@@ -1014,7 +1014,7 @@ mod tests {
         let session = create_new_session_builder().build().await.unwrap();
         let ks = unique_keyspace_name();
         session
-        .query(format!("CREATE KEYSPACE {} WITH REPLICATION = {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}", ks), &[])
+        .query(format!("CREATE KEYSPACE {} WITH REPLICATION = {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}", ks), &[])
         .await
         .unwrap();
         session.use_keyspace(ks, true).await.unwrap();
diff --git a/scylla/src/transport/authenticate_test.rs b/scylla/src/transport/authenticate_test.rs
@@ -19,7 +19,7 @@ async fn authenticate_superuser() {
         .unwrap();
     let ks = unique_keyspace_name();
 
-    session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}", ks), &[]).await.unwrap();
+    session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}", ks), &[]).await.unwrap();
     session.use_keyspace(ks, false).await.unwrap();
     session.query("DROP TABLE IF EXISTS t;", &[]).await.unwrap();
 
@@ -74,7 +74,7 @@ async fn custom_authentication() {
         .unwrap();
     let ks = unique_keyspace_name();
 
-    session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}", ks), &[]).await.unwrap();
+    session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}", ks), &[]).await.unwrap();
     session.use_keyspace(ks, false).await.unwrap();
     session.query("DROP TABLE IF EXISTS t;", &[]).await.unwrap();
 
diff --git a/scylla/src/transport/caching_session.rs b/scylla/src/transport/caching_session.rs
@@ -238,7 +238,7 @@ mod tests {
         let ks = unique_keyspace_name();
 
         session
-            .query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}", ks), &[])
+            .query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}", ks), &[])
             .await
             .expect("Could not create keyspace");
 
diff --git a/scylla/src/transport/connection.rs b/scylla/src/transport/connection.rs
@@ -1826,7 +1826,7 @@ mod tests {
                 .build()
                 .await
                 .unwrap();
-            session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}", ks.clone()), &[]).await.unwrap();
+            session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}", ks.clone()), &[]).await.unwrap();
             session.use_keyspace(ks.clone(), false).await.unwrap();
             session
                 .query("DROP TABLE IF EXISTS connection_query_iter_tab", &[])
@@ -1911,7 +1911,7 @@ mod tests {
                 .build()
                 .await
                 .unwrap();
-            session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}", ks.clone()), &[]).await.unwrap();
+            session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}", ks.clone()), &[]).await.unwrap();
             session.use_keyspace(ks.clone(), false).await.unwrap();
             session
                 .query(
diff --git a/scylla/src/transport/cql_collections_test.rs b/scylla/src/transport/cql_collections_test.rs
@@ -8,7 +8,7 @@ use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 async fn connect() -> Session {
     let session = create_new_session_builder().build().await.unwrap();
     let ks = unique_keyspace_name();
-    session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}", ks), &[]).await.unwrap();
+    session.query(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}", ks), &[]).await.unwrap();
     session.use_keyspace(ks, false).await.unwrap();
 
     session
diff --git a/scylla/src/transport/cql_types_test.rs b/scylla/src/transport/cql_types_test.rs
@@ -29,7 +29,7 @@ async fn init_test(table_name: &str, type_name: &str) -> Session {
         .query(
             format!(
                 "CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = \
-            {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}",
+            {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}",
                 ks
             ),
             &[],
@@ -781,7 +781,7 @@ async fn test_udt_after_schema_update() {
         .query(
             format!(
                 "CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = \
-            {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}",
+            {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}",
                 ks
             ),
             &[],
diff --git a/scylla/src/transport/cql_value_test.rs b/scylla/src/transport/cql_value_test.rs
@@ -12,7 +12,7 @@ async fn test_cqlvalue_udt() {
         .query(
             format!(
                 "CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = \
-            {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}",
+            {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}",
                 ks
             ),
             &[],
@@ -77,7 +77,7 @@ async fn test_cqlvalue_duration() {
         .query(
             format!(
                 "CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = \
-                {{'class' : 'SimpleStrategy', 'replication_factor' : 1}}",
+                {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}",
                 ks
             ),
             &[],
diff --git a/scylla/src/transport/session_test.rs b/scylla/src/transport/session_test.rs
diff --git a/scylla/tests/integration/execution_profiles.rs b/scylla/tests/integration/execution_profiles.rs
diff --git a/scylla/tests/integration/lwt_optimisation.rs b/scylla/tests/integration/lwt_optimisation.rs
diff --git a/scylla/tests/integration/retries.rs b/scylla/tests/integration/retries.rs

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ async fn main() -> Result<(), Box<dyn Error>> {`
`28`	`28`	`session`
`29`	`29`	`.query(`
`30`	`30`	`"CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = \`
`31`		`- {'class' : 'SimpleStrategy', 'replication_factor' : 1}",`
	`31`	`+ {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}",`
`32`	`32`	`&[],`
`33`	`33`	`)`
`34`	`34`	`.await?;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ async fn main() -> Result<(), Box<dyn Error>> {`
`24`	`24`	`session`
`25`	`25`	`.query(`
`26`	`26`	`"CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = \`
`27`		`- {'class' : 'SimpleStrategy', 'replication_factor' : 1}",`
	`27`	`+ {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}",`
`28`	`28`	`&[],`
`29`	`29`	`)`
`30`	`30`	`.await?;`