[misc] coverage addition

Author: rusher

src/main/java/org/mariadb/jdbc/client/Client.java

@@ -89,7 +89,5 @@ void readStreamingResults(
 
  ExceptionFactory getExceptionFactory();
 
- void reset(ExceptionFactory exceptionFactory);
-
  HostAddress getHostAddress();
 }

src/main/java/org/mariadb/jdbc/client/ClientImpl.java

@@ -317,7 +317,7 @@ public QueryPacket createSessionVariableQuery() {
  }
 
  // force client timezone to connection to ensure result of now(), ...
- if (conf.timezone() != null && !"disable".equalsIgnoreCase(conf.timezone())) {
+ if (conf.timezone() == null || !"disable".equalsIgnoreCase(conf.timezone())) {
  String timeZone =
  (conf.timezone() != null) ? conf.timezone() : ZoneId.systemDefault().getId();
  sb.append(",time_zone='").append(timeZone).append("'");
@@ -809,11 +809,6 @@ public ExceptionFactory getExceptionFactory() {
  return exceptionFactory;
  }
 
- public void reset(ExceptionFactory exceptionFactory) {
- this.exceptionFactory = exceptionFactory;
- this.context.resetPrepareCache(new PrepareCache(conf.prepStmtCacheSize(), this));
- }
-
  public HostAddress getHostAddress() {
  return hostAddress;
  }

src/main/java/org/mariadb/jdbc/client/MultiPrimaryClient.java

@@ -471,11 +471,6 @@ public ExceptionFactory getExceptionFactory() {
  return currentClient.getExceptionFactory();
  }
 
- @Override
- public void reset(ExceptionFactory exceptionFactory) {
- currentClient.reset(exceptionFactory);
- }
-
  @Override
  public HostAddress getHostAddress() {
  return currentClient.getHostAddress();

src/main/java/org/mariadb/jdbc/client/MultiPrimaryReplicaClient.java

@@ -348,12 +348,6 @@ public ExceptionFactory getExceptionFactory() {
  return super.getExceptionFactory();
  }
 
- @Override
- public void reset(ExceptionFactory exceptionFactory) {
- reconnectIfNeeded();
- super.reset(exceptionFactory);
- }
-
  @Override
  public HostAddress getHostAddress() {
  reconnectIfNeeded();

src/main/java/org/mariadb/jdbc/client/context/BaseContext.java

@@ -127,18 +127,10 @@ public PrepareCache getPrepareCache() {
  return prepareCache;
  }
 
- public void resetPrepareCache(PrepareCache prepareCache) {
- this.prepareCache = prepareCache;
- }
-
  public int getStateFlag() {
  return stateFlag;
  }
 
- public void setStateFlag(int stateFlag) {
- this.stateFlag = stateFlag;
- }
-
  public void addStateFlag(int state) {
  stateFlag |= state;
  }
@@ -147,12 +139,4 @@ public void saveRedo(ClientMessage msg) {}
 
  public void saveRedo(ClientMessage[] msgs) {}
 
- public TransactionSaver getTransactionSaver() {
- return null;
- }
-
- @Override
- public String toString() {
- return "ConnectionContext{" + "threadId=" + threadId + ", version=" + version + '}';
- }
 }

src/main/java/org/mariadb/jdbc/client/context/Context.java

@@ -62,17 +62,15 @@ public interface Context {
 
  PrepareCache getPrepareCache();
 
- void resetPrepareCache(PrepareCache prepareCache);
-
  int getStateFlag();
 
- void setStateFlag(int stateFlag);
-
  void addStateFlag(int state);
 
  void saveRedo(ClientMessage msg);
 
  void saveRedo(ClientMessage[] msgs);
 
- TransactionSaver getTransactionSaver();
+ default TransactionSaver getTransactionSaver() {
+ return null;
+ }
 }

src/main/java/org/mariadb/jdbc/client/result/CompleteResult.java

@@ -112,16 +112,11 @@ public static ResultSet createResultSet(
  int len = bb.length;
  if (len < 251) {
  baos.write((byte) len);
- } else if (len < 65536) {
- baos.write((byte) 0xfc);
- baos.write((byte) len);
- baos.write((byte) (len >>> 8));
  } else {
- // assumption : len < 16777216
- baos.write((byte) 0xfd);
+ // assume length cannot be > 65536
+ baos.write((byte) 0xfc);
  baos.write((byte) len);
  baos.write((byte) (len >>> 8));
- baos.write((byte) (len >>> 16));
  }
  baos.write(bb, 0, bb.length);
  } else {

src/main/java/org/mariadb/jdbc/client/result/Result.java

@@ -148,7 +148,7 @@ protected boolean readNext() throws SQLException, IOException {
  // continue reading rows
 
  default:
- if (dataSize + 1 >= data.length) {
+ if (dataSize + 1 > data.length) {
  growDataArray();
  }
  data[dataSize++] = buf;
@@ -233,17 +233,14 @@ public void closeFromStmtClose() throws SQLException {
 
  public void abort() throws SQLException {
  this.closed = true;
- if (closeOnCompletion) {
- statement.close();
- }
  }
 
  protected byte[] getCurrentRowData() {
  return data[0];
  }
 
  protected void addRowData(byte[] buf) {
- if (dataSize + 1 >= data.length) {
+ if (dataSize + 1 > data.length) {
  growDataArray();
  }
  data[dataSize++] = buf;

src/main/java/org/mariadb/jdbc/client/result/ResultSetMetaData.java

@@ -267,12 +267,9 @@ public String getColumnTypeName(final int column) throws SQLException {
  * @throws SQLException if a database access error occurs or in case of wrong index
  */
  public boolean isReadOnly(final int column) throws SQLException {
- if (column >= 1 && column <= fieldPackets.length) {
- ColumnDefinitionPacket ci = getColumn(column);
- return (ci.getTable() == null || ci.getTable().isEmpty())
- && (ci.getColumn() == null || ci.getColumn().isEmpty());
- }
- throw exceptionFactory.create(String.format("no column with index %s", column));
+ ColumnDefinitionPacket ci = getColumn(column);
+ return (ci.getTable() == null || ci.getTable().isEmpty())
+ && (ci.getColumn() == null || ci.getColumn().isEmpty());
  }
 
  /**
@@ -316,7 +313,7 @@ private ColumnDefinitionPacket getColumn(int column) throws SQLException {
  if (column >= 1 && column <= fieldPackets.length) {
  return fieldPackets[column - 1];
  }
- throw exceptionFactory.create("No such column");
+ throw exceptionFactory.create(String.format("wrong column index %s", column));
  }
 
  /**

src/main/java/org/mariadb/jdbc/client/socket/CompressInputStream.java

@@ -174,11 +174,11 @@ private void retrieveBuffer() throws IOException {
  readOffset += count;
  } while (remaining > 0);
 
- if (logger.isTraceEnabled()) {
- logger.trace(
- "read compress: \n{}",
- LoggerHelper.hex(header, intermediaryBuf, 0, intermediaryBuf.length, 1000));
- }
+// if (logger.isTraceEnabled()) {
+// logger.trace(
+// "read compress: \n{}",
+// LoggerHelper.hex(header, intermediaryBuf, 0, intermediaryBuf.length, 1000));
+// }
 
  if (compressed) {
  buf = new byte[packetLength];