Skip to content

Commit 62cc80a

Browse files
authored
fix: update BQTableSchemaToProtoDescriptor to unblock a protobuf change. (#1942)
This is a copy from the internal change cl/500839786.
1 parent 2863542 commit 62cc80a

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.google.protobuf.Descriptors;
2626
import com.google.protobuf.Descriptors.Descriptor;
2727
import com.google.protobuf.Descriptors.FileDescriptor;
28+
import com.google.protobuf.ExtensionLite;
2829
import java.util.ArrayList;
2930
import java.util.HashMap;
3031
import java.util.List;
@@ -160,7 +161,12 @@ private static FieldDescriptorProto convertBQTableFieldToProtoField(
160161
if (!BigQuerySchemaUtil.isProtoCompatible(fieldName)) {
161162
fieldDescriptor.setName(BigQuerySchemaUtil.generatePlaceholderFieldName(fieldName));
162163
fieldDescriptor.setOptions(
163-
FieldOptions.newBuilder().setExtension(AnnotationsProto.columnName, fieldName).build());
164+
FieldOptions.newBuilder()
165+
.setExtension(
166+
(ExtensionLite<FieldOptions, String>) AnnotationsProto.columnName,
167+
// Remove ExtensionLite after protobuf linkage error is resolved.
168+
fieldName)
169+
.build());
164170
}
165171
return fieldDescriptor.build();
166172
}

0 commit comments

Comments
 (0)