AVRO-4026: [c++] Allow non-string custom attributes in schemas. Custo…

…m attributes are JSON string to avoid ambiguity
apache · Aug 6, 2024 · c6e2111 · c6e2111
1 parent e91fd0e
commit c6e2111
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/lang/c++/impl/Compiler.cc b/lang/c++/impl/Compiler.cc
@@ -277,7 +277,7 @@ static void getCustomAttributes(const Object &m, CustomAttributes &customAttribu
     const std::unordered_set<std::string> &kKnownFields = getKnownFields();
     for (const auto &entry : m) {
         if (kKnownFields.find(entry.first) == kKnownFields.end()) {
-            customAttributes.addAttribute(entry.first, entry.second.stringValue());
+            customAttributes.addAttribute(entry.first, entry.second.toString());
         }
     }
 }

diff --git a/lang/c++/impl/CustomAttributes.cc b/lang/c++/impl/CustomAttributes.cc
@@ -48,6 +48,6 @@ void CustomAttributes::printJson(std::ostream &os,
     if (attributes().find(name) == attributes().end()) {
         throw Exception(name + " doesn't exist");
     }
-    os << "\"" << name << "\": \"" << attributes().at(name) << "\"";
+    os << "\"" << name << "\": " << attributes().at(name);
 }
 } // namespace avro
diff --git a/lang/c++/test/SchemaTests.cc b/lang/c++/test/SchemaTests.cc
@@ -111,7 +111,10 @@ const char *basicSchemas[] = {
     "[{\"name\": \"f1\",\"type\": \"long\",\"extra field\": \"1\"}]}",
     "{\"type\": \"record\",\"name\": \"Test\",\"fields\": "
     "[{\"name\": \"f1\",\"type\": \"long\","
-    "\"extra field1\": \"1\",\"extra field2\": \"2\"}]}"};
+    "\"extra field1\": \"1\",\"extra field2\": \"2\"}]}",
+    R"({"type": "record","name": "Test","fields":
+       [{"name": "f1","type": "string", "extra": {"custom1": "value","custom2": true }}]})"
+};
 
 const char *basicSchemaErrors[] = {
     // Record

diff --git a/lang/c++/test/unittest.cc b/lang/c++/test/unittest.cc
@@ -441,7 +441,7 @@ struct TestSchema {
         concepts::MultiAttribute<CustomAttributes> customAttributes;
 
         CustomAttributes cf;
-        cf.addAttribute("stringField", std::string("\\\"field value with \\\"double quotes\\\"\\\""));
+        cf.addAttribute("stringField", std::string(R"("\"field value with \"double quotes\"\"")"));
         cf.addAttribute("booleanField", std::string("true"));
         cf.addAttribute("numberField", std::string("1.23"));
         cf.addAttribute("nullField", std::string("null"));
@@ -457,11 +457,11 @@ struct TestSchema {
         std::string expectedJsonWithCustomAttribute =
             "{\"type\": \"record\", \"name\": \"Test\",\"fields\": "
             "[{\"name\": \"f1\", \"type\": \"long\", "
-            "\"arrayField\": \"[1]\", "
-            "\"booleanField\": \"true\", "
-            "\"mapField\": \"{\\\"key1\\\":\\\"value1\\\", \\\"key2\\\":\\\"value2\\\"}\", "
-            "\"nullField\": \"null\", "
-            "\"numberField\": \"1.23\", "
+            "\"arrayField\": [1], "
+            "\"booleanField\": true, "
+            "\"mapField\": {\\\"key1\\\":\\\"value1\\\", \\\"key2\\\":\\\"value2\\\"}, "
+            "\"nullField\": null, "
+            "\"numberField\": 1.23, "
             "\"stringField\": \"\\\"field value with \\\"double quotes\\\"\\\"\""
             "}]}";
         testNodeRecord(nodeRecordWithCustomAttribute,