Merge branch '7.5.x' into 7.6.x by rayokota

confluentinc · Jan 18, 2025 · b8346f9 · b8346f9
2 parents 7be77ea + 6c46a9b
commit b8346f9
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/avro-serializer/src/test/java/io/confluent/kafka/serializers/AvroSchemaTest.java b/avro-serializer/src/test/java/io/confluent/kafka/serializers/AvroSchemaTest.java
@@ -721,6 +721,41 @@ public void testEnumWithDefault() {
     assertNotEquals(new AvroSchema(enumSchema), new AvroSchema(enumSchemaWithDefault));
   }
 
+  @Test
+  public void testArrayWithDoc() {
+    String s1 = "\n"
+        + "{\n"
+        + "    \"type\": \"array\",\n"
+        + "    \"items\": { \n"
+        + "        \"type\": \"record\",\n"
+        + "        \"name\": \"top\",\n"
+        + "        \"doc\": \"test\",\n"
+        + "        \"fields\": [\n"
+        + "            {\n"
+        + "                \"name\": \"field1\",\n"
+        + "                \"type\": \"string\"\n"
+        + "            }\n"
+        + "        ]\n"
+        + "    }\n"
+        + "}";
+    String s2 = "\n"
+        + "{\n"
+        + "    \"type\": \"array\",\n"
+        + "    \"items\": { \n"
+        + "        \"type\": \"record\",\n"
+        + "        \"name\": \"top\",\n"
+        + "        \"doc\": \"test2\",\n"
+        + "        \"fields\": [\n"
+        + "            {\n"
+        + "                \"name\": \"field1\",\n"
+        + "                \"type\": \"string\"\n"
+        + "            }\n"
+        + "        ]\n"
+        + "    }\n"
+        + "}";
+    assertNotEquals(new AvroSchema(s1), new AvroSchema(s2));
+  }
+
   @Test
   public void testBasicAddAndRemoveTags() {
     String schemaString = "{\n" +
@@ -1297,7 +1332,6 @@ public void testTagsInsertionOrder() {
 
     ParsedSchema resultSchema = schema.copy(tags, Collections.emptyMap());
     assertEquals(expectSchema.canonicalString(), resultSchema.canonicalString());
-
   }
 
   private static void expectConversionException(JsonNode obj, AvroSchema schema) {

diff --git a/client/src/main/java/io/confluent/kafka/schemaregistry/avro/AvroSchema.java b/client/src/main/java/io/confluent/kafka/schemaregistry/avro/AvroSchema.java
@@ -426,6 +426,10 @@ private boolean metaEqual(
         return Objects.equals(schema1.getAliases(), schema2.getAliases())
             && Objects.equals(schema1.getDoc(), schema2.getDoc())
             && Objects.equals(schema1.getEnumDefault(), schema2.getEnumDefault());
+      case ARRAY:
+        return metaEqual(schema1.getElementType(), schema2.getElementType(), cache);
+      case MAP:
+        return metaEqual(schema1.getValueType(), schema2.getValueType(), cache);
       case FIXED:
         return Objects.equals(schema1.getAliases(), schema2.getAliases())
             && Objects.equals(schema1.getDoc(), schema2.getDoc());
@@ -501,6 +505,10 @@ private int metaHash(Schema schema, Map<Schema, Integer> cache) {
         return result;
       case ENUM:
         return Objects.hash(schema.getAliases(), schema.getDoc(), schema.getEnumDefault());
+      case ARRAY:
+        return metaHash(schema.getElementType(), cache);
+      case MAP:
+        return metaHash(schema.getValueType(), cache);
       case FIXED:
         return Objects.hash(schema.getAliases(), schema.getDoc());
       case UNION: