From 13764e6b8e71802c924ff4b5004ce624574e57ff Mon Sep 17 00:00:00 2001
From: pedrocarlo <pedro.muniz.carlo@gmail.com>
Date: Fri, 26 Sep 2025 13:15:07 -0300
Subject: [PATCH] in mvcc if creating a ddl statement, first commit all
 connections

---
 simulator/generation/plan.rs | 50 +++++++++++++++++++++++++++++++++++-
 simulator/model/mod.rs       |  8 ++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/simulator/generation/plan.rs b/simulator/generation/plan.rs
index cf202618f..007ae63f2 100644
--- a/simulator/generation/plan.rs
+++ b/simulator/generation/plan.rs
@@ -233,9 +233,38 @@ impl InteractionPlan {
 
             tracing::debug!("Generating interaction {}/{}", self.len(), num_interactions);
 
-            let out_interactions = interactions.interactions();
+            let mut out_interactions = interactions.interactions();
 
             assert!(!out_interactions.is_empty());
+
+            let out_interactions = if self.mvcc
+                && out_interactions
+                    .iter()
+                    .any(|interaction| interaction.is_ddl())
+            {
+                // DDL statements must be serial, so commit all connections and then execute the DDL
+                let mut commit_interactions = (0..env.connections.len())
+                    .filter(|&idx| env.conn_in_transaction(idx))
+                    .map(|idx| {
+                        let query = Query::Commit(Commit);
+                        let interaction = Interactions::new(idx, InteractionsType::Query(query));
+                        let out_interactions = interaction.interactions();
+                        self.plan.push(interaction);
+                        out_interactions
+                    })
+                    .fold(
+                        Vec::with_capacity(env.connections.len()),
+                        |mut accum, mut curr| {
+                            accum.append(&mut curr);
+                            accum
+                        },
+                    );
+                commit_interactions.append(&mut out_interactions);
+                commit_interactions
+            } else {
+                out_interactions
+            };
+
             self.plan.push(interactions);
             Some(out_interactions)
         } else {
@@ -401,6 +430,15 @@ pub enum InteractionsType {
     Fault(Fault),
 }
 
+impl InteractionsType {
+    pub fn is_transaction(&self) -> bool {
+        match self {
+            InteractionsType::Query(query) => query.is_transaction(),
+            _ => false,
+        }
+    }
+}
+
 impl Interactions {
     pub(crate) fn name(&self) -> Option<&str> {
         match &self.interactions {
@@ -671,7 +709,17 @@ impl Shadow for InteractionType {
         }
     }
 }
+
 impl InteractionType {
+    pub fn is_ddl(&self) -> bool {
+        match self {
+            InteractionType::Query(query)
+            | InteractionType::FsyncQuery(query)
+            | InteractionType::FaultyQuery(query) => query.is_ddl(),
+            _ => false,
+        }
+    }
+
     pub(crate) fn execute_query(&self, conn: &mut Arc<Connection>) -> ResultSet {
         if let Self::Query(query) = self {
             let query_str = query.to_string();
diff --git a/simulator/model/mod.rs b/simulator/model/mod.rs
index 092d59a13..551c08b1d 100644
--- a/simulator/model/mod.rs
+++ b/simulator/model/mod.rs
@@ -69,6 +69,14 @@ impl Query {
             Self::Begin(..) | Self::Commit(..) | Self::Rollback(..)
         )
     }
+
+    #[inline]
+    pub fn is_ddl(&self) -> bool {
+        matches!(
+            self,
+            Self::Create(..) | Self::CreateIndex(..) | Self::Drop(..)
+        )
+    }
 }
 
 impl Display for Query {