[misc] set default client character set to utf8mb4 client only when s…

…erver version > 5.5
mariadb-corporation · Feb 21, 2016 · 34a91cb · 34a91cb
1 parent 161f581
commit 34a91cb
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 47 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbClientPreparedStatement.java b/src/main/java/org/mariadb/jdbc/MariaDbClientPreparedStatement.java
@@ -231,10 +231,7 @@ public ResultSetMetaData getMetaData() throws SQLException {
             return rs.getMetaData();
         }
         if (resultSetMetaData == null) {
-            MariaDbServerPreparedStatement ssps = new MariaDbServerPreparedStatement(connection, this.sqlQuery, Statement.NO_GENERATED_KEYS);
-            ssps.close();
-            resultSetMetaData = ssps.getMetaData();
-            parameterMetaData = ssps.getParameterMetaData();
+            loadMetadata();
         }
         return resultSetMetaData;
     }
@@ -259,14 +256,17 @@ protected void setParameter(final int parameterIndex, final ParameterHolder hold
     public ParameterMetaData getParameterMetaData() throws SQLException {
         checkClose();
         if (parameterMetaData == null) {
-            MariaDbServerPreparedStatement ssps = new MariaDbServerPreparedStatement(connection, this.sqlQuery, Statement.NO_GENERATED_KEYS);
-            ssps.close();
-            resultSetMetaData = ssps.getMetaData();
-            parameterMetaData = ssps.getParameterMetaData();
+            loadMetadata();
         }
         return parameterMetaData;
     }
 
+    private void loadMetadata() throws SQLException {
+        MariaDbServerPreparedStatement serverPreparedStatement = new MariaDbServerPreparedStatement(connection, this.sqlQuery, Statement.NO_GENERATED_KEYS);
+        serverPreparedStatement.close();
+        resultSetMetaData = serverPreparedStatement.getMetaData();
+        parameterMetaData = serverPreparedStatement.getParameterMetaData();
+    }
 
     /**
      * Clears the current parameter values immediately. <P>In general, parameter values remain in force for repeated use

diff --git a/src/main/java/org/mariadb/jdbc/MariaDbServerPreparedStatement.java b/src/main/java/org/mariadb/jdbc/MariaDbServerPreparedStatement.java
@@ -90,15 +90,15 @@ public MariaDbServerPreparedStatement(MariaDbConnection connection, String sql,
     private void prepare(String sql) throws SQLException {
         checkClose();
         try {
-            connection.lock.lock();
+            lock.lock();
             try {
                 if (protocol.hasUnreadData()) {
                     ExceptionMapper.throwException(new QueryException("There is an open result set on the current connection, which must be "
                             + "closed prior to executing a query"), connection, this);
                 }
                 prepareResult = protocol.prepare(sql);
             } finally {
-                connection.lock.unlock();
+                lock.unlock();
             }
             parameterCount = prepareResult.parameters.length;
             currentParameterHolder = new ParameterHolder[prepareResult.parameters.length];
@@ -217,7 +217,7 @@ public int[] executeBatch() throws SQLException {
 
         MariaDbResultSet rs = null;
         MariaDbType[] parameterTypeHeader = new MariaDbType[parameterCount];
-        connection.lock.lock();
+        lock.lock();
         executing = true;
         QueryException exception = null;
         try {
@@ -262,7 +262,7 @@ public int[] executeBatch() throws SQLException {
             clearBatch();
             throw new BatchUpdateException(sqle.getMessage(), sqle.getSQLState(), sqle.getErrorCode(), Arrays.copyOf(ret, counter), sqle);
         } finally {
-            connection.lock.unlock();
+            lock.unlock();
             clearBatch();
         }
         batchResultSet = rs;
@@ -364,7 +364,7 @@ public boolean execute() throws SQLException {
         }
         MariaDbResultSet rs = null;
         boolean result = false;
-        connection.lock.lock();
+        lock.lock();
         try {
             result = executeInternal(currentParameterHolder, new MariaDbType[parameterCount]);
             if (autoGeneratedKeys) {
@@ -373,7 +373,7 @@ public boolean execute() throws SQLException {
         } catch (SQLException sqle) {
             throw new BatchUpdateException(sqle.getMessage(), sqle.getSQLState(), sqle.getErrorCode(), new int[]{0}, sqle);
         } finally {
-            connection.lock.unlock();
+            lock.unlock();
             clearBatch();
         }
         batchResultSet = rs;
@@ -393,41 +393,43 @@ public boolean execute() throws SQLException {
      */
     @Override
     public void close() throws SQLException {
-        if (queryResult != null) {
-            queryResult.close();
-            queryResult = null;
-        }
-        // No possible future use for the cached results, so these can be cleared
-        // This makes the cache eligible for garbage collection earlier if the statement is not
-        // immediately garbage collected
-        cachedResultSets.clear();
-
-        if (protocol != null && protocol.isConnected()) {
-            try {
-                protocol.releasePrepareStatement(sql, prepareResult.statementId);
-            } catch (QueryException e) {
-                //if (log.isDebugEnabled()) log.debug("Error releasing preparedStatement", e);
+        closed.set(true);
+        lock.lock();
+        try {
+            if (queryResult != null) {
+                queryResult.close();
+                queryResult = null;
             }
-        }
-
-        if (isStreaming()) {
-            connection.lock.lock();
-            try {
-                while (getInternalMoreResults(true)) {
+            // No possible future use for the cached results, so these can be cleared
+            // This makes the cache eligible for garbage collection earlier if the statement is not
+            // immediately garbage collected
+            cachedResultSets.clear();
+            if (protocol != null && protocol.isConnected()) {
+                try {
+                    protocol.releasePrepareStatement(sql, prepareResult.statementId);
+                } catch (QueryException e) {
+                    //if (log.isDebugEnabled()) log.debug("Error releasing preparedStatement", e);
                 }
-            } finally {
-                connection.lock.unlock();
             }
-        }
-        super.close();
-        isClosed = true;
 
-        if (connection == null || connection.pooledConnection == null || connection.pooledConnection.statementEventListeners.isEmpty()) {
-            return;
+            if (isStreaming()) {
+                lock.lock();
+                try {
+                    while (getInternalMoreResults(true)) {
+                    }
+                } finally {
+                    lock.unlock();
+                }
+            }
+            protocol = null;
+            if (connection == null || connection.pooledConnection == null
+                    || connection.pooledConnection.statementEventListeners.isEmpty()) {
+                return;
+            }
+            connection.pooledConnection.fireStatementClosed(this);
+        } finally {
+            lock.unlock();
         }
-        connection.pooledConnection.fireStatementClosed(this);
-        connection = null;
-        protocol = null;
     }
 
     /**

diff --git a/src/main/java/org/mariadb/jdbc/MariaDbStatement.java b/src/main/java/org/mariadb/jdbc/MariaDbStatement.java
@@ -90,7 +90,7 @@ public class MariaDbStatement implements Statement {
     protected boolean isRewriteable = true;
     protected String firstRewrite = null;
     protected ResultSet batchResultSet = null;
-    private AtomicBoolean closed = new AtomicBoolean();
+    protected AtomicBoolean closed = new AtomicBoolean();
     boolean isTimedout;
     volatile boolean executing;
     List<Query> batchQueries;
@@ -102,7 +102,7 @@ public class MariaDbStatement implements Statement {
     private int fetchSize;
     private boolean isStreaming = false;
     private int maxRows;
-    private ReentrantLock lock;
+    protected ReentrantLock lock;
 
     public static final Pattern deleteEndSemicolonPattern = Pattern.compile("[;][ ]*$", Pattern.CASE_INSENSITIVE);
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java
@@ -590,7 +590,8 @@ private boolean isServerLanguageUtf8mb4(byte serverLanguage) {
     }
 
     private byte decideLanguage(byte serverLanguage) {
-        byte result = (isServerLanguageUtf8mb4(serverLanguage) ? serverLanguage : 45);
+        //force UTF8mb4 if possible, UTF8 if not.
+        byte result = (isServerLanguageUtf8mb4(serverLanguage) ? serverLanguage : (byte) (versionGreaterOrEqual(5, 5, 3) ? 45 : 33));
         return result;
     }