feat: add support for proto3 optional tag (#2295)

agrawal-siddharth · web-flow · commit bc88aa57f55b · 2023-10-30T20:25:42.000-07:00
diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoSchemaConverter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoSchemaConverter.java
@@ -102,6 +102,17 @@ private static ProtoSchema convertInternal(
           enumTypes.add(enumFullName);
         }
       }
+      // The protobuf payload will be decoded as proto2 on the server side. The schema is also
+      // specified as proto2. Hence we must clear proto3-only features. This works since proto2 and
+      // proto3 are binary-compatible.
+      if (resultField.hasProto3Optional()) {
+        // Clear proto3-only features
+        resultField.clearProto3Optional();
+      }
+      if (resultField.hasOneofIndex()) {
+        // Clear proto3-only features
+        resultField.clearOneofIndex();
+      }
       resultProto.addField(resultField);
     }
     structTypes.add(protoFullName);

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,17 @@ private static ProtoSchema convertInternal(`
`102`	`102`	`enumTypes.add(enumFullName);`
`103`	`103`	`}`
`104`	`104`	`}`
	`105`	`+ // The protobuf payload will be decoded as proto2 on the server side. The schema is also`
	`106`	`+ // specified as proto2. Hence we must clear proto3-only features. This works since proto2 and`
	`107`	`+ // proto3 are binary-compatible.`
	`108`	`+ if (resultField.hasProto3Optional()) {`
	`109`	`+ // Clear proto3-only features`
	`110`	`+ resultField.clearProto3Optional();`
	`111`	`+ }`
	`112`	`+ if (resultField.hasOneofIndex()) {`
	`113`	`+ // Clear proto3-only features`
	`114`	`+ resultField.clearOneofIndex();`
	`115`	`+ }`
`105`	`116`	`resultProto.addField(resultField);`
`106`	`117`	`}`
`107`	`118`	`structTypes.add(protoFullName);`