Verify schema registry

aklivity · Sep 18, 2024 · 8ea8b04 · 8ea8b04
1 parent 862d291
commit 8ea8b04
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 9 deletions.
diff --git a/...kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/pgsql/kafka/config/proxy.yaml b/...kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/pgsql/kafka/config/proxy.yaml
@@ -20,7 +20,27 @@ catalogs:
     type: test
     options:
       url: http://localhost:8081
-
+      id: 1
+      schema: |-
+        {
+        "type": "record",
+        "name": "cities",
+        "namespace": "dev",
+        "fields": [
+          {
+            "name": "description",
+            "type": string
+          },
+          {
+            "name": "id",
+            "type": string
+          },
+          {
+            "name": "name",
+            "type": string
+          }
+        ]
+        }
 bindings:
   app0:
     type: pgsql-kafka

diff --git a/.../zilla/runtime/binding/pgsql/kafka/internal/schema/PgsqlKafkaValueAvroSchemaTemplate.java b/.../zilla/runtime/binding/pgsql/kafka/internal/schema/PgsqlKafkaValueAvroSchemaTemplate.java
@@ -40,8 +40,7 @@ public String generateSchema(
         schemaBuilder.setLength(0);
 
         final String newNamespace = namespace.replace(DATABASE_PLACEHOLDER, database);
-
-        final String recordName = String.format("%s.%s", database, createTable.getTable().getName());
+        final String recordName = createTable.getTable().getName();
 
         schemaBuilder.append("{\n");
         schemaBuilder.append("\"type\": \"record\",\n");

diff --git a/...io/aklivity/zilla/runtime/binding/pgsql/kafka/internal/stream/PgsqlKafkaProxyFactory.java b/...io/aklivity/zilla/runtime/binding/pgsql/kafka/internal/stream/PgsqlKafkaProxyFactory.java
@@ -15,6 +15,7 @@
 package io.aklivity.zilla.runtime.binding.pgsql.kafka.internal.stream;
 
 import static io.aklivity.zilla.runtime.engine.buffer.BufferPool.NO_SLOT;
+import static io.aklivity.zilla.runtime.engine.catalog.CatalogHandler.NO_VERSION_ID;
 import static java.util.Objects.requireNonNull;
 
 import java.io.InputStreamReader;
@@ -1346,14 +1347,20 @@ else if (server.commandsProcessed == 1)
             final PgsqlKafkaBindingConfig binding = server.binding;
             final String schema = binding.avroValueSchema.generateSchema(server.database, statement);
             final String subject = String.format("%s.%s-value", server.database, topic);
-            binding.catalog.register(subject, schema);
 
-            final String policy = binding.avroValueSchema.primaryKey(statement) != null
-                ? "compact"
-                : "delete";
+            if (binding.catalog.register(subject, schema) != NO_VERSION_ID)
+            {
+                final String policy = binding.avroValueSchema.primaryKey(statement) != null
+                    ? "compact"
+                    : "delete";
 
-            final KafkaCreateTopicsProxy createTopicsProxy = server.createTopicsProxy;
-            createTopicsProxy.doKafkaBegin(traceId, authorization, topics, policy);
+                final KafkaCreateTopicsProxy createTopicsProxy = server.createTopicsProxy;
+                createTopicsProxy.doKafkaBegin(traceId, authorization, topics, policy);
+            }
+            else
+            {
+                server.cleanup(traceId, authorization);
+            }
         }
     }
 

diff --git a/.../test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/TestCatalogHandler.java b/.../test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/TestCatalogHandler.java
@@ -38,6 +38,14 @@ public TestCatalogHandler(
         this.url = options != null ? options.url : null;
     }
 
+    @Override
+    public int register(
+        String subject,
+        String schema)
+    {
+        return this.schema.equals(schema) ? this.id : NO_VERSION_ID;
+    }
+
     @Override
     public int resolve(
         String subject,