Merge branch 'release/0.9.98'

aklivity · Oct 10, 2024 · 057fbb7 · 057fbb7
2 parents 3f67e32 + 8b7efdf
commit 057fbb7
Show file tree

Hide file tree

Showing 133 changed files with 1,100 additions and 136 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,21 @@
 
 ## [Unreleased](https://github.com/aklivity/zilla/tree/HEAD)
 
-[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.96...HEAD)
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.97...HEAD)
+
+**Fixed bugs:**
+
+- Propagate error code in risingwave binding that's coming either from pgsql-kafka or risingwave [\#1286](https://github.com/aklivity/zilla/issues/1286)
+- Zilla get blocked when sending messages to kafka [\#1268](https://github.com/aklivity/zilla/issues/1268)
+
+**Merged pull requests:**
+
+- Propagate error code in risingwave binding that's coming either from pgsql-kafka or risingwave [\#1288](https://github.com/aklivity/zilla/pull/1288) ([akrambek](https://github.com/akrambek))
+- Increase write buffer size to accomidate longer path [\#1287](https://github.com/aklivity/zilla/pull/1287) ([akrambek](https://github.com/akrambek))
+
+## [0.9.97](https://github.com/aklivity/zilla/tree/0.9.97) (2024-10-07)
+
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.96...0.9.97)
 
 **Implemented enhancements:**
 

diff --git a/build/flyweight-maven-plugin/pom.xml b/build/flyweight-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>build</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/build/pom.xml b/build/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/docker-image/pom.xml b/cloud/docker-image/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/helm-chart/pom.xml b/cloud/helm-chart/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/pom.xml b/cloud/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/conf/pom.xml b/conf/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-amqp.spec/pom.xml b/incubator/binding-amqp.spec/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-amqp/pom.xml b/incubator/binding-amqp/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-pgsql-kafka.spec/pom.xml b/incubator/binding-pgsql-kafka.spec/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-pgsql-kafka/pom.xml b/incubator/binding-pgsql-kafka/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-pgsql.spec/pom.xml b/incubator/binding-pgsql.spec/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.97</version>
+    <version>0.9.98</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/...inding-pgsql.spec/src/main/java/io/aklivity/zilla/specs/binding/pgsql/PgsqlFunctions.java b/...inding-pgsql.spec/src/main/java/io/aklivity/zilla/specs/binding/pgsql/PgsqlFunctions.java
@@ -23,6 +23,7 @@
 import io.aklivity.zilla.specs.binding.pgsql.internal.types.stream.PgsqlColumnInfoFW;
 import io.aklivity.zilla.specs.binding.pgsql.internal.types.stream.PgsqlCompletedFlushExFW;
 import io.aklivity.zilla.specs.binding.pgsql.internal.types.stream.PgsqlDataExFW;
+import io.aklivity.zilla.specs.binding.pgsql.internal.types.stream.PgsqlErrorFlushExFW;
 import io.aklivity.zilla.specs.binding.pgsql.internal.types.stream.PgsqlFlushExFW;
 import io.aklivity.zilla.specs.binding.pgsql.internal.types.stream.PgsqlFormat;
 import io.aklivity.zilla.specs.binding.pgsql.internal.types.stream.PgsqlMessageType;
@@ -215,6 +216,13 @@ public PgsqlCompletedFlushExBuilder completion()
             return new PgsqlCompletedFlushExBuilder();
         }
 
+        public PgsqlErrorFlushExBuilder error()
+        {
+            flushExRW.kind(PgsqlMessageType.ERROR.value());
+
+            return new PgsqlErrorFlushExBuilder();
+        }
+
         public PgsqlReadyFlushExBuilder ready()
         {
             flushExRW.kind(PgsqlMessageType.READY.value());
@@ -351,6 +359,44 @@ public PgsqlFlushExBuilder build()
             }
         }
 
+        public final class PgsqlErrorFlushExBuilder
+        {
+            private final PgsqlErrorFlushExFW.Builder pgsqlErrorFlushExRW = new PgsqlErrorFlushExFW.Builder();
+
+            private PgsqlErrorFlushExBuilder()
+            {
+                pgsqlErrorFlushExRW.wrap(writeBuffer, PgsqlFlushExFW.FIELD_OFFSET_TYPE, writeBuffer.capacity());
+            }
+
+            public PgsqlErrorFlushExBuilder severity(
+                String severity)
+            {
+                pgsqlErrorFlushExRW.severity(String.format("%s\u0000", severity));
+                return this;
+            }
+
+            public PgsqlErrorFlushExBuilder code(
+                String code)
+            {
+                pgsqlErrorFlushExRW.code(String.format("%s\u0000", code));
+                return this;
+            }
+
+            public PgsqlErrorFlushExBuilder message(
+                String message)
+            {
+                pgsqlErrorFlushExRW.message(String.format("%s\u0000", message));
+                return this;
+            }
+
+            public PgsqlFlushExBuilder build()
+            {
+                final PgsqlErrorFlushExFW pgsqlErrorFlushEx = pgsqlErrorFlushExRW.build();
+                flushExRO.wrap(writeBuffer, 0, pgsqlErrorFlushEx.limit());
+                return PgsqlFlushExBuilder.this;
+            }
+        }
+
         public final class PgsqlReadyFlushExBuilder
         {
             private final PgsqlReadyFlushExFW.Builder pgsqlReadyFlushExRW = new PgsqlReadyFlushExFW.Builder();

diff --git a/incubator/binding-pgsql.spec/src/main/resources/META-INF/zilla/pgsql.idl b/incubator/binding-pgsql.spec/src/main/resources/META-INF/zilla/pgsql.idl
@@ -33,6 +33,7 @@ scope pgsql
             ROW (68),
             TYPE (84),
             COMPLETION (67),
+            ERROR (69),
             READY (90)
         }
 
@@ -56,6 +57,7 @@ scope pgsql
         {
             case 84: pgsql::stream::PgsqlTypeFlushEx type;
             case 67: pgsql::stream::PgsqlCompletedFlushEx completion;
+            case 69: pgsql::stream::PgsqlErrorFlushEx error;
             case 90: pgsql::stream::PgsqlReadyFlushEx ready;
         }
 
@@ -86,6 +88,13 @@ scope pgsql
             string16 tag;
         }
 
+        struct PgsqlErrorFlushEx
+        {
+            string16 severity;
+            string16 code;
+            string16 message;
+        }
+
         enum PgsqlStatus (uint8)
         {
             IDLE(73),

diff --git a/...aklivity/zilla/specs/binding/pgsql/streams/application/select.table.with.error/client.rpt b/...aklivity/zilla/specs/binding/pgsql/streams/application/select.table.with.error/client.rpt
@@ -0,0 +1,56 @@
+#
+# Copyright 2021-2023 Aklivity Inc
+#
+# Licensed under the Aklivity Community License (the "License"); you may not use
+# this file except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#   https://www.aklivity.io/aklivity-community-license/
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+
+connect "zilla://streams/app0"
+    option zilla:window 8192
+    option zilla:transmission "duplex"
+
+write zilla:begin.ext ${pgsql:beginEx()
+                              .typeId(zilla:id("pgsql"))
+                              .parameter("user", "root")
+                              .parameter("database", "dev")
+                              .parameter("application_name", "psql")
+                              .parameter("client_encoding", "UTF8")
+                              .build()}
+
+connected
+
+write zilla:data.ext ${pgsql:dataEx()
+                              .typeId(zilla:id("pgsql"))
+                              .query()
+                                .build()
+                              .build()}
+write "SELECT * FROM unknown;"
+      [0x00]
+write flush
+
+read advised zilla:flush ${pgsql:flushEx()
+                              .typeId(zilla:id("pgsql"))
+                              .error()
+                                .severity("ERROR")
+                                .code("XX000")
+                                .message("Failed to run the query.")
+                                .build()
+                              .build()}
+
+read advised zilla:flush ${pgsql:flushEx()
+                              .typeId(zilla:id("pgsql"))
+                              .ready()
+                                .status("IDLE")
+                                .build()
+                              .build()}
+
+read closed
+write close
diff --git a/...aklivity/zilla/specs/binding/pgsql/streams/application/select.table.with.error/server.rpt b/...aklivity/zilla/specs/binding/pgsql/streams/application/select.table.with.error/server.rpt
@@ -0,0 +1,59 @@
+#
+# Copyright 2021-2023 Aklivity Inc
+#
+# Licensed under the Aklivity Community License (the "License"); you may not use
+# this file except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#   https://www.aklivity.io/aklivity-community-license/
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+
+property serverAddress "zilla://streams/app0"
+
+accept ${serverAddress}
+    option zilla:window 8192
+    option zilla:transmission "duplex"
+
+accepted
+
+read zilla:begin.ext ${pgsql:beginEx()
+                              .typeId(zilla:id("pgsql"))
+                              .parameter("user", "root")
+                              .parameter("database", "dev")
+                              .parameter("application_name", "psql")
+                              .parameter("client_encoding", "UTF8")
+                              .build()}
+
+connected
+
+read zilla:data.ext ${pgsql:dataEx()
+                              .typeId(zilla:id("pgsql"))
+                              .query()
+                                .build()
+                              .build()}
+read "SELECT * FROM unknown;"
+     [0x00]
+
+write advise zilla:flush ${pgsql:flushEx()
+                              .typeId(zilla:id("pgsql"))
+                              .error()
+                                .severity("ERROR")
+                                .code("XX000")
+                                .message("Failed to run the query.")
+                                .build()
+                              .build()}
+
+write advise zilla:flush ${pgsql:flushEx()
+                              .typeId(zilla:id("pgsql"))
+                              .ready()
+                                .status("IDLE")
+                                .build()
+                              .build()}
+
+write close
+read closed