You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2022/07/19 02:26:20 UTC
[beam] branch master updated: [#22319] Regenerate proto2_coder_test_messages_pb2.py manually (#22320)
This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new f2be8066e14 [#22319] Regenerate proto2_coder_test_messages_pb2.py manually (#22320)
f2be8066e14 is described below
commit f2be8066e1454e1dbfee1623c77805d9aff19288
Author: Luke Cwik <lc...@google.com>
AuthorDate: Mon Jul 18 19:26:11 2022 -0700
[#22319] Regenerate proto2_coder_test_messages_pb2.py manually (#22320)
* [#22319] Regenerate proto2_coder_test_messages_pb2.py manually
* Update instructions to regenerate proto file
* Fix pylint issue
---
sdks/python/apache_beam/coders/coders_test.py | 10 +-
.../coders/proto2_coder_test_messages_pb2.py | 110 +++++++++++----------
2 files changed, 62 insertions(+), 58 deletions(-)
diff --git a/sdks/python/apache_beam/coders/coders_test.py b/sdks/python/apache_beam/coders/coders_test.py
index 0a30a320e90..1d73c5977ea 100644
--- a/sdks/python/apache_beam/coders/coders_test.py
+++ b/sdks/python/apache_beam/coders/coders_test.py
@@ -59,18 +59,18 @@ class CodersTest(unittest.TestCase):
# The test proto message file was generated by running the following:
#
# `cd <beam repo>`
-# `cp sdks/java/core/src/proto/proto2_coder_test_message.proto
-# sdks/python/apache_beam/coders`
+# `cp sdks/java/extensions/protobuf/src/test/proto/\
+# proto2_coder_test_messages.proto sdks/python/apache_beam/coders/`
# `cd sdks/python`
# `protoc apache_beam/coders/proto2_coder_test_messages.proto
-# --python_out=apache_beam/coders
+# --python_out=.
# `rm apache_beam/coders/proto2_coder_test_message.proto`
#
# Note: The protoc version should match the protobuf library version specified
# in setup.py.
#
-# TODO(vikasrk): The proto file should be placed in a common directory
-# that can be shared between java and python.
+# TODO(https://github.com/apache/beam/issues/22319): The proto file should be
+# placed in a common directory that can be shared between java and python.
class ProtoCoderTest(unittest.TestCase):
def test_proto_coder(self):
ma = test_message.MessageA()
diff --git a/sdks/python/apache_beam/coders/proto2_coder_test_messages_pb2.py b/sdks/python/apache_beam/coders/proto2_coder_test_messages_pb2.py
index 433d33f9884..97ae8be9bfb 100644
--- a/sdks/python/apache_beam/coders/proto2_coder_test_messages_pb2.py
+++ b/sdks/python/apache_beam/coders/proto2_coder_test_messages_pb2.py
@@ -15,30 +15,29 @@
# limitations under the License.
#
+# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
-# source: sdks/java/core/src/main/proto/proto2_coder_test_messages.proto
-
-import sys
+# source: apache_beam/coders/proto2_coder_test_messages.proto
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
+
+
DESCRIPTOR = _descriptor.FileDescriptor(
name='apache_beam/coders/proto2_coder_test_messages.proto',
package='proto2_coder_test_messages',
syntax='proto2',
- serialized_pb=_b('\n3apache_beam/coders/proto2_coder_test_messages.proto\x12\x1aproto2_coder_test_messages\"P\n\x08MessageA\x12\x0e\n\x06\x66ield1\x18\x01 \x01(\t\x12\x34\n\x06\x66ield2\x18\x02 \x03(\x0b\x32$.proto2_coder_test_messages.MessageB\"\x1a\n\x08MessageB\x12\x0e\n\x06\x66ield1\x18\x01 \x01(\x08\"\x10\n\x08MessageC*\x04\x08\x64\x10j\"\xad\x01\n\x0eMessageWithMap\x12\x46\n\x06\x66ield1\x18\x01 \x03(\x0b\x32\x36.proto2_coder_test_messages.MessageWithMap.Field1Entry\x1aS\n\x0b\x4 [...]
+ serialized_options=b'\n\'org.apache.beam.sdk.extensions.protobuf',
+ create_key=_descriptor._internal_create_key,
+ serialized_pb=b'\n3apache_beam/coders/proto2_coder_test_messages.proto\x12\x1aproto2_coder_test_messages\"P\n\x08MessageA\x12\x0e\n\x06\x66ield1\x18\x01 \x01(\t\x12\x34\n\x06\x66ield2\x18\x02 \x03(\x0b\x32$.proto2_coder_test_messages.MessageB\"\x1a\n\x08MessageB\x12\x0e\n\x06\x66ield1\x18\x01 \x01(\x08\"\x10\n\x08MessageC*\x04\x08\x64\x10j\"\xad\x01\n\x0eMessageWithMap\x12\x46\n\x06\x66ield1\x18\x01 \x03(\x0b\x32\x36.proto2_coder_test_messages.MessageWithMap.Field1Entry\x1aS\n\x0b\x46i [...]
)
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
FIELD1_FIELD_NUMBER = 101
@@ -48,7 +47,7 @@ field1 = _descriptor.FieldDescriptor(
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=True, extension_scope=None,
- options=None)
+ serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)
FIELD2_FIELD_NUMBER = 102
field2 = _descriptor.FieldDescriptor(
name='field2', full_name='proto2_coder_test_messages.field2', index=1,
@@ -56,7 +55,7 @@ field2 = _descriptor.FieldDescriptor(
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=True, extension_scope=None,
- options=None)
+ serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)
_MESSAGEA = _descriptor.Descriptor(
@@ -65,28 +64,29 @@ _MESSAGEA = _descriptor.Descriptor(
filename=None,
file=DESCRIPTOR,
containing_type=None,
+ create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='field1', full_name='proto2_coder_test_messages.MessageA.field1', index=0,
number=1, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=_b("").decode('utf-8'),
+ has_default_value=False, default_value=b"".decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- options=None),
+ serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
_descriptor.FieldDescriptor(
name='field2', full_name='proto2_coder_test_messages.MessageA.field2', index=1,
number=2, type=11, cpp_type=10, label=3,
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- options=None),
+ serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- options=None,
+ serialized_options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -103,6 +103,7 @@ _MESSAGEB = _descriptor.Descriptor(
filename=None,
file=DESCRIPTOR,
containing_type=None,
+ create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='field1', full_name='proto2_coder_test_messages.MessageB.field1', index=0,
@@ -110,14 +111,14 @@ _MESSAGEB = _descriptor.Descriptor(
has_default_value=False, default_value=False,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- options=None),
+ serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- options=None,
+ serialized_options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -134,6 +135,7 @@ _MESSAGEC = _descriptor.Descriptor(
filename=None,
file=DESCRIPTOR,
containing_type=None,
+ create_key=_descriptor._internal_create_key,
fields=[
],
extensions=[
@@ -141,7 +143,7 @@ _MESSAGEC = _descriptor.Descriptor(
nested_types=[],
enum_types=[
],
- options=None,
+ serialized_options=None,
is_extendable=True,
syntax='proto2',
extension_ranges=[(100, 106), ],
@@ -158,28 +160,29 @@ _MESSAGEWITHMAP_FIELD1ENTRY = _descriptor.Descriptor(
filename=None,
file=DESCRIPTOR,
containing_type=None,
+ create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='key', full_name='proto2_coder_test_messages.MessageWithMap.Field1Entry.key', index=0,
number=1, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=_b("").decode('utf-8'),
+ has_default_value=False, default_value=b"".decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- options=None),
+ serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
_descriptor.FieldDescriptor(
name='value', full_name='proto2_coder_test_messages.MessageWithMap.Field1Entry.value', index=1,
number=2, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- options=None),
+ serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
+ serialized_options=b'8\001',
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -195,6 +198,7 @@ _MESSAGEWITHMAP = _descriptor.Descriptor(
filename=None,
file=DESCRIPTOR,
containing_type=None,
+ create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='field1', full_name='proto2_coder_test_messages.MessageWithMap.field1', index=0,
@@ -202,14 +206,14 @@ _MESSAGEWITHMAP = _descriptor.Descriptor(
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- options=None),
+ serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
],
extensions=[
],
nested_types=[_MESSAGEWITHMAP_FIELD1ENTRY, ],
enum_types=[
],
- options=None,
+ serialized_options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -226,6 +230,7 @@ _REFERENCESMESSAGEWITHMAP = _descriptor.Descriptor(
filename=None,
file=DESCRIPTOR,
containing_type=None,
+ create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='field1', full_name='proto2_coder_test_messages.ReferencesMessageWithMap.field1', index=0,
@@ -233,14 +238,14 @@ _REFERENCESMESSAGEWITHMAP = _descriptor.Descriptor(
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- options=None),
+ serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- options=None,
+ serialized_options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -262,48 +267,49 @@ DESCRIPTOR.message_types_by_name['MessageWithMap'] = _MESSAGEWITHMAP
DESCRIPTOR.message_types_by_name['ReferencesMessageWithMap'] = _REFERENCESMESSAGEWITHMAP
DESCRIPTOR.extensions_by_name['field1'] = field1
DESCRIPTOR.extensions_by_name['field2'] = field2
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-MessageA = _reflection.GeneratedProtocolMessageType('MessageA', (_message.Message,), dict(
- DESCRIPTOR = _MESSAGEA,
- __module__ = 'apache_beam.coders.proto2_coder_test_messages_pb2'
+MessageA = _reflection.GeneratedProtocolMessageType('MessageA', (_message.Message,), {
+ 'DESCRIPTOR' : _MESSAGEA,
+ '__module__' : 'apache_beam.coders.proto2_coder_test_messages_pb2'
# @@protoc_insertion_point(class_scope:proto2_coder_test_messages.MessageA)
- ))
+ })
_sym_db.RegisterMessage(MessageA)
-MessageB = _reflection.GeneratedProtocolMessageType('MessageB', (_message.Message,), dict(
- DESCRIPTOR = _MESSAGEB,
- __module__ = 'apache_beam.coders.proto2_coder_test_messages_pb2'
+MessageB = _reflection.GeneratedProtocolMessageType('MessageB', (_message.Message,), {
+ 'DESCRIPTOR' : _MESSAGEB,
+ '__module__' : 'apache_beam.coders.proto2_coder_test_messages_pb2'
# @@protoc_insertion_point(class_scope:proto2_coder_test_messages.MessageB)
- ))
+ })
_sym_db.RegisterMessage(MessageB)
-MessageC = _reflection.GeneratedProtocolMessageType('MessageC', (_message.Message,), dict(
- DESCRIPTOR = _MESSAGEC,
- __module__ = 'apache_beam.coders.proto2_coder_test_messages_pb2'
+MessageC = _reflection.GeneratedProtocolMessageType('MessageC', (_message.Message,), {
+ 'DESCRIPTOR' : _MESSAGEC,
+ '__module__' : 'apache_beam.coders.proto2_coder_test_messages_pb2'
# @@protoc_insertion_point(class_scope:proto2_coder_test_messages.MessageC)
- ))
+ })
_sym_db.RegisterMessage(MessageC)
-MessageWithMap = _reflection.GeneratedProtocolMessageType('MessageWithMap', (_message.Message,), dict(
+MessageWithMap = _reflection.GeneratedProtocolMessageType('MessageWithMap', (_message.Message,), {
- Field1Entry = _reflection.GeneratedProtocolMessageType('Field1Entry', (_message.Message,), dict(
- DESCRIPTOR = _MESSAGEWITHMAP_FIELD1ENTRY,
- __module__ = 'apache_beam.coders.proto2_coder_test_messages_pb2'
+ 'Field1Entry' : _reflection.GeneratedProtocolMessageType('Field1Entry', (_message.Message,), {
+ 'DESCRIPTOR' : _MESSAGEWITHMAP_FIELD1ENTRY,
+ '__module__' : 'apache_beam.coders.proto2_coder_test_messages_pb2'
# @@protoc_insertion_point(class_scope:proto2_coder_test_messages.MessageWithMap.Field1Entry)
- ))
+ })
,
- DESCRIPTOR = _MESSAGEWITHMAP,
- __module__ = 'apache_beam.coders.proto2_coder_test_messages_pb2'
+ 'DESCRIPTOR' : _MESSAGEWITHMAP,
+ '__module__' : 'apache_beam.coders.proto2_coder_test_messages_pb2'
# @@protoc_insertion_point(class_scope:proto2_coder_test_messages.MessageWithMap)
- ))
+ })
_sym_db.RegisterMessage(MessageWithMap)
_sym_db.RegisterMessage(MessageWithMap.Field1Entry)
-ReferencesMessageWithMap = _reflection.GeneratedProtocolMessageType('ReferencesMessageWithMap', (_message.Message,), dict(
- DESCRIPTOR = _REFERENCESMESSAGEWITHMAP,
- __module__ = 'apache_beam.coders.proto2_coder_test_messages_pb2'
+ReferencesMessageWithMap = _reflection.GeneratedProtocolMessageType('ReferencesMessageWithMap', (_message.Message,), {
+ 'DESCRIPTOR' : _REFERENCESMESSAGEWITHMAP,
+ '__module__' : 'apache_beam.coders.proto2_coder_test_messages_pb2'
# @@protoc_insertion_point(class_scope:proto2_coder_test_messages.ReferencesMessageWithMap)
- ))
+ })
_sym_db.RegisterMessage(ReferencesMessageWithMap)
field1.message_type = _MESSAGEA
@@ -311,8 +317,6 @@ MessageC.RegisterExtension(field1)
field2.message_type = _MESSAGEB
MessageC.RegisterExtension(field2)
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032org.apache.beam.sdk.coders'))
-_MESSAGEWITHMAP_FIELD1ENTRY.has_options = True
-_MESSAGEWITHMAP_FIELD1ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
+DESCRIPTOR._options = None
+_MESSAGEWITHMAP_FIELD1ENTRY._options = None
# @@protoc_insertion_point(module_scope)