Skip to content

Commit

Permalink
[misc] add query message to connection error exception
Browse files Browse the repository at this point in the history
  • Loading branch information
@rusher
rusher committed Jan 12, 2017
1 parent f699127 commit a743039
Show file tree
Hide file tree
Showing 4 changed files with 254 additions and 121 deletions.
150 changes: 31 additions & 119 deletions src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java
View file
Expand Up @@ -67,6 +67,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
import org.mariadb.jdbc.internal.stream.PacketOutputStream;
import org.mariadb.jdbc.internal.util.BulkStatus;
import org.mariadb.jdbc.internal.util.ExceptionMapper;
import org.mariadb.jdbc.internal.util.LogQueryTool;
import org.mariadb.jdbc.internal.util.Utils;
import org.mariadb.jdbc.internal.util.buffer.Buffer;
import org.mariadb.jdbc.internal.util.constant.ServerStatus;
Expand All @@ -76,9 +77,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS

import java.io.*;
import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.net.URL;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.sql.*;
import java.util.List;
Expand All @@ -98,7 +97,7 @@ public class AbstractQueryProtocol extends AbstractConnectProtocol implements Pr

private volatile int statementIdToRelease = -1;


private LogQueryTool logQuery;
/**
* Get a protocol instance.
*
Expand All @@ -108,6 +107,7 @@ public class AbstractQueryProtocol extends AbstractConnectProtocol implements Pr

public AbstractQueryProtocol(final UrlParser urlParser, final ReentrantLock lock) {
super(urlParser, lock);
logQuery = new LogQueryTool(options);
}

public void executeQuery(final String sql) throws SQLException {
Expand All @@ -133,12 +133,11 @@ public void executeQuery(boolean mustExecuteOnMaster, Results results, final Str
getResult(results);

} catch (SQLException sqlException) {
throw addQueryInfo(sql, sqlException);
throw logQuery.exceptionWithQuery(sql, sqlException);
} catch (MaxAllowedPacketException e) {
if (e.isMustReconnect()) connect();
throw handleMaxAllowedFailover("Could not send query: " + e.getMessage(), e);
throw handleMaxAllowedFailover("Could not execute query: " + logQuery.subQuery(sql), e);
} catch (IOException e) {
throw new SQLNonTransientConnectionException("Could not send query: " + e.getMessage(), CONNECTION_EXCEPTION.getSqlState(), e);
throw new SQLNonTransientConnectionException("Could not execute query: " + logQuery.subQuery(sql), CONNECTION_EXCEPTION.getSqlState(), e);
}

}
Expand Down Expand Up @@ -172,11 +171,13 @@ public void executeQuery(boolean mustExecuteOnMaster, Results results, final Cli
getResult(results);

} catch (SQLException queryException) {
throw throwErrorWithQuery(parameters, queryException, clientPrepareResult);
throw logQuery.exceptionWithQuery(parameters, queryException, clientPrepareResult);
} catch (MaxAllowedPacketException e) {
throw handleMaxAllowedFailover("Could not execute query", e);
throw handleMaxAllowedFailover(logQuery.exWithQuery("Could not execute query", clientPrepareResult, parameters), e);
} catch (IOException e) {
throw new SQLNonTransientConnectionException("Could not execute query", CONNECTION_EXCEPTION.getSqlState(), e);
throw new SQLNonTransientConnectionException(
logQuery.exWithQuery("Could not execute query", clientPrepareResult, parameters),
CONNECTION_EXCEPTION.getSqlState(), e);
} finally {
writer.releaseBufferIfNotLogging();
}
Expand Down Expand Up @@ -226,7 +227,7 @@ public SQLException handleResultException(SQLException qex, Results results,
sql += parameters[i].toString() + new String(queryParts.get(i + 1));
}

return addQueryInfo(sql, qex);
return logQuery.exceptionWithQuery(sql, qex);
}


Expand Down Expand Up @@ -277,7 +278,7 @@ public SQLException handleResultException(SQLException qex, Results results,
throws SQLException {

String sql = queries.get(currentCounter + sendCmdCounter);
return addQueryInfo(sql, qex);
return logQuery.exceptionWithQuery(sql, qex);

}

Expand Down Expand Up @@ -380,13 +381,14 @@ public void executeBatchMultiple(boolean mustExecuteOnMaster, Results results, f
getResult(results);

} catch (SQLException sqlException) {
addQueryInfo(firstSql, sqlException);
logQuery.exceptionWithQuery(firstSql, sqlException);
if (!getOptions().continueBatchOnError) throw sqlException;
if (exception == null) exception = sqlException;
} catch (MaxAllowedPacketException e) {
throw handleMaxAllowedFailover("Could not execute query", e);
throw handleMaxAllowedFailover("Could not execute query: " + logQuery.subQuery(firstSql), e);
} catch (IOException e) {
throw new SQLNonTransientConnectionException("Could not execute query", CONNECTION_EXCEPTION.getSqlState(), e);
throw new SQLNonTransientConnectionException("Could not execute query: " + logQuery.subQuery(firstSql),
CONNECTION_EXCEPTION.getSqlState(), e);
} finally {
writer.releaseBufferIfNotLogging();
}
Expand Down Expand Up @@ -427,11 +429,12 @@ public void executeBatchRewrite(boolean mustExecuteOnMaster, Results results,
} while (currentIndex < totalParameterList);

} catch (SQLException sqlEx) {
throwErrorWithQuery(writer.buffer, sqlEx);
throw logQuery.exceptionWithQuery(writer.buffer, sqlEx);
} catch (MaxAllowedPacketException e) {
throw handleMaxAllowedFailover("Could not execute query", e);
throw handleMaxAllowedFailover("Could not execute query: " + logQuery.subQuery(writer.buffer), e);
} catch (IOException e) {
throw new SQLNonTransientConnectionException("Could not execute query", CONNECTION_EXCEPTION.getSqlState(), e);
throw new SQLNonTransientConnectionException("Could not execute query: " + logQuery.subQuery(writer.buffer),
CONNECTION_EXCEPTION.getSqlState(), e);
} finally {
writer.releaseBufferIfNotLogging();
}
Expand Down Expand Up @@ -486,7 +489,7 @@ public SQLException handleResultException(SQLException qex, Results results,
List<ParameterHolder[]> parametersList, List<String> queries, int currentCounter,
int sendCmdCounter, int paramCount, PrepareResult prepareResult)
throws SQLException {
return throwErrorWithQuery(parametersList, qex, (ServerPrepareResult) prepareResult);
return logQuery.exceptionWithQuery(parametersList, qex, (ServerPrepareResult) prepareResult);
}

@Override
Expand Down Expand Up @@ -574,11 +577,13 @@ public ServerPrepareResult prepareAndExecute(boolean mustExecuteOnMaster, Server
return serverPrepareResult;

} catch (SQLException qex) {
throw throwErrorWithQuery(parameters, qex, serverPrepareResult);
throw logQuery.exceptionWithQuery(parameters, qex, serverPrepareResult);
} catch (MaxAllowedPacketException e) {
throw handleMaxAllowedFailover("Could not execute query", e);
throw handleMaxAllowedFailover(logQuery.exWithQuery("Could not execute query", serverPrepareResult, parameters), e);
} catch (IOException e) {
throw new SQLNonTransientConnectionException("Could not execute query", CONNECTION_EXCEPTION.getSqlState(), e);
throw new SQLNonTransientConnectionException(
logQuery.exWithQuery("Could not execute query", serverPrepareResult, parameters),
CONNECTION_EXCEPTION.getSqlState(), e);
} finally {
writer.releaseBufferIfNotLogging();
}
Expand Down Expand Up @@ -620,11 +625,12 @@ public void executePreparedQuery(boolean mustExecuteOnMaster, ServerPrepareResul
getResult(results);

} catch (SQLException qex) {
throw throwErrorWithQuery(parameters, qex, serverPrepareResult);
throw logQuery.exceptionWithQuery(parameters, qex, serverPrepareResult);
} catch (MaxAllowedPacketException e) {
throw handleMaxAllowedFailover("Could not execute query", e);
throw handleMaxAllowedFailover(logQuery.exWithQuery("Could not execute query", serverPrepareResult, parameters), e);
} catch (IOException e) {
throw new SQLNonTransientConnectionException("Could not execute query", CONNECTION_EXCEPTION.getSqlState(), e);
throw new SQLNonTransientConnectionException(
logQuery.exWithQuery("Could not execute query", serverPrepareResult, parameters), CONNECTION_EXCEPTION.getSqlState(), e);
} finally {
writer.releaseBufferIfNotLogging();
}
Expand Down Expand Up @@ -965,100 +971,6 @@ private void checkClose() throws SQLException {
if (!this.connected) throw new SQLException("Connection is close", "08000", 1220);
}

private SQLException addQueryInfo(String sql, SQLException sqlException) {
if (getOptions().dumpQueriesOnException || sqlException.getErrorCode() == 1064) {
if (options.maxQuerySizeToLog > 0 && sql.length() > options.maxQuerySizeToLog - 3) {
sql = sql.substring(0, options.maxQuerySizeToLog - 3) + "...";
}
return new SQLException(sqlException.getMessage() + "\nQuery is : " + sql, sqlException.getSQLState(),
sqlException.getErrorCode(), sqlException.getCause());
}
return sqlException;
}


private void throwErrorWithQuery(ByteBuffer buffer, SQLException sqlEx) throws SQLException {
if (getOptions().dumpQueriesOnException || sqlEx.getErrorCode() == 1064) {
//log first maxQuerySizeToLog utf-8 characters
String queryString;
if (options.maxQuerySizeToLog == 0) {
queryString = new String(buffer.array(), 5, buffer.limit());
} else {
queryString = new String(buffer.array(), 5, Math.min(buffer.limit() - 5, (options.maxQuerySizeToLog * 3)));
if (queryString.length() > options.maxQuerySizeToLog - 3) {
queryString = queryString.substring(0, options.maxQuerySizeToLog - 3) + "...";
}
}
throw addQueryInfo(queryString, sqlEx);
}
throw sqlEx;
}

private SQLException throwErrorWithQuery(ParameterHolder[] parameters, SQLException sqlEx, PrepareResult serverPrepareResult)
throws SQLException {
if (sqlEx.getCause() instanceof SocketTimeoutException) {
return new SQLException("Connection timed out", CONNECTION_EXCEPTION.getSqlState(), sqlEx);
}
if (getOptions().dumpQueriesOnException || sqlEx.getErrorCode() == 1064) {
String sql = serverPrepareResult.getSql();
if (serverPrepareResult.getParamCount() > 0) {
sql += ", parameters [";
if (parameters.length > 0) {
for (int i = 0; i < Math.min(parameters.length, serverPrepareResult.getParamCount()); i++) {
sql += parameters[i].toString() + ",";
}
sql = sql.substring(0, sql.length() - 1);
}
sql += "]";
}

String message = sqlEx.getMessage();
if (options.maxQuerySizeToLog != 0 && sql.length() > options.maxQuerySizeToLog - 3) {
message += "\nQuery is: " + sql.substring(0, options.maxQuerySizeToLog - 3) + "...";
} else {
message += "\nQuery is: " + sql;
}
return new SQLException(message, sqlEx.getSQLState(), sqlEx.getErrorCode(), sqlEx.getCause());
}
return sqlEx;
}

private SQLException throwErrorWithQuery(List<ParameterHolder[]> parameterList, SQLException sqlEx, ServerPrepareResult serverPrepareResult)
throws SQLException {
if (getOptions().dumpQueriesOnException || sqlEx.getErrorCode() == 1064) {
String querySql = serverPrepareResult.getSql();

if (serverPrepareResult.getParameters().length > 0) {
querySql += ", parameters ";
for (int paramNo = 0; paramNo < parameterList.size(); paramNo++) {
ParameterHolder[] parameters = parameterList.get(paramNo);
querySql += "[";
if (parameters.length > 0) {
for (int i = 0; i < parameters.length; i++) {
querySql += parameters[i].toString() + ",";
}
querySql = querySql.substring(0, querySql.length() - 1);
}
if (options.maxQuerySizeToLog > 0 && querySql.length() > options.maxQuerySizeToLog) {
break;
} else {
querySql += "],";
}
}
querySql = querySql.substring(0, querySql.length() - 1);
}

String message = sqlEx.getMessage();
if (options.maxQuerySizeToLog != 0 && querySql.length() > options.maxQuerySizeToLog - 3) {
message += "\nQuery is: " + querySql.substring(0, options.maxQuerySizeToLog - 3) + "...";
} else {
message += "\nQuery is: " + querySql;
}
return new SQLException(message, sqlEx.getSQLState(), sqlEx.getErrorCode(), sqlEx.getCause());
}
return sqlEx;
}

@Override
public void getResult(Results results) throws SQLException {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mariadb/jdbc/internal/protocol/Protocol.java
View file
Expand Up @@ -252,6 +252,6 @@ void prologProxy(ServerPrepareResult serverPrepareResult, int maxRows, boolean h
void removeActiveStreamingResult();

void resetStateAfterFailover(int maxRows, int transactionIsolationLevel, String database, boolean autocommit)
throws QueryException;
throws SQLException;

}

0 comments on commit a743039

Please sign in to comment.