don't use CqlValue unnecessarily

scylladb · Feb 11, 2025 · ca37183 · ca37183
1 parent b5b6185
commit ca37183
Showing 1 changed file with 17 additions and 33 deletions.
diff --git a/scylla/tests/integration/batch_statements.rs b/scylla/tests/integration/batch_statements.rs
@@ -101,14 +101,10 @@ async fn test_batch_of_bound_statements() {
 
     let prepared = prepare_insert_statement(&session, &ks, &test_name).await;
     let mut batch = Batch::new(BatchType::Unlogged);
-    let mut batch_values: Vec<Vec<CqlValue>> = Vec::with_capacity(BATCH_COUNT);
+    let mut batch_values: Vec<_> = Vec::with_capacity(BATCH_COUNT);
     for i in 0..BATCH_COUNT as i32 {
         batch.append_statement(prepared.clone());
-        batch_values.push(vec![
-            CqlValue::Text(test_name.clone()),
-            CqlValue::Int(i),
-            CqlValue::Int(i + 1),
-        ]);
+        batch_values.push((test_name.as_str(), i, i + 1));
     }
     session.batch(&batch, batch_values).await.unwrap();
     verify_batch_insert(&session, &ks, &test_name, BATCH_COUNT).await;
@@ -128,11 +124,7 @@ async fn test_prepared_batch() {
     );
     for i in 0..BATCH_COUNT as i32 {
         batch.append_statement(Query::new(query_str.clone()));
-        batch_values.push(vec![
-            CqlValue::Text(test_name.clone()),
-            CqlValue::Int(i),
-            CqlValue::Int(i + 1),
-        ]);
+        batch_values.push((&test_name, i, i + 1));
     }
     let prepared_batch = session.prepare_batch(&batch).await.unwrap();
     session.batch(&prepared_batch, batch_values).await.unwrap();
@@ -150,11 +142,7 @@ async fn test_batch_of_bound_statements_with_unset_values() {
     let mut batch1_values = Vec::with_capacity(BATCH_COUNT);
     for i in 0..BATCH_COUNT as i32 {
         batch1.append_statement(prepared.clone());
-        batch1_values.push(vec![
-            CqlValue::Text(test_name.clone()),
-            CqlValue::Int(i),
-            CqlValue::Int(i + 1),
-        ]);
+        batch1_values.push((test_name.as_str(), i, i + 1));
     }
     session.batch(&batch1, batch1_values).await.unwrap();
 
@@ -164,17 +152,17 @@ async fn test_batch_of_bound_statements_with_unset_values() {
     for i in 0..BATCH_COUNT as i32 {
         batch2.append_statement(prepared.clone());
         if i % 20 == 0 {
-            batch2_values.push(vec![
-                MaybeUnset::Set(CqlValue::Text(test_name.clone())),
-                MaybeUnset::Set(CqlValue::Int(i)),
+            batch2_values.push((
+                MaybeUnset::Set(&test_name),
+                MaybeUnset::Set(i),
                 MaybeUnset::Unset,
-            ]);
+            ));
         } else {
-            batch2_values.push(vec![
-                MaybeUnset::Set(CqlValue::Text(test_name.clone())),
-                MaybeUnset::Set(CqlValue::Int(i)),
-                MaybeUnset::Set(CqlValue::Int(i + 2)),
-            ]);
+            batch2_values.push((
+                MaybeUnset::Set(&test_name),
+                MaybeUnset::Set(i),
+                MaybeUnset::Set(i + 2),
+            ));
         }
     }
     session.batch(&batch2, batch2_values).await.unwrap();
@@ -286,11 +274,7 @@ async fn test_cas_batch() {
     let mut batch_values = Vec::with_capacity(BATCH_COUNT);
     for i in 0..BATCH_COUNT as i32 {
         batch.append_statement(prepared.clone());
-        batch_values.push(vec![
-            CqlValue::Text(test_name.clone()),
-            CqlValue::Int(i),
-            CqlValue::Int(i + 1),
-        ]);
+        batch_values.push((&test_name, i, i + 1));
     }
     let result = session.batch(&batch, batch_values.clone()).await.unwrap();
     let (applied,): (bool,) = result
@@ -326,7 +310,7 @@ async fn test_counter_batch() {
         let query_str = format!("UPDATE {}.counter{} SET c = c + ? WHERE k0 = ?", ks, i);
         let prepared = session.prepare(Query::new(query_str)).await.unwrap();
         batch.append_statement(prepared);
-        batch_values.push(vec![CqlValue::Int(i), CqlValue::Text(test_name.clone())]);
+        batch_values.push((i, &test_name));
     }
     session.batch(&batch, batch_values).await.unwrap();
 
@@ -354,12 +338,12 @@ async fn test_fail_logged_batch_with_counter_increment() {
     create_counter_tables(&session, &ks).await;
 
     let mut batch = Batch::new(BatchType::Logged);
-    let mut batch_values: Vec<Vec<CqlValue>> = Vec::with_capacity(3);
+    let mut batch_values: Vec<_> = Vec::with_capacity(3);
     for i in 1..=3 {
         let query_str = format!("UPDATE {}.counter{} SET c = c + ? WHERE k0 = ?", ks, i);
         let prepared = session.prepare(Query::new(query_str)).await.unwrap();
         batch.append_statement(prepared);
-        batch_values.push(vec![CqlValue::Int(i), CqlValue::Text(test_name.clone())]);
+        batch_values.push((i, &test_name));
     }
     let err = session.batch(&batch, batch_values).await.unwrap_err();
     assert_matches!(