prepared: update result metadata after reprepare

scylladb · Feb 7, 2024 · 746a6e1 · 746a6e1
1 parent a9a2a6c
commit 746a6e1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/scylla/src/statement/prepared_statement.rs b/scylla/src/statement/prepared_statement.rs
@@ -315,6 +315,10 @@ impl PreparedStatement {
         self.shared.result_metadata.load_full()
     }
 
+    pub(crate) fn set_result_metadata(&self, metadata: Arc<ResultMetadata>) {
+        self.shared.result_metadata.store(metadata)
+    }
+
     /// Get the name of the partitioner used for this statement.
     pub(crate) fn get_partitioner_name(&self) -> &PartitionerName {
         &self.partitioner_name

diff --git a/scylla/src/transport/connection.rs b/scylla/src/transport/connection.rs
@@ -588,6 +588,8 @@ impl Connection {
                 "Prepared statement Id changed, md5 sum should stay the same",
             ))
         } else {
+            // Update the result metadata.
+            previous_prepared.set_result_metadata(reprepared.get_result_metadata());
             Ok(())
         }
     }
@@ -733,6 +735,15 @@ impl Connection {
                 // Repreparation of a statement is needed
                 self.reprepare(prepared_statement.get_statement(), prepared_statement)
                     .await?;
+
+                // Since we make use of `ArcSwap` for `ResultMetadata`,
+                // old `cached_metadata` variable points to old metadata before reprepare.
+                // We need to fetch updated metadata from the object.
+                let cached_metadata = self
+                    .config
+                    .skip_result_metadata
+                    .then(|| prepared_statement.get_result_metadata());
+
                 self.send_request(
                     &execute_frame,
                     true,