fix

Author: MisterRaindrop

src/iceberg/avro/avro_schema_util.cc

@@ -855,8 +855,12 @@ Result<::avro::NodePtr> CreateArrayNodeWithFieldIds(const ::avro::NodePtr& origi
 
     // Check and add custom attributes
     if (original_node->customAttributes() > 0) {
-      for (auto& attr : original_node->customAttributesMap()) {
-        new_array_node->addCustomAttribute(attr.first, attr.second);
+      const auto& original_attrs = original_node->customAttributesAt(0);
+      const auto& existing_attrs = original_attrs.attributes();
+      for (const auto& attr_pair : existing_attrs) {
+        ::avro::CustomAttributes attributes;
+        attributes.addAttribute(attr_pair.first, attr_pair.second, /*addQuote=*/false);
+        new_array_node->addCustomAttributesForField(attributes);
       }
     }
 
@@ -881,8 +885,12 @@ Result<::avro::NodePtr> CreateArrayNodeWithFieldIds(const ::avro::NodePtr& origi
 
   // Check and add custom attributes from original node
   if (original_node->customAttributes() > 0) {
-    for (auto& attr : original_node->customAttributesMap()) {
-      new_array_node->addCustomAttribute(attr.first, attr.second);
+    const auto& original_attrs = original_node->customAttributesAt(0);
+    const auto& existing_attrs = original_attrs.attributes();
+    for (const auto& attr_pair : existing_attrs) {
+      ::avro::CustomAttributes attributes;
+      attributes.addAttribute(attr_pair.first, attr_pair.second, /*addQuote=*/false);
+      new_array_node->addCustomAttributesForField(attributes);
     }
   }
 
@@ -947,7 +955,7 @@ Result<::avro::NodePtr> CreateMapNodeWithFieldIds(const ::avro::NodePtr& origina
   // Merge custom attributes from original node if they exist
   if (original_node->customAttributes() > 0) {
     // Merge attributes for key (index 0)
-    if (original_node->hasCustomAttributesForField(0)) {
+    if (original_node->customAttributes() > 0) {
       const auto& original_key_attrs = original_node->customAttributesAt(0);
       const auto& existing_key_attrs = original_key_attrs.attributes();
       for (const auto& attr_pair : existing_key_attrs) {
@@ -960,7 +968,7 @@ Result<::avro::NodePtr> CreateMapNodeWithFieldIds(const ::avro::NodePtr& origina
     }
 
     // Merge attributes for value (index 1)
-    if (original_node->hasCustomAttributesForField(1)) {
+    if (original_node->customAttributes() > 1) {
       const auto& original_value_attrs = original_node->customAttributesAt(1);
       const auto& existing_value_attrs = original_value_attrs.attributes();
       for (const auto& attr_pair : existing_value_attrs) {
@@ -972,9 +980,23 @@ Result<::avro::NodePtr> CreateMapNodeWithFieldIds(const ::avro::NodePtr& origina
       }
     }
 
-    // Merge node-level attributes if any
-    for (auto& attr : original_node->customAttributesMap()) {
-      new_map_node->addCustomAttribute(attr.first, attr.second);
+    // Copy node-level custom attributes if any
+    // We already handled field-specific attributes above, now add any remaining attributes
+    // to preserve all metadata
+    ::avro::CustomAttributes node_attributes;
+    for (size_t i = 0; i < original_node->customAttributes(); i++) {
+      const auto& original_attrs = original_node->customAttributesAt(i);
+      const auto& existing_attrs = original_attrs.attributes();
+      for (const auto& attr_pair : existing_attrs) {
+        // Skip field ID attributes we've already handled
+        if (attr_pair.first != kKeyIdProp && attr_pair.first != kValueIdProp) {
+          node_attributes.addAttribute(attr_pair.first, attr_pair.second, /*addQuote=*/false);
+        }
+      }
+    }
+    // Add node attributes if we found any
+    if (node_attributes.attributes().size() > 0) {
+      new_map_node->addCustomAttributesForField(node_attributes);
     }
   }