[misc] test coverage addition

Author: diego Dupin

src/main/java/org/mariadb/jdbc/ClientPreparedStatement.java

@@ -17,6 +17,7 @@
 import org.mariadb.jdbc.message.client.*;
 import org.mariadb.jdbc.message.server.ColumnDefinitionPacket;
 import org.mariadb.jdbc.message.server.OkPacket;
+import org.mariadb.jdbc.message.server.PrepareResultPacket;
 import org.mariadb.jdbc.util.ClientParser;
 import org.mariadb.jdbc.util.ParameterList;
 import org.mariadb.jdbc.util.constants.Capabilities;
@@ -120,7 +121,12 @@ private void executeBatchBulk() throws SQLException {
  ResultSet.CONCUR_READ_ONLY,
  ResultSet.TYPE_FORWARD_ONLY,
  closeOnCompletion);
- results = res.subList(1, res.size());
+ // in case of failover, prepare is done in failover, skipping prepare result
+ if (res.get(0) instanceof PrepareResultPacket) {
+ results = res.subList(1, res.size());
+ } else {
+ results = res;
+ }
  } else {
  results =
  con.getClient()

src/main/java/org/mariadb/jdbc/ServerPreparedStatement.java

@@ -161,34 +161,45 @@ private void executeInternalPreparedBatch() throws SQLException {
  * @throws SQLException if IOException / Command error
  */
  private void executeBatchBulk(String cmd) throws SQLException {
- ClientMessage[] packets;
+ List<Completion> res;
  if (prepareResult == null) prepareResult = con.getContext().getPrepareCache().get(cmd, this);
- if (prepareResult == null) {
- packets =
- new ClientMessage[] {
- new PreparePacket(cmd), new BulkExecutePacket(null, batchParameters, cmd, this)
- };
- } else {
- packets =
- new ClientMessage[] {new BulkExecutePacket(prepareResult, batchParameters, cmd, this)};
- }
  try {
- List<Completion> res =
- con.getClient()
- .executePipeline(
- packets,
- this,
- 0,
- maxRows,
- ResultSet.CONCUR_READ_ONLY,
- ResultSet.TYPE_FORWARD_ONLY,
- closeOnCompletion);
- // in case of failover, prepare is done in failover, skipping prepare result
- if (res.get(0) instanceof PrepareResultPacket) {
- results = res.subList(1, res.size());
+ if (prepareResult == null) {
+ ClientMessage[] packets;
+ packets =
+ new ClientMessage[] {
+ new PreparePacket(cmd), new BulkExecutePacket(null, batchParameters, cmd, this)
+ };
+ res =
+ con.getClient()
+ .executePipeline(
+ packets,
+ this,
+ 0,
+ maxRows,
+ ResultSet.CONCUR_READ_ONLY,
+ ResultSet.TYPE_FORWARD_ONLY,
+ closeOnCompletion);
+
+ // in case of failover, prepare is done in failover, skipping prepare result
+ if (res.get(0) instanceof PrepareResultPacket) {
+ results = res.subList(1, res.size());
+ } else {
+ results = res;
+ }
  } else {
- results = res;
+ results =
+ con.getClient()
+ .execute(
+ new BulkExecutePacket(prepareResult, batchParameters, cmd, this),
+ this,
+ 0,
+ maxRows,
+ ResultSet.CONCUR_READ_ONLY,
+ ResultSet.TYPE_FORWARD_ONLY,
+ closeOnCompletion);
  }
+
  } catch (SQLException bue) {
  results = null;
  throw exceptionFactory()

src/main/java/org/mariadb/jdbc/client/impl/ConnectionHelper.java

@@ -108,6 +108,9 @@ public static Socket connectSocket(final Configuration conf, final HostAddress h
  throws SQLException {
  Socket socket;
  try {
+ if (conf.pipe() == null && conf.localSocket() == null && hostAddress == null)
+ throw new SQLException(
+ "hostname must be set to connect socket if not using local socket or pipe");
  socket = createSocket(conf, hostAddress);
  SocketHelper.setSocketOption(conf, socket);
  if (!socket.isConnected()) {
@@ -192,16 +195,12 @@ public static long initializeClientCapabilities(
  public static byte decideLanguage(InitialHandshakePacket handshake) {
  short serverLanguage = handshake.getDefaultCollation();
  // return current server utf8mb4 collation
- if (serverLanguage == 45 // utf8mb4_general_ci
- || serverLanguage == 46 // utf8mb4_bin
- || (serverLanguage >= 224 && serverLanguage <= 247)) {
- return (byte) serverLanguage;
- }
- if (!handshake.getVersion().versionGreaterOrEqual(5, 5, 0)) {
- // 5.1 version doesn't know 4 bytes utf8
- return (byte) 33; // utf8_general_ci
- }
- return (byte) 224; // UTF8MB4_UNICODE_CI;
+ return (byte)
+ ((serverLanguage == 45 // utf8mb4_general_ci
+ || serverLanguage == 46 // utf8mb4_bin
+ || (serverLanguage >= 224 && serverLanguage <= 247))
+ ? serverLanguage
+ : 224); // UTF8MB4_UNICODE_CI;
  }
 
  public static void authenticationHandler(

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

@@ -60,7 +60,7 @@ public MultiPrimaryClient(Configuration conf, ReentrantLock lock) throws SQLExce
  * searching in temporary denied host if not succeed, until reaching `retriesAllDown` attempts.
  *
  * @param readOnly must connect a replica / primary
- * @param failFast must try only not denyed server
+ * @param failFast must try only not denied server
  * @return a valid connection client
  * @throws SQLException if not succeed to create a connection.
  */
@@ -86,7 +86,7 @@ protected Client connectHost(boolean readOnly, boolean failFast) throws SQLExcep
  if (failFast) {
  throw (lastSqle != null)
  ? lastSqle
- : new SQLNonTransientConnectionException("No host not blacklisted");
+ : new SQLNonTransientConnectionException("all hosts are blacklisted");
  }
 
  // All server corresponding to type are in deny list
@@ -224,8 +224,6 @@ public void syncNewState(Client oldCli) throws SQLException {
  case java.sql.Connection.TRANSACTION_SERIALIZABLE:
  query += " SERIALIZABLE";
  break;
- default:
- throw new SQLException("Unsupported transaction isolation level");
  }
  currentClient
  .getContext()
@@ -395,9 +393,6 @@ public void abort(Executor executor) throws SQLException {
 
  @Override
  public void close() throws SQLException {
- if (closed) {
- throw new SQLNonTransientConnectionException("Connection is closed", "08000", 1220);
- }
  closed = true;
  currentClient.close();
  }

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

@@ -239,7 +239,7 @@ public void abort(Executor executor) throws SQLException {
  }
 
  @Override
- public void close() {
+ public void close() throws SQLException {
  if (!closed) {
  closed = true;
  try {

src/main/java/org/mariadb/jdbc/client/socket/impl/SocketUtility.java

@@ -18,26 +18,21 @@ public class SocketUtility {
  */
  @SuppressWarnings("unchecked")
  public static SocketHandlerFunction getSocketHandler() {
- try {
- // forcing use of JNA to ensure AOT compilation
- Platform.getOSType();
+ // forcing use of JNA to ensure AOT compilation
+ Platform.getOSType();
 
- return (conf, hostAddress) -> {
- if (conf.pipe() != null) {
- return new NamedPipeSocket(hostAddress != null ? hostAddress.host : null, conf.pipe());
- } else if (conf.localSocket() != null) {
- try {
- return new UnixDomainSocket(conf.localSocket());
- } catch (RuntimeException re) {
- throw new IOException(re.getMessage(), re.getCause());
- }
- } else {
- return ConnectionHelper.standardSocket(conf, hostAddress);
+ return (conf, hostAddress) -> {
+ if (conf.pipe() != null) {
+ return new NamedPipeSocket(hostAddress != null ? hostAddress.host : null, conf.pipe());
+ } else if (conf.localSocket() != null) {
+ try {
+ return new UnixDomainSocket(conf.localSocket());
+ } catch (RuntimeException re) {
+ throw new IOException(re.getMessage(), re.getCause());
  }
- };
- } catch (Throwable cle) {
- // jna jar's are not in classpath
- }
- return ConnectionHelper::standardSocket;
+ } else {
+ return ConnectionHelper.standardSocket(conf, hostAddress);
+ }
+ };
  }
 }

src/test/java/org/mariadb/jdbc/integration/BatchTest.java

@@ -134,8 +134,8 @@ public void differentParameterType(Connection con, boolean expectSuccessUnknown)
  assertEquals(2, rs.getInt(1));
  assertEquals("2", rs.getString(2));
  assertFalse(rs.next());
-
  stmt.execute("TRUNCATE BatchTest");
+
  try (PreparedStatement prep =
  con.prepareStatement("INSERT INTO BatchTest(t1, t2) VALUES (?,?)")) {
  prep.setInt(1, 1);
@@ -195,6 +195,24 @@ public void differentParameterType(Connection con, boolean expectSuccessUnknown)
  assertEquals(2, res.length);
  assertEquals(1, res[0]);
  assertEquals(1, res[1]);
+
+ stmt.execute("TRUNCATE BatchTest");
+ if (isMariaDBServer()) {
+ stmt.setFetchSize(1);
+ rs = stmt.executeQuery("SELECT * FROM seq_1_to_10");
+ rs.next();
+ }
+ prep.setInt(1, 1);
+ prep.setString(2, "1");
+ prep.addBatch();
+
+ prep.setInt(1, 2);
+ prep.setInt(2, 2);
+ prep.addBatch();
+ res = prep.executeBatch();
+ assertEquals(2, res.length);
+ assertEquals(1, res[0]);
+ assertEquals(1, res[1]);
  }
  rs = stmt.executeQuery("SELECT * FROM BatchTest");
  assertTrue(rs.next());

src/test/java/org/mariadb/jdbc/integration/ConnectionTest.java

@@ -16,6 +16,7 @@
 import java.util.concurrent.Executor;
 import org.junit.jupiter.api.*;
 import org.mariadb.jdbc.*;
+import org.mariadb.jdbc.integration.util.SocketFactoryBasicTest;
 import org.mariadb.jdbc.integration.util.SocketFactoryTest;
 
 @DisplayName("Connection Test")
@@ -39,6 +40,18 @@ void isValidWrongValue() {
  }
  }
 
+ @Test
+ void missingHost() {
+ assertThrowsContains(
+ SQLException.class,
+ () -> DriverManager.getConnection("jdbc:mariadb:///db"),
+ "hostname must be set to connect socket if not using local socket or pipe");
+ assertThrowsContains(
+ SQLException.class,
+ () -> DriverManager.getConnection("jdbc:mariadb:///db?socketFactory=test"),
+ "hostname must be set to connect socket");
+ }
+
  @Test
  void socketTimeout() throws SQLException {
  Assumptions.assumeTrue(
@@ -882,30 +895,29 @@ public void windowsNamedPipe() throws SQLException {
  if (rs != null) {
  assertTrue(rs.next());
  System.out.println("named_pipe:" + rs.getString(1));
- if (rs.getBoolean(1)) {
- String namedPipeName = rs.getString(2);
- System.out.println("namedPipeName:" + namedPipeName);
-
- // skip test if no namedPipeName was obtained because then we do not use a socket connection
- Assumptions.assumeTrue(namedPipeName != null);
- try (Connection connection = createCon("pipe=" + namedPipeName)) {
- java.sql.Statement stmt = connection.createStatement();
- try (ResultSet rs2 = stmt.executeQuery("SELECT 1")) {
- assertTrue(rs2.next());
- }
+ Assumptions.assumeTrue(rs.getBoolean(1));
+ String namedPipeName = rs.getString(2);
+ System.out.println("namedPipeName:" + namedPipeName);
+
+ // skip test if no namedPipeName was obtained because then we do not use a socket connection
+ Assumptions.assumeTrue(namedPipeName != null);
+ try (Connection connection = createCon("pipe=" + namedPipeName)) {
+ java.sql.Statement stmt = connection.createStatement();
+ try (ResultSet rs2 = stmt.executeQuery("SELECT 1")) {
+ assertTrue(rs2.next());
  }
-  // connection without host name
-  try (java.sql.Connection connection =
-  DriverManager.getConnection(
-  "jdbc:mariadb:///"
-  + sharedConn.getCatalog()
-  + mDefUrl.substring(mDefUrl.indexOf("?user="))
-  + "&pipe="
-  + namedPipeName)) {
- java.sql.Statement stmt = connection.createStatement();
-  try (ResultSet rs2 = stmt.executeQuery("SELECT 1")) {
-  assertTrue(rs2.next());
- }
+ }
+ // connection without host name
+ try (java.sql.Connection connection =
+ DriverManager.getConnection(
+ "jdbc:mariadb:///"
+ + sharedConn.getCatalog()
+ + mDefUrl.substring(mDefUrl.indexOf("?user="))
+ + "&pipe="
+  + namedPipeName)) {
+ java.sql.Statement stmt = connection.createStatement();
+ try (ResultSet rs2 = stmt.executeQuery("SELECT 1")) {
+ assertTrue(rs2.next());
  }
  }
  }
@@ -969,9 +981,14 @@ public void localSocket() throws Exception {
 
  @Test
  public void socketFactoryTest() throws SQLException {
+ try (Connection conn = createCon("socketFactory=" + SocketFactoryBasicTest.class.getName())) {
+ conn.isValid(1);
+ }
+
  try (Connection conn = createCon("socketFactory=" + SocketFactoryTest.class.getName())) {
  conn.isValid(1);
  }
+
  Common.assertThrowsContains(
  SQLNonTransientConnectionException.class,
  () -> createCon("socketFactory=wrongClass"),