FLUSH after insert to make SHOW command predictable (#1427)

akrambek · web-flow · commit 915668e4e293 · 2025-03-05T20:55:42.000-08:00
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.zfunction/client.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.zfunction/client.rpt
@@ -178,7 +178,8 @@ write "INSERT INTO zb_catalog.zfunctions (name, sql) VALUES ('send_payment', 'CR
       "$$\n"
       "WITH (\n"
       " EVENTS = ''app_events''\n"
-      ");');"
+      ");'); "
+      "FLUSH;"
       [0x00]
 
 read advised zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.zfunction/server.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.zfunction/server.rpt
@@ -180,7 +180,8 @@ read "INSERT INTO zb_catalog.zfunctions (name, sql) VALUES ('send_payment', 'CRE
      "$$\n"
      "WITH (\n"
      " EVENTS = ''app_events''\n"
-     ");');"
+     ");'); "
+     "FLUSH;"
      [0x00]
 
 write advise zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.double.quote.name/client.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.double.quote.name/client.rpt
@@ -190,7 +190,8 @@ write zilla:data.ext ${pgsql:dataEx()
                                 .build()
                               .build()}
 write "INSERT INTO zb_catalog.ztables (name, sql) VALUES "
-     "('cities', 'CREATE ZTABLE IF NOT EXISTS \"cities\" (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));');"
+     "('cities', 'CREATE ZTABLE IF NOT EXISTS \"cities\" (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));'); "
+     "FLUSH;"
       [0x00]
 write flush
 
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.double.quote.name/server.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.double.quote.name/server.rpt
@@ -188,7 +188,8 @@ read zilla:data.ext ${pgsql:dataEx()
                                 .build()
                               .build()}
 read "INSERT INTO zb_catalog.ztables (name, sql) VALUES "
-     "('cities', 'CREATE ZTABLE IF NOT EXISTS \"cities\" (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));');"
+     "('cities', 'CREATE ZTABLE IF NOT EXISTS \"cities\" (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));'); "
+     "FLUSH;"
      [0x00]
 
 write advise zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.generated.as/client.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.generated.as/client.rpt
@@ -202,7 +202,8 @@ write "INSERT INTO zb_catalog.ztables (name, sql) VALUES "
       "(id VARCHAR, name VARCHAR, description VARCHAR, "
       "owner_id VARCHAR GENERATED ALWAYS AS IDENTITY, "
       "created_at TIMESTAMP GENERATED ALWAYS AS NOW, "
-      "PRIMARY KEY (id));');"
+      "PRIMARY KEY (id));'); "
+      "FLUSH;"
       [0x00]
 
 
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.generated.as/server.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.generated.as/server.rpt
@@ -200,7 +200,8 @@ read "INSERT INTO zb_catalog.ztables (name, sql) VALUES "
      "(id VARCHAR, name VARCHAR, description VARCHAR, "
      "owner_id VARCHAR GENERATED ALWAYS AS IDENTITY, "
      "created_at TIMESTAMP GENERATED ALWAYS AS NOW, "
-     "PRIMARY KEY (id));');"
+     "PRIMARY KEY (id));'); "
+     "FLUSH;"
      [0x00]
 
 write advise zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.primary.key/client.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.primary.key/client.rpt
@@ -190,7 +190,8 @@ write zilla:data.ext ${pgsql:dataEx()
                                 .build()
                               .build()}
 write "INSERT INTO zb_catalog.ztables (name, sql) VALUES "
-      "('cities', 'CREATE ZTABLE IF NOT EXISTS cities (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));');"
+      "('cities', 'CREATE ZTABLE IF NOT EXISTS cities (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));'); "
+      "FLUSH;"
       [0x00]
 write flush
 
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.primary.key/server.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.ztable.with.primary.key/server.rpt
@@ -188,7 +188,8 @@ read zilla:data.ext ${pgsql:dataEx()
                                 .build()
                               .build()}
 read "INSERT INTO zb_catalog.ztables (name, sql) VALUES "
-     "('cities', 'CREATE ZTABLE IF NOT EXISTS cities (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));');"
+     "('cities', 'CREATE ZTABLE IF NOT EXISTS cities (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));'); "
+     "FLUSH;"
      [0x00]
 
 write advise zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.zview/client.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.zview/client.rpt
@@ -204,7 +204,8 @@ write zilla:data.ext ${pgsql:dataEx()
                                 .build()
                               .build()}
 write "INSERT INTO zb_catalog.zviews (name, sql) VALUES "
-      "('distinct_cities', 'CREATE ZVIEW IF NOT EXISTS distinct_cities AS SELECT id, city FROM weather GROUP BY city;');"
+      "('distinct_cities', 'CREATE ZVIEW IF NOT EXISTS distinct_cities AS SELECT id, city FROM weather GROUP BY city;'); "
+      "FLUSH;"
      [0x00]
 write flush
 
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.zview/server.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/create.zview/server.rpt
@@ -208,7 +208,8 @@ read zilla:data.ext ${pgsql:dataEx()
                                 .build()
                               .build()}
 read "INSERT INTO zb_catalog.zviews (name, sql) VALUES "
-      "('distinct_cities', 'CREATE ZVIEW IF NOT EXISTS distinct_cities AS SELECT id, city FROM weather GROUP BY city;');"
+      "('distinct_cities', 'CREATE ZVIEW IF NOT EXISTS distinct_cities AS SELECT id, city FROM weather GROUP BY city;'); "
+      "FLUSH;"
      [0x00]
 
 write advise zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.zfunction/client.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.zfunction/client.rpt
@@ -32,7 +32,7 @@ write zilla:data.ext ${pgsql:dataEx()
                               .query()
                                 .build()
                               .build()}
-write "DELETE FROM zb_catalog.zfunctions WHERE name = 'send_payment';"
+write "DELETE FROM zb_catalog.zfunctions WHERE name = 'send_payment'; FLUSH;"
       [0x00]
 
 read advised zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.zfunction/server.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.zfunction/server.rpt
@@ -34,7 +34,7 @@ read zilla:data.ext ${pgsql:dataEx()
                               .query()
                                 .build()
                               .build()}
-read "DELETE FROM zb_catalog.zfunctions WHERE name = 'send_payment';"
+read "DELETE FROM zb_catalog.zfunctions WHERE name = 'send_payment'; FLUSH;"
       [0x00]
 
 write advise zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.ztable/client.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.ztable/client.rpt
@@ -101,7 +101,7 @@ write zilla:data.ext ${pgsql:dataEx()
                               .query()
                                 .build()
                               .build()}
-write "DELETE FROM zb_catalog.ztables WHERE name = 'weather';"
+write "DELETE FROM zb_catalog.ztables WHERE name = 'weather'; FLUSH;"
       [0x00]
 write flush
 
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.ztable/server.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.ztable/server.rpt
@@ -102,7 +102,7 @@ read zilla:data.ext ${pgsql:dataEx()
                               .query()
                                 .build()
                               .build()}
-read "DELETE FROM zb_catalog.ztables WHERE name = 'weather';"
+read "DELETE FROM zb_catalog.ztables WHERE name = 'weather'; FLUSH;"
       [0x00]
 
 write advise zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.zview/client.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.zview/client.rpt
@@ -55,7 +55,7 @@ write zilla:data.ext ${pgsql:dataEx()
                               .query()
                                 .build()
                               .build()}
-write "DELETE FROM zb_catalog.zviews WHERE name = 'weather';"
+write "DELETE FROM zb_catalog.zviews WHERE name = 'weather'; FLUSH;"
       [0x00]
 write flush
 
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.zview/server.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/drop.zview/server.rpt
@@ -56,7 +56,7 @@ read zilla:data.ext ${pgsql:dataEx()
                               .query()
                                 .build()
                               .build()}
-read "DELETE FROM zb_catalog.zviews WHERE name = 'weather';"
+read "DELETE FROM zb_catalog.zviews WHERE name = 'weather'; FLUSH;"
       [0x00]
 
 write advise zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/query.with.multiple.statements/client.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/query.with.multiple.statements/client.rpt
@@ -190,7 +190,8 @@ write zilla:data.ext ${pgsql:dataEx()
                                 .build()
                               .build()}
 write "INSERT INTO zb_catalog.ztables (name, sql) VALUES "
-      "('cities', 'CREATE ZTABLE IF NOT EXISTS cities (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));');"
+      "('cities', 'CREATE ZTABLE IF NOT EXISTS cities (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));'); "
+      "FLUSH;"
       [0x00]
 
 read advised zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/query.with.multiple.statements/server.rpt b/incubator/binding-risingwave.spec/src/main/scripts/io/aklivity/zilla/specs/binding/risingwave/streams/effective/query.with.multiple.statements/server.rpt
@@ -188,7 +188,8 @@ read zilla:data.ext ${pgsql:dataEx()
                                 .build()
                               .build()}
 read "INSERT INTO zb_catalog.ztables (name, sql) VALUES "
-     "('cities', 'CREATE ZTABLE IF NOT EXISTS cities (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));');"
+     "('cities', 'CREATE ZTABLE IF NOT EXISTS cities (id VARCHAR, name VARCHAR, description VARCHAR, PRIMARY KEY (id));'); "
+     "FLUSH;"
      [0x00]
 
 write advise zilla:flush ${pgsql:flushEx()
diff --git a/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveCreateZfunctionMacro.java b/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveCreateZfunctionMacro.java
@@ -373,7 +373,7 @@ public RisingwaveMacroState onError(
     private final class InsertIntoCatalogState implements RisingwaveMacroState
     {
         private final String sqlFormat = """
-            INSERT INTO %s.%s (name, sql) VALUES ('%s', '%s');\u0000""";
+            INSERT INTO %s.%s (name, sql) VALUES ('%s', '%s'); FLUSH;\u0000""";
 
         @Override
         public void onStarted(
diff --git a/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveCreateZtableMacro.java b/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveCreateZtableMacro.java
@@ -499,7 +499,7 @@ public RisingwaveMacroState onError(
         private final class InsertIntoCatalogState implements RisingwaveMacroState
         {
             private final String sqlFormat = """
-                INSERT INTO %s.%s (name, sql) VALUES ('%s', '%s');\u0000""";
+                INSERT INTO %s.%s (name, sql) VALUES ('%s', '%s'); FLUSH;\u0000""";
 
             @Override
             public void onStarted(
diff --git a/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveCreateZviewMacro.java b/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveCreateZviewMacro.java
@@ -379,7 +379,7 @@ public RisingwaveMacroState onError(
     private final class InsertIntoCatalogState implements RisingwaveMacroState
     {
         private final String sqlFormat = """
-            INSERT INTO %s.%s (name, sql) VALUES ('%s', '%s');\u0000""";
+            INSERT INTO %s.%s (name, sql) VALUES ('%s', '%s'); FLUSH;\u0000""";
 
         @Override
         public void onStarted(
diff --git a/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveDropZfunctionMacro.java b/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveDropZfunctionMacro.java
@@ -43,7 +43,7 @@ public RisingwaveMacroState start()
     private final class DeleteCatalogState implements RisingwaveMacroState
     {
         private final String sqlFormat = """
-            DELETE FROM %s.zfunctions WHERE name = '%s';\u0000""";
+            DELETE FROM %s.zfunctions WHERE name = '%s'; FLUSH;\u0000""";
 
         @Override
         public void onStarted(
diff --git a/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveDropZtableMacro.java b/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveDropZtableMacro.java
@@ -191,7 +191,7 @@ public RisingwaveMacroState onError(
     private final class DeleteFromCatalogState implements RisingwaveMacroState
     {
         private final String sqlFormat = """
-            DELETE FROM %s.ztables WHERE name = '%s';\u0000""";
+            DELETE FROM %s.ztables WHERE name = '%s'; FLUSH;\u0000""";
 
         @Override
         public void onStarted(
diff --git a/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveDropZviewMacro.java b/incubator/binding-risingwave/src/main/java/io/aklivity/zilla/runtime/binding/risingwave/internal/macro/RisingwaveDropZviewMacro.java
@@ -117,7 +117,7 @@ public RisingwaveMacroState onError(
     private final class DeleteFromCatalogState implements RisingwaveMacroState
     {
         private final String sqlFormat = """
-            DELETE FROM %s.zviews WHERE name = '%s';\u0000""";
+            DELETE FROM %s.zviews WHERE name = '%s'; FLUSH;\u0000""";
 
         @Override
         public void onStarted(
