Revert "Pick connections based on batch first statement's shard"

The new code, and in particualr the fancy GAT workaroound, cause problems when trying to pass batch values by reference, as described in scylladb#568. Fixes: scylladb#568 Unfixes: scylladb#448 This reverts commit 24ee954. Signed-off-by: Jan Ciolek <[email protected]>
lvboudre · Oct 4, 2022 · 4aea075 · 4aea075
1 parent acf1dd9
commit 4aea075
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 343 deletions.
diff --git a/scylla-cql/src/frame/request/batch.rs b/scylla-cql/src/frame/request/batch.rs
@@ -1,4 +1,4 @@
-use crate::frame::{frame_errors::ParseError, value::BatchValuesIterator};
+use crate::frame::frame_errors::ParseError;
 use bytes::{BufMut, Bytes};
 use std::convert::TryInto;
 
@@ -54,21 +54,9 @@ where
         // Serializing queries
         types::write_short(self.statements_count.try_into()?, buf);
 
-        let mut n_serialized_statements = 0usize;
-        let mut value_lists = self.values.batch_values_iter();
-        for statement in self.statements.clone() {
+        for (statement_num, statement) in self.statements.clone().enumerate() {
             statement.serialize(buf)?;
-            value_lists.write_next_to_request(buf).ok_or_else(|| {
-                ParseError::BadDataToSerialize(
-                    "Mismatch between statement counts for batch query".to_owned(),
-                )
-            })??;
-            n_serialized_statements += 1;
-        }
-        if n_serialized_statements != self.statements_count {
-            return Err(ParseError::BadDataToSerialize(
-                "Mismatch between statement counts for batch query".to_owned(),
-            ));
+            self.values.write_nth_to_request(statement_num, buf)?;
         }
 
         // Serializing consistency