BUG33093116: Cache the default connection attributes

This patch enables the caching of the platform arch and OS version,
which is used in the default connection attributes.

Author: nmariz

lib/mysql/connector/connection.py

@@ -34,7 +34,6 @@
 import datetime
 import logging
 import os
-import platform
 import socket
 import struct
 import time
@@ -55,7 +54,7 @@
     MySQLCursorBufferedNamedTuple)
 from .network import MySQLUnixSocket, MySQLTCPSocket
 from .protocol import MySQLProtocol
-from .utils import int1store, int4store, lc_int, linux_distribution
+from .utils import int1store, int4store, lc_int, get_platform
 from .abstracts import MySQLConnectionAbstract
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
@@ -120,34 +119,23 @@ def __init__(self, *args, **kwargs):
 
     def _add_default_conn_attrs(self):
         """Add the default connection attributes."""
-        if os.name == "nt":
-            if "64" in platform.architecture()[0]:
-                platform_arch = "x86_64"
-            elif "32" in platform.architecture()[0]:
-                platform_arch = "i386"
-            else:
-                platform_arch = platform.architecture()
-            os_ver = "Windows-{}".format(platform.win32_ver()[1])
-        else:
-            platform_arch = platform.machine()
-            if platform.system() == "Darwin":
-                os_ver = "{}-{}".format("macOS", platform.mac_ver()[0])
-            else:
-                os_ver = "-".join(linux_distribution()[0:2])
-
+        platform = get_platform()
         license_chunks = version.LICENSE.split(" ")
         if license_chunks[0] == "GPLv2":
             client_license = "GPL-2.0"
         else:
             client_license = "Commercial"
         default_conn_attrs = {
             "_pid": str(os.getpid()),
-            "_platform": platform_arch,
+            "_platform": platform["arch"],
             "_source_host": socket.gethostname(),
             "_client_name": "mysql-connector-python",
             "_client_license": client_license,
-            "_client_version": ".".join([str(x) for x in version.VERSION[0:3]]),
-            "_os": os_ver}
+            "_client_version": ".".join(
+                [str(x) for x in version.VERSION[0:3]]
+            ),
+            "_os": platform["version"],
+        }
 
         self._conn_attrs.update((default_conn_attrs))
 

lib/mysql/connector/utils.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2020, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2021, 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
@@ -35,11 +35,13 @@
                         in_table_c21_c22, in_table_c3, in_table_c4, in_table_c5,
                         in_table_c6, in_table_c7, in_table_c8, in_table_c9,
                         in_table_c12, in_table_d1, in_table_d2)
+import platform
 import struct
 import sys
 import unicodedata
 
 from decimal import Decimal
+from functools import lru_cache
 
 from .custom_types import HexLiteral
 
@@ -609,3 +611,24 @@ def init_bytearray(payload=b'', encoding='utf-8'):
 
     return bytearray(payload)
 
+
+@lru_cache()
+def get_platform():
+    """Return a dict with the platform arch and OS version."""
+    plat = {"arch": None, "version": None}
+    if os.name == "nt":
+        if "64" in platform.architecture()[0]:
+            plat["arch"] = "x86_64"
+        elif "32" in platform.architecture()[0]:
+            plat["arch"] = "i386"
+        else:
+            plat["arch"] = platform.architecture()
+        plat["version"] = "Windows-{}".format(platform.win32_ver()[1])
+    else:
+        plat["arch"] = platform.machine()
+        if platform.system() == "Darwin":
+            plat["version"] = "{}-{}".format("macOS", platform.mac_ver()[0])
+        else:
+            plat["version"] = "-".join(linux_distribution()[0:2])
+
+    return plat