- Fix: oneofs were not being emitted.

flipp-oss · Feb 26, 2024 · 3bc19d2 · 3bc19d2
1 parent dcf0931
commit 3bc19d2
Show file tree

Hide file tree

Showing 17 changed files with 382 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,5 @@
+# Changelog
+
+# 0.5 - 2024-02-26
+
+- Fix: oneofs were not being emitted.
diff --git a/avro/record.go b/avro/record.go
@@ -78,6 +78,7 @@ func RecordFromProto(proto *descriptorpb.DescriptorProto, namespace string) []Na
 		if field.OneofIndex != nil && !field.GetProto3Optional() {
 			union := oneofs[field.GetOneofIndex()].Type.(Union)
 			union.Types = append(union.Types, FieldTypeFromProto(field))
+			oneofs[field.GetOneofIndex()].Type = union
 		} else {
 			fields = append(fields, FieldFromProto(field))
 		}

diff --git a/testdata/base/AOneOf.avsc b/testdata/base/AOneOf.avsc
@@ -0,0 +1,37 @@
+{
+  "type": "record",
+  "name": "AOneOf",
+  "namespace": "testdata",
+  "fields": [
+    {
+      "name": "a_oneof",
+      "type": [
+        {
+          "type": "record",
+          "name": "TypeA",
+          "namespace": "testdata",
+          "fields": [
+            {
+              "name": "foo",
+              "type": "string",
+              "default": ""
+            }
+          ]
+        },
+        {
+          "type": "record",
+          "name": "TypeB",
+          "namespace": "testdata",
+          "fields": [
+            {
+              "name": "bar",
+              "type": "string",
+              "default": ""
+            }
+          ]
+        }
+      ],
+      "default": null
+    }
+  ]
+}
diff --git a/testdata/base/AYowzaMapEntry.avsc b/testdata/base/AYowzaMapEntry.avsc
@@ -25,4 +25,4 @@
       "default": {}
     }
   ]
-}
+}
diff --git a/testdata/base/TypeA.avsc b/testdata/base/TypeA.avsc
@@ -0,0 +1,12 @@
+{
+  "type": "record",
+  "name": "TypeA",
+  "namespace": "testdata",
+  "fields": [
+    {
+      "name": "foo",
+      "type": "string",
+      "default": ""
+    }
+  ]
+}
diff --git a/testdata/base/TypeB.avsc b/testdata/base/TypeB.avsc
@@ -0,0 +1,12 @@
+{
+  "type": "record",
+  "name": "TypeB",
+  "namespace": "testdata",
+  "fields": [
+    {
+      "name": "bar",
+      "type": "string",
+      "default": ""
+    }
+  ]
+}
diff --git a/testdata/base/Widget.avsc b/testdata/base/Widget.avsc
@@ -181,6 +181,50 @@
         "values": "testdata.StringList"
       },
       "default": {}
+    },
+    {
+      "name": "a_one_of",
+      "type": [
+        "null",
+        {
+          "type": "record",
+          "name": "AOneOf",
+          "namespace": "testdata",
+          "fields": [
+            {
+              "name": "a_oneof",
+              "type": [
+                {
+                  "type": "record",
+                  "name": "TypeA",
+                  "namespace": "testdata",
+                  "fields": [
+                    {
+                      "name": "foo",
+                      "type": "string",
+                      "default": ""
+                    }
+                  ]
+                },
+                {
+                  "type": "record",
+                  "name": "TypeB",
+                  "namespace": "testdata",
+                  "fields": [
+                    {
+                      "name": "bar",
+                      "type": "string",
+                      "default": ""
+                    }
+                  ]
+                }
+              ],
+              "default": null
+            }
+          ]
+        }
+      ],
+      "default": null
     }
   ]
 }
diff --git a/testdata/collapse_fields/AOneOf.avsc b/testdata/collapse_fields/AOneOf.avsc
@@ -0,0 +1,37 @@
+{
+  "type": "record",
+  "name": "AOneOf",
+  "namespace": "testdata",
+  "fields": [
+    {
+      "name": "a_oneof",
+      "type": [
+        {
+          "type": "record",
+          "name": "TypeA",
+          "namespace": "testdata",
+          "fields": [
+            {
+              "name": "foo",
+              "type": "string",
+              "default": ""
+            }
+          ]
+        },
+        {
+          "type": "record",
+          "name": "TypeB",
+          "namespace": "testdata",
+          "fields": [
+            {
+              "name": "bar",
+              "type": "string",
+              "default": ""
+            }
+          ]
+        }
+      ],
+      "default": null
+    }
+  ]
+}
diff --git a/testdata/collapse_fields/TypeA.avsc b/testdata/collapse_fields/TypeA.avsc
@@ -0,0 +1,12 @@
+{
+  "type": "record",
+  "name": "TypeA",
+  "namespace": "testdata",
+  "fields": [
+    {
+      "name": "foo",
+      "type": "string",
+      "default": ""
+    }
+  ]
+}
diff --git a/testdata/collapse_fields/TypeB.avsc b/testdata/collapse_fields/TypeB.avsc
@@ -0,0 +1,12 @@
+{
+  "type": "record",
+  "name": "TypeB",
+  "namespace": "testdata",
+  "fields": [
+    {
+      "name": "bar",
+      "type": "string",
+      "default": ""
+    }
+  ]
+}
diff --git a/testdata/collapse_fields/Widget.avsc b/testdata/collapse_fields/Widget.avsc
@@ -174,6 +174,50 @@
         "values": "testdata.StringList"
       },
       "default": {}
+    },
+    {
+      "name": "a_one_of",
+      "type": [
+        "null",
+        {
+          "type": "record",
+          "name": "AOneOf",
+          "namespace": "testdata",
+          "fields": [
+            {
+              "name": "a_oneof",
+              "type": [
+                {
+                  "type": "record",
+                  "name": "TypeA",
+                  "namespace": "testdata",
+                  "fields": [
+                    {
+                      "name": "foo",
+                      "type": "string",
+                      "default": ""
+                    }
+                  ]
+                },
+                {
+                  "type": "record",
+                  "name": "TypeB",
+                  "namespace": "testdata",
+                  "fields": [
+                    {
+                      "name": "bar",
+                      "type": "string",
+                      "default": ""
+                    }
+                  ]
+                }
+              ],
+              "default": null
+            }
+          ]
+        }
+      ],
+      "default": null
     }
   ]
 }
diff --git a/testdata/emit_only/Widget.avsc b/testdata/emit_only/Widget.avsc
@@ -181,6 +181,50 @@
         "values": "testdata.StringList"
       },
       "default": {}
+    },
+    {
+      "name": "a_one_of",
+      "type": [
+        "null",
+        {
+          "type": "record",
+          "name": "AOneOf",
+          "namespace": "testdata",
+          "fields": [
+            {
+              "name": "a_oneof",
+              "type": [
+                {
+                  "type": "record",
+                  "name": "TypeA",
+                  "namespace": "testdata",
+                  "fields": [
+                    {
+                      "name": "foo",
+                      "type": "string",
+                      "default": ""
+                    }
+                  ]
+                },
+                {
+                  "type": "record",
+                  "name": "TypeB",
+                  "namespace": "testdata",
+                  "fields": [
+                    {
+                      "name": "bar",
+                      "type": "string",
+                      "default": ""
+                    }
+                  ]
+                }
+              ],
+              "default": null
+            }
+          ]
+        }
+      ],
+      "default": null
     }
   ]
 }
diff --git a/testdata/namespace_map/AOneOf.avsc b/testdata/namespace_map/AOneOf.avsc
@@ -0,0 +1,37 @@
+{
+  "type": "record",
+  "name": "AOneOf",
+  "namespace": "mynamespace",
+  "fields": [
+    {
+      "name": "a_oneof",
+      "type": [
+        {
+          "type": "record",
+          "name": "TypeA",
+          "namespace": "mynamespace",
+          "fields": [
+            {
+              "name": "foo",
+              "type": "string",
+              "default": ""
+            }
+          ]
+        },
+        {
+          "type": "record",
+          "name": "TypeB",
+          "namespace": "mynamespace",
+          "fields": [
+            {
+              "name": "bar",
+              "type": "string",
+              "default": ""
+            }
+          ]
+        }
+      ],
+      "default": null
+    }
+  ]
+}
diff --git a/testdata/namespace_map/TypeA.avsc b/testdata/namespace_map/TypeA.avsc
@@ -0,0 +1,12 @@
+{
+  "type": "record",
+  "name": "TypeA",
+  "namespace": "mynamespace",
+  "fields": [
+    {
+      "name": "foo",
+      "type": "string",
+      "default": ""
+    }
+  ]
+}
diff --git a/testdata/namespace_map/TypeB.avsc b/testdata/namespace_map/TypeB.avsc
@@ -0,0 +1,12 @@
+{
+  "type": "record",
+  "name": "TypeB",
+  "namespace": "mynamespace",
+  "fields": [
+    {
+      "name": "bar",
+      "type": "string",
+      "default": ""
+    }
+  ]
+}