WL#15672: Upgrade Python Protobuf version to 4.21.12

Change-Id: Ida256ebbdea682dd15fb276326aa8876e9824547

Author: nmariz

CHANGES.txt

@@ -11,6 +11,7 @@ Full release notes:
 v8.1.0
 ======
 
+- WL#15672: Upgrade Python Protobuf version to 4.21.12
 - WL#15630: Remove Python 3.7 support
 - WL#15591: Improve the network module
 - BUG#35349093: Compression doesn't work with C extension API

cpydist/data/deb/rules

@@ -131,10 +131,5 @@ override_dh_installdocs:
 # anyway.
 SUBSTVARS = -Vpython3-distutils:Depends="python3-distutils"
 
-# Python PROTOBUF is required to communicate with the server using a pure
-# Note that at this time, using PROTOBUF 4 is not supported
-SUBSTVARS += -Vpython3-protobuf:Depends='python3-protobuf (>= 3.11.0)'
-SUBSTVARS += -Vpython3-protobuf:Depends='python3-protobuf (<< 4)'
-
 override_dh_gencontrol:
 	dh_gencontrol -- $(SUBSTVARS)

cpydist/data/rpm/mysql-connector-python.spec

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -26,7 +26,6 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-%global requires_py_protobuf_version 3.11.0
 %global wants_py_dnspython_version 1.16.0
 
 %undefine _package_note_file
@@ -179,11 +178,6 @@ Requires:      python38
 Requires:      python3-dns >= %{wants_py_dnspython_version}
 %endif
 
-# We have no python3-protobuf on EL7, too old versions on EL8 and openSUSE 15
-%if 0%{?fedora} || 0%{?rhel} >= 9
-Requires:      python3-protobuf >= %{requires_py_protobuf_version}, python3-protobuf < 4
-%endif
-
 
 %description -n mysql-connector-python3%{?product_suffix}
 MySQL Connector/Python enables Python programs to access MySQL

docs/mysqlx/installation.rst

@@ -68,7 +68,7 @@ As of Connector/Python 2.2.3, source distributions include a C++ Extension, that
 To build Connector/Python C++ Extension for Protobuf, you must satisfy the following prerequisites:
 
 * A C/C++ compiler, such as ``gcc``
-* Protobuf C++ (version >= 3.6.1)
+* Protobuf C++ (version >= 4.21.1, <= 4.21.12)
 * Python development files
 * MySQL Connector/C or MySQL Server installed, including development files to compile the optional C Extension that interfaces with the MySQL C client library
 

docs/mysqlx/requirements.rst

@@ -3,8 +3,8 @@ Requirements
 
 * MySQL 8.0.0 or higher, with the X Plugin enabled
 * Python >= 3.8
-* Protobuf C++ (version >= 3.11.0, <= 3.19.6)
-* Python Protobuf (version >= 3.11.0, <= 3.20.3)
+* Protobuf C++ (version >= 4.21.1, <= 4.21.12)
+* Python Protobuf (version >= 4.21.1, <= 4.21.12)
 * dnspython (version >= 1.16.0, <= 2.3.0) for DNS SRV support
 * lz4 (version >= 2.1.6, <= 4.3.2) for connection compression support
 * zstandard (version >= 0.12.0, <= 0.19.0) for connection compression support

lib/mysqlx/protobuf/mysqlx_connection_pb2.py

@@ -1,4 +1,5 @@
-# Copyright (c) 2017, 2020, Oracle and/or its affiliates.
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -31,13 +32,11 @@
 
 # type: ignore
 
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+"""Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 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 descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -47,272 +46,24 @@
 from mysqlx.protobuf import mysqlx_pb2 as mysqlx__pb2
 
 
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='mysqlx_connection.proto',
-  package='Mysqlx.Connection',
-  syntax='proto2',
-  serialized_pb=_b('\n\x17mysqlx_connection.proto\x12\x11Mysqlx.Connection\x1a\x16mysqlx_datatypes.proto\x1a\x0cmysqlx.proto\"@\n\nCapability\x12\x0c\n\x04name\x18\x01 \x02(\t\x12$\n\x05value\x18\x02 \x02(\x0b\x32\x15.Mysqlx.Datatypes.Any\"C\n\x0c\x43\x61pabilities\x12\x33\n\x0c\x63\x61pabilities\x18\x01 \x03(\x0b\x32\x1d.Mysqlx.Connection.Capability\"\x11\n\x0f\x43\x61pabilitiesGet\"H\n\x0f\x43\x61pabilitiesSet\x12\x35\n\x0c\x63\x61pabilities\x18\x01 \x02(\x0b\x32\x1f.Mysqlx.Connection.Capabilities\"\x07\n\x05\x43lose\"\xa5\x01\n\x0b\x43ompression\x12\x19\n\x11uncompressed_size\x18\x01 \x01(\x04\x12\x34\n\x0fserver_messages\x18\x02 \x01(\x0e\x32\x1b.Mysqlx.ServerMessages.Type\x12\x34\n\x0f\x63lient_messages\x18\x03 \x01(\x0e\x32\x1b.Mysqlx.ClientMessages.Type\x12\x0f\n\x07payload\x18\x04 \x02(\x0c\x42\x1b\n\x17\x63om.mysql.cj.x.protobufH\x03')
-  ,
-  dependencies=[mysqlx__datatypes__pb2.DESCRIPTOR,mysqlx__pb2.DESCRIPTOR,])
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-
-
-
-_CAPABILITY = _descriptor.Descriptor(
-  name='Capability',
-  full_name='Mysqlx.Connection.Capability',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='name', full_name='Mysqlx.Connection.Capability.name', index=0,
-      number=1, type=9, cpp_type=9, label=2,
-      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),
-    _descriptor.FieldDescriptor(
-      name='value', full_name='Mysqlx.Connection.Capability.value', index=1,
-      number=2, type=11, cpp_type=10, label=2,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=84,
-  serialized_end=148,
-)
-
-
-_CAPABILITIES = _descriptor.Descriptor(
-  name='Capabilities',
-  full_name='Mysqlx.Connection.Capabilities',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='capabilities', full_name='Mysqlx.Connection.Capabilities.capabilities', index=0,
-      number=1, 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),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=150,
-  serialized_end=217,
-)
-
-
-_CAPABILITIESGET = _descriptor.Descriptor(
-  name='CapabilitiesGet',
-  full_name='Mysqlx.Connection.CapabilitiesGet',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=219,
-  serialized_end=236,
-)
-
-
-_CAPABILITIESSET = _descriptor.Descriptor(
-  name='CapabilitiesSet',
-  full_name='Mysqlx.Connection.CapabilitiesSet',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='capabilities', full_name='Mysqlx.Connection.CapabilitiesSet.capabilities', index=0,
-      number=1, type=11, cpp_type=10, label=2,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=238,
-  serialized_end=310,
-)
-
-
-_CLOSE = _descriptor.Descriptor(
-  name='Close',
-  full_name='Mysqlx.Connection.Close',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=312,
-  serialized_end=319,
-)
-
-
-_COMPRESSION = _descriptor.Descriptor(
-  name='Compression',
-  full_name='Mysqlx.Connection.Compression',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='uncompressed_size', full_name='Mysqlx.Connection.Compression.uncompressed_size', index=0,
-      number=1, type=4, cpp_type=4, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='server_messages', full_name='Mysqlx.Connection.Compression.server_messages', index=1,
-      number=2, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='client_messages', full_name='Mysqlx.Connection.Compression.client_messages', index=2,
-      number=3, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=1,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='payload', full_name='Mysqlx.Connection.Compression.payload', index=3,
-      number=4, type=12, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b(""),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=322,
-  serialized_end=487,
-)
-
-_CAPABILITY.fields_by_name['value'].message_type = mysqlx__datatypes__pb2._ANY
-_CAPABILITIES.fields_by_name['capabilities'].message_type = _CAPABILITY
-_CAPABILITIESSET.fields_by_name['capabilities'].message_type = _CAPABILITIES
-_COMPRESSION.fields_by_name['server_messages'].enum_type = mysqlx__pb2._SERVERMESSAGES_TYPE
-_COMPRESSION.fields_by_name['client_messages'].enum_type = mysqlx__pb2._CLIENTMESSAGES_TYPE
-DESCRIPTOR.message_types_by_name['Capability'] = _CAPABILITY
-DESCRIPTOR.message_types_by_name['Capabilities'] = _CAPABILITIES
-DESCRIPTOR.message_types_by_name['CapabilitiesGet'] = _CAPABILITIESGET
-DESCRIPTOR.message_types_by_name['CapabilitiesSet'] = _CAPABILITIESSET
-DESCRIPTOR.message_types_by_name['Close'] = _CLOSE
-DESCRIPTOR.message_types_by_name['Compression'] = _COMPRESSION
-
-Capability = _reflection.GeneratedProtocolMessageType('Capability', (_message.Message,), dict(
-  DESCRIPTOR = _CAPABILITY,
-  __module__ = 'mysqlx_connection_pb2'
-  # @@protoc_insertion_point(class_scope:Mysqlx.Connection.Capability)
-  ))
-_sym_db.RegisterMessage(Capability)
-
-Capabilities = _reflection.GeneratedProtocolMessageType('Capabilities', (_message.Message,), dict(
-  DESCRIPTOR = _CAPABILITIES,
-  __module__ = 'mysqlx_connection_pb2'
-  # @@protoc_insertion_point(class_scope:Mysqlx.Connection.Capabilities)
-  ))
-_sym_db.RegisterMessage(Capabilities)
-
-CapabilitiesGet = _reflection.GeneratedProtocolMessageType('CapabilitiesGet', (_message.Message,), dict(
-  DESCRIPTOR = _CAPABILITIESGET,
-  __module__ = 'mysqlx_connection_pb2'
-  # @@protoc_insertion_point(class_scope:Mysqlx.Connection.CapabilitiesGet)
-  ))
-_sym_db.RegisterMessage(CapabilitiesGet)
-
-CapabilitiesSet = _reflection.GeneratedProtocolMessageType('CapabilitiesSet', (_message.Message,), dict(
-  DESCRIPTOR = _CAPABILITIESSET,
-  __module__ = 'mysqlx_connection_pb2'
-  # @@protoc_insertion_point(class_scope:Mysqlx.Connection.CapabilitiesSet)
-  ))
-_sym_db.RegisterMessage(CapabilitiesSet)
-
-Close = _reflection.GeneratedProtocolMessageType('Close', (_message.Message,), dict(
-  DESCRIPTOR = _CLOSE,
-  __module__ = 'mysqlx_connection_pb2'
-  # @@protoc_insertion_point(class_scope:Mysqlx.Connection.Close)
-  ))
-_sym_db.RegisterMessage(Close)
-
-Compression = _reflection.GeneratedProtocolMessageType('Compression', (_message.Message,), dict(
-  DESCRIPTOR = _COMPRESSION,
-  __module__ = 'mysqlx_connection_pb2'
-  # @@protoc_insertion_point(class_scope:Mysqlx.Connection.Compression)
-  ))
-_sym_db.RegisterMessage(Compression)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027com.mysql.cj.x.protobufH\003'))
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17mysqlx_connection.proto\x12\x11Mysqlx.Connection\x1a\x16mysqlx_datatypes.proto\x1a\x0cmysqlx.proto\"@\n\nCapability\x12\x0c\n\x04name\x18\x01 \x02(\t\x12$\n\x05value\x18\x02 \x02(\x0b\x32\x15.Mysqlx.Datatypes.Any\"C\n\x0c\x43\x61pabilities\x12\x33\n\x0c\x63\x61pabilities\x18\x01 \x03(\x0b\x32\x1d.Mysqlx.Connection.Capability\"\x11\n\x0f\x43\x61pabilitiesGet\"H\n\x0f\x43\x61pabilitiesSet\x12\x35\n\x0c\x63\x61pabilities\x18\x01 \x02(\x0b\x32\x1f.Mysqlx.Connection.Capabilities\"\x07\n\x05\x43lose\"\xa5\x01\n\x0b\x43ompression\x12\x19\n\x11uncompressed_size\x18\x01 \x01(\x04\x12\x34\n\x0fserver_messages\x18\x02 \x01(\x0e\x32\x1b.Mysqlx.ServerMessages.Type\x12\x34\n\x0f\x63lient_messages\x18\x03 \x01(\x0e\x32\x1b.Mysqlx.ClientMessages.Type\x12\x0f\n\x07payload\x18\x04 \x02(\x0c\x42\x1b\n\x17\x63om.mysql.cj.x.protobufH\x03')
+
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'mysqlx_connection_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  DESCRIPTOR._serialized_options = b'\n\027com.mysql.cj.x.protobufH\003'
+  _CAPABILITY._serialized_start=84
+  _CAPABILITY._serialized_end=148
+  _CAPABILITIES._serialized_start=150
+  _CAPABILITIES._serialized_end=217
+  _CAPABILITIESGET._serialized_start=219
+  _CAPABILITIESGET._serialized_end=236
+  _CAPABILITIESSET._serialized_start=238
+  _CAPABILITIESSET._serialized_end=310
+  _CLOSE._serialized_start=312
+  _CLOSE._serialized_end=319
+  _COMPRESSION._serialized_start=322
+  _COMPRESSION._serialized_end=487
 # @@protoc_insertion_point(module_scope)