[misc] Various change

- Exception handling refactoring: * Sql is now only on first Exception of stracktrace * Always have thread id logged but for generic exception * ensure to log sql when on dumpQueriesOnException is enable - ColumnDefinition renaming to follow protocol description - Blob faster position() implementation - unnamed Savepoint now generate unique internal identifier
mariadb-corporation · Jan 31, 2020 · fcbcbc1 · fcbcbc1
1 parent 6a6e2c3
commit fcbcbc1
Show file tree

Hide file tree

Showing 65 changed files with 1,456 additions and 1,716 deletions.
diff --git a/.travis/build/Dockerfile b/.travis/build/Dockerfile
@@ -57,8 +57,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN { \
-		echo "mariadb-server-10.4" mysql-server/root_password password 'unused'; \
-		echo "mariadb-server-10.4" mysql-server/root_password_again password 'unused'; \
+		echo "mariadb-server-10.5" mysql-server/root_password password 'unused'; \
+		echo "mariadb-server-10.5" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections
 
 RUN apt-get update -y

diff --git a/.travis/build/build.sh b/.travis/build/build.sh
@@ -4,22 +4,22 @@ echo "**************************************************************************
 echo "* searching for last complete build"
 echo "**************************************************************************"
 
-wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.4/
+wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.5/
 grep -o ">build-[0-9]*" index.html | grep -o "[0-9]*" | tac | while read -r line ; do
 
-  curl -s --head http://hasky.askmonty.org/archive/10.4/build-$line/kvm-deb-bionic-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
+  curl -s --head http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
   if [ $? = "0" ]; then
     echo "**************************************************************************"
     echo "* Processing $line"
     echo "**************************************************************************"
-    wget -q -o /dev/null -O $line.html  http://hasky.askmonty.org/archive/10.4/build-$line/kvm-deb-bionic-amd64/debs/binary/
+    wget -q -o /dev/null -O $line.html  http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/debs/binary/
     grep -o ">[^\"]*\.deb" $line.html | grep -o "[^>]*\.deb" | while read -r file ; do
         if  [[ "$file" =~ ^mariadb-plugin.* ]] ;
         then
           echo "skipped file: $file"
         else
           echo "download file: $file"
-          wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.4/build-$line/kvm-deb-bionic-amd64/debs/binary/$file
+          wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/debs/binary/$file
         fi
     done
 

diff --git a/appveyor-download.bat b/appveyor-download.bat
@@ -0,0 +1,17 @@
+@echo off
+set archive=http://ftp.hosteurope.de/mirror/archive.mariadb.org//mariadb-%DB%/winx64-packages/mariadb-%DB%-winx64.msi
+set last=http://mirror.i3d.net/pub/mariadb//mariadb-%DB%/winx64-packages/mariadb-%DB%-winx64.msi
+
+curl -fsS -o server.msi %archive% 
+
+if %ERRORLEVEL% == 0 goto end
+
+
+curl -fsS -o server.msi %last%
+if %ERRORLEVEL% == 0  goto end
+
+echo Failure Reason Given is %errorlevel%
+exit /b %errorlevel%
+
+:end
+echo "File found".
diff --git a/appveyor.yml b/appveyor.yml
@@ -16,6 +16,11 @@ environment:
       CMAKE_PARAM: 'Visual Studio 15 2017 Win64'
       JAVA_HOME: C:\Program Files\Java\jdk1.8.0
 
+    - DB: '10.5.0'
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      CMAKE_PARAM: 'Visual Studio 15 2017 Win64'
+      JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+
     - DB: '10.1.41'
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       CMAKE_PARAM: 'Visual Studio 15 2017 Win64'
@@ -35,8 +40,7 @@ install:
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
       }
   # Prepend Java entry, remove Ruby entry (C:\Ruby193\bin;) from PATH
-  - cmd: set FILE=http://ftp.hosteurope.de/mirror/archive.mariadb.org//mariadb-%DB%/winx64-packages/mariadb-%DB%-winx64.msi
-  - ps: Start-FileDownload $Env:FILE -FileName server.msi -Timeout 900000
+  - cmd: appveyor-download.bat
   - cmd: msiexec /i server.msi INSTALLDIR=c:\projects\server SERVICENAME=mariadb ALLOWREMOTEROOTACCESS=true /qn
   - cmd: "\"c:\\projects\\server\\bin\\mysql.exe\" -e \"create database testj\" --user=root"
   - cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;%PATH:C:\Ruby193\bin;=%;

diff --git a/src/main/java/org/mariadb/jdbc/BasePrepareStatement.java b/src/main/java/org/mariadb/jdbc/BasePrepareStatement.java
@@ -54,7 +54,7 @@
 
 import org.mariadb.jdbc.internal.ColumnType;
 import org.mariadb.jdbc.internal.com.send.parameters.*;
-import org.mariadb.jdbc.internal.util.exceptions.ExceptionMapper;
+import org.mariadb.jdbc.internal.util.exceptions.ExceptionFactory;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -112,13 +112,15 @@ public abstract class BasePrepareStatement extends MariaDbStatement implements P
    *     ResultSet.CONCUR_READ_ONLY</code> or <code>ResultSet.CONCUR_UPDATABLE</code>
    * @param autoGeneratedKeys a flag indicating whether auto-generated keys should be returned; one
    *     of <code>Statement.RETURN_GENERATED_KEYS</code> or <code>Statement.NO_GENERATED_KEYS</code>
+   * @param exceptionFactory exception factory
    */
   public BasePrepareStatement(
       MariaDbConnection connection,
       int resultSetScrollType,
       int resultSetConcurrency,
-      int autoGeneratedKeys) {
-    super(connection, resultSetScrollType, resultSetConcurrency);
+      int autoGeneratedKeys,
+      ExceptionFactory exceptionFactory) {
+    super(connection, resultSetScrollType, resultSetConcurrency, exceptionFactory);
     this.noBackslashEscapes = protocol.noBackslashEscapes();
     this.useFractionalSeconds = options.useFractionalSeconds;
     this.autoGeneratedKeys = autoGeneratedKeys;
@@ -242,7 +244,7 @@ public void setCharacterStream(final int parameterIndex, final Reader reader)
    *     PreparedStatement</code>
    */
   public void setRef(final int parameterIndex, final Ref ref) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("REF not supported");
+    throw exceptionFactory.notSupported("REF parameter are not supported");
   }
 
   /**
@@ -399,7 +401,7 @@ public void setClob(final int parameterIndex, final Reader reader) throws SQLExc
    *     PreparedStatement</code>
    */
   public void setArray(final int parameterIndex, final Array array) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("Arrays not supported");
+    throw exceptionFactory.notSupported("Arrays not supported");
   }
 
   /**
@@ -645,7 +647,7 @@ public void setURL(final int parameterIndex, final URL url) throws SQLException
    *     PreparedStatement</code>
    */
   public void setRowId(final int parameterIndex, final RowId rowid) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("RowIDs not supported");
+    throw exceptionFactory.notSupported("RowIDs not supported");
   }
 
   /**
@@ -780,7 +782,7 @@ public void setNClob(final int parameterIndex, final Reader reader) throws SQLEx
    */
   @Override
   public void setSQLXML(final int parameterIndex, final SQLXML xmlObject) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("SQlXML not supported");
+    throw exceptionFactory.notSupported("SQlXML not supported");
   }
 
   /**
@@ -957,7 +959,7 @@ private void setInternalObject(
       case Types.ROWID:
       case Types.SQLXML:
       case Types.STRUCT:
-        throw ExceptionMapper.getFeatureNotSupportedException("Type not supported");
+        throw exceptionFactory.notSupported("Type not supported");
       default:
         break;
     }
@@ -966,7 +968,7 @@ private void setInternalObject(
       setNull(parameterIndex, Types.INTEGER);
     } else if (obj instanceof String) {
       if (targetSqlType == Types.BLOB) {
-        throw ExceptionMapper.getSqlException("Cannot convert a String to a Blob");
+        throw exceptionFactory.create("Cannot convert a String to a Blob");
       }
       String str = (String) obj;
       try {
@@ -1037,12 +1039,12 @@ private void setInternalObject(
                     options));
             break;
           default:
-            throw ExceptionMapper.getSqlException(
-                "Could not convert [" + str + "] to " + targetSqlType);
+            throw exceptionFactory.create(
+                String.format("Could not convert [%s] to %s", str, targetSqlType));
         }
       } catch (IllegalArgumentException e) {
-        throw ExceptionMapper.getSqlException(
-            "Could not convert [" + str + "] to " + targetSqlType, e);
+        throw exceptionFactory.create(
+            String.format("Could not convert [%s] to %s", str, targetSqlType), e);
       }
     } else if (obj instanceof Number) {
       Number bd = (Number) obj;
@@ -1084,16 +1086,16 @@ private void setInternalObject(
           setString(parameterIndex, bd.toString());
           break;
         default:
-          throw ExceptionMapper.getSqlException(
-              "Could not convert [" + bd + "] to " + targetSqlType);
+          throw exceptionFactory.create(
+              String.format("Could not convert [%s] to %s", bd, targetSqlType));
       }
     } else if (obj instanceof byte[]) {
       if (targetSqlType == Types.BINARY
           || targetSqlType == Types.VARBINARY
           || targetSqlType == Types.LONGVARBINARY) {
         setBytes(parameterIndex, (byte[]) obj);
       } else {
-        throw ExceptionMapper.getSqlException(
+        throw exceptionFactory.create(
             "Can only convert a byte[] to BINARY, VARBINARY or LONGVARBINARY");
       }
 
@@ -1152,11 +1154,10 @@ private void setInternalObject(
     } else if (obj instanceof LocalTime) {
       setParameter(parameterIndex, new LocalTimeParameter((LocalTime) obj, useFractionalSeconds));
     } else {
-      throw ExceptionMapper.getSqlException(
-          "Could not set parameter in setObject, could not convert: "
-              + obj.getClass()
-              + " to "
-              + targetSqlType);
+      throw exceptionFactory.create(
+          String.format(
+              "Could not set parameter in setObject, could not convert: %s to %s",
+              obj.getClass(), targetSqlType));
     }
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/CallableFunctionStatement.java b/src/main/java/org/mariadb/jdbc/CallableFunctionStatement.java
@@ -54,7 +54,7 @@
 
 import org.mariadb.jdbc.internal.ColumnType;
 import org.mariadb.jdbc.internal.com.read.resultset.SelectResultSet;
-import org.mariadb.jdbc.internal.util.exceptions.ExceptionMapper;
+import org.mariadb.jdbc.internal.util.exceptions.ExceptionFactory;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -80,12 +80,23 @@ public abstract class CallableFunctionStatement extends ClientSidePreparedStatem
    *     ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
    * @param resultSetConcurrency a concurrency type; one of <code>ResultSet.CONCUR_READ_ONLY</code>
    *     or <code>ResultSet.CONCUR_UPDATABLE</code>
+   * @param exceptionFactory Exception factory
    * @throws SQLException if clientPrepareStatement creation throw an exception
    */
   public CallableFunctionStatement(
-      MariaDbConnection connection, String sql, int resultSetType, final int resultSetConcurrency)
+      MariaDbConnection connection,
+      String sql,
+      int resultSetType,
+      final int resultSetConcurrency,
+      ExceptionFactory exceptionFactory)
       throws SQLException {
-    super(connection, sql, resultSetType, resultSetConcurrency, Statement.NO_GENERATED_KEYS);
+    super(
+        connection,
+        sql,
+        resultSetType,
+        resultSetConcurrency,
+        Statement.NO_GENERATED_KEYS,
+        exceptionFactory);
   }
 
   /**
@@ -144,7 +155,7 @@ private int nameToIndex(String parameterName) throws SQLException {
         return i;
       }
     }
-    throw new SQLException("there is no parameter with the name " + parameterName);
+    throw exceptionFactory.create("there is no parameter with the name " + parameterName);
   }
 
   /**
@@ -161,7 +172,7 @@ private int nameToOutputIndex(String parameterName) throws SQLException {
         return i;
       }
     }
-    throw new SQLException("there is no parameter with the name " + parameterName);
+    throw exceptionFactory.create("there is no parameter with the name " + parameterName);
   }
 
   /**
@@ -438,12 +449,12 @@ public URL getURL(String parameterName) throws SQLException {
 
   @Override
   public RowId getRowId(int parameterIndex) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("RowIDs not supported");
+    throw exceptionFactory.notSupported("RowIDs not supported");
   }
 
   @Override
   public RowId getRowId(String parameterName) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("RowIDs not supported");
+    throw exceptionFactory.notSupported("RowIDs not supported");
   }
 
   @Override
@@ -458,12 +469,12 @@ public NClob getNClob(String parameterName) throws SQLException {
 
   @Override
   public SQLXML getSQLXML(int parameterIndex) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("SQLXML not supported");
+    throw exceptionFactory.notSupported("SQLXML not supported");
   }
 
   @Override
   public SQLXML getSQLXML(String parameterName) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("SQLXML not supported");
+    throw exceptionFactory.notSupported("SQLXML not supported");
   }
 
   @Override
@@ -617,19 +628,19 @@ public void registerOutParameter(String parameterName, SQLType sqlType, String t
 
   private CallParameter getParameter(int index) throws SQLException {
     if (index > params.length || index <= 0) {
-      throw new SQLException("No parameter with index " + (index));
+      throw exceptionFactory.create("No parameter with index " + (index));
     }
     return params[index - 1];
   }
 
   @Override
   public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("SQLXML not supported");
+    throw exceptionFactory.notSupported("SQLXML not supported");
   }
 
   @Override
   public void setRowId(String parameterName, RowId rowid) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("RowIDs not supported");
+    throw exceptionFactory.notSupported("RowIDs not supported");
   }
 
   @Override

diff --git a/src/main/java/org/mariadb/jdbc/CallableProcedureStatement.java b/src/main/java/org/mariadb/jdbc/CallableProcedureStatement.java
@@ -54,7 +54,7 @@
 
 import org.mariadb.jdbc.internal.ColumnType;
 import org.mariadb.jdbc.internal.com.read.resultset.SelectResultSet;
-import org.mariadb.jdbc.internal.util.exceptions.ExceptionMapper;
+import org.mariadb.jdbc.internal.util.exceptions.ExceptionFactory;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -85,12 +85,23 @@ public abstract class CallableProcedureStatement extends ServerSidePreparedState
    *     <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
    * @param resultSetConcurrency a concurrency type; one of <code>ResultSet.CONCUR_READ_ONLY</code>
    *     or <code>ResultSet.CONCUR_UPDATABLE</code>
+   * @param exceptionFactory Exception factory
    * @throws SQLException is prepareStatement connection throw any error
    */
   public CallableProcedureStatement(
-      MariaDbConnection connection, String sql, int resultSetScrollType, int resultSetConcurrency)
+      MariaDbConnection connection,
+      String sql,
+      int resultSetScrollType,
+      int resultSetConcurrency,
+      ExceptionFactory exceptionFactory)
       throws SQLException {
-    super(connection, sql, resultSetScrollType, resultSetConcurrency, Statement.NO_GENERATED_KEYS);
+    super(
+        connection,
+        sql,
+        resultSetScrollType,
+        resultSetConcurrency,
+        Statement.NO_GENERATED_KEYS,
+        exceptionFactory);
   }
 
   /**
@@ -461,12 +472,12 @@ public URL getURL(String parameterName) throws SQLException {
 
   @Override
   public RowId getRowId(int parameterIndex) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("RowIDs not supported");
+    throw exceptionFactory.notSupported("RowIDs not supported");
   }
 
   @Override
   public RowId getRowId(String parameterName) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("RowIDs not supported");
+    throw exceptionFactory.notSupported("RowIDs not supported");
   }
 
   @Override
@@ -481,12 +492,12 @@ public NClob getNClob(String parameterName) throws SQLException {
 
   @Override
   public SQLXML getSQLXML(int parameterIndex) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("SQLXML not supported");
+    throw exceptionFactory.notSupported("SQLXML not supported");
   }
 
   @Override
   public SQLXML getSQLXML(String parameterName) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("SQLXML not supported");
+    throw exceptionFactory.notSupported("SQLXML not supported");
   }
 
   @Override
@@ -647,12 +658,12 @@ private CallParameter getParameter(int index) throws SQLException {
 
   @Override
   public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("SQLXML not supported");
+    throw exceptionFactory.notSupported("SQLXML not supported");
   }
 
   @Override
   public void setRowId(String parameterName, RowId rowid) throws SQLException {
-    throw ExceptionMapper.getFeatureNotSupportedException("RowIDs not supported");
+    throw exceptionFactory.notSupported("RowIDs not supported");
   }
 
   @Override