Fix for Bug#35929119, Issue with mysql-connector-j 8.0.33 connector (…

…XDEVAPI) - getsession is slow. Change-Id: Ifbd542594c7aeb8cf59bb4f08dc07ff4cbe890b6
yaooqinn · Nov 23, 2023 · 6086199 · 6086199
1 parent abb3c53
commit 6086199
Show file tree

Hide file tree

Showing 6 changed files with 282 additions and 206 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,8 @@
 
 Version 8.3.0
 
+  - Fix for Bug#35929119, Issue with mysql-connector-j 8.0.33 connector (XDEVAPI) - getsession is slow.
+
   - Fix for Bug#111107 (Bug#36023972), CallableStatement::getParameterMetaData reports incorrect parameterCount.
 
   - Fix for Bug#109546 (Bug#34958912), executeUpdate throws SQLException on queries that are only comments.

diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/x/XProtocol.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/x/XProtocol.java
@@ -148,6 +148,10 @@ public class XProtocol extends AbstractProtocol<XMessage> implements Protocol<XM
     private Map<Class<? extends GeneratedMessageV3>, ProtocolEntityFactory<? extends ProtocolEntity, XMessage>> messageToProtocolEntityFactory = new HashMap<>();
 
     public XProtocol(HostInfo hostInfo, PropertySet propertySet) {
+        if (hostInfo == null && propertySet == null) {
+            return; // Special instance of Protocol that can be used as poison object.
+        }
+
         String host = hostInfo.getHost();
         if (host == null || StringUtils.isEmptyOrWhitespaceOnly(host)) {
             host = "localhost";

diff --git a/src/main/user-api/java/com/mysql/cj/xdevapi/ClientFactory.java b/src/main/user-api/java/com/mysql/cj/xdevapi/ClientFactory.java
@@ -58,9 +58,9 @@ public class ClientFactory {
      *            <pre>
      * pooling : {
      *     enabled: true|false,
-     *     maxSize: integer &gt; 0
+     *     maxSize: integer &gt; 0,
      *     maxIdleTime: integer &ge; 0,
-     *     queueTimeOut: integer &ge; 0
+     *     queueTimeout: integer &ge; 0
      * }
      *            </pre>
      *