[misc] ensuring test reliability on Skysql HA

Author: diego Dupin

src/test/java/org/mariadb/jdbc/integration/codec/BinaryCodecTest.java

@@ -50,22 +50,27 @@ public static void beforeAll2() throws SQLException {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from BinaryCodec");
  assertTrue(rs.next());
+ sharedConn.commit();
  return rs;
  }
 
  private ResultSet getPrepare(Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement prepareStatement =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from BinaryCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- ResultSet rs = stmt.executeQuery();
+ prepareStatement.closeOnCompletion();
+ prepareStatement.setInt(1, 0);
+ ResultSet rs = prepareStatement.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }
 

src/test/java/org/mariadb/jdbc/integration/codec/BitCodecTest.java

@@ -40,22 +40,27 @@ public static void beforeAll2() throws SQLException {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from BitCodec");
  assertTrue(rs.next());
+ sharedConn.commit();
  return rs;
  }
 
  private ResultSet getPrepare(Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement preparedStatement =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from BitCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- ResultSet rs = stmt.executeQuery();
+ preparedStatement.closeOnCompletion();
+ preparedStatement.setInt(1, 0);
+ ResultSet rs = preparedStatement.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }
 

src/test/java/org/mariadb/jdbc/integration/codec/BlobCodecTest.java

@@ -56,6 +56,7 @@ public static void beforeAll2() throws Exception {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from BlobCodec");
@@ -64,14 +65,17 @@ private ResultSet get() throws SQLException {
  }
 
  private CompleteResult getPrepare(org.mariadb.jdbc.Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement preparedStatement =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from BlobCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- CompleteResult rs = (CompleteResult) stmt.executeQuery();
+ preparedStatement.closeOnCompletion();
+ preparedStatement.setInt(1, 0);
+ CompleteResult rs = (CompleteResult) preparedStatement.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }
 

src/test/java/org/mariadb/jdbc/integration/codec/CharCodecTest.java

@@ -46,22 +46,27 @@ public static void beforeAll2() throws SQLException {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from CharCodec");
  assertTrue(rs.next());
+ sharedConn.commit();
  return rs;
  }
 
  private ResultSet getPrepare(Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement preparedStatement =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from CharCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- ResultSet rs = stmt.executeQuery();
+ preparedStatement.closeOnCompletion();
+ preparedStatement.setInt(1, 0);
+ ResultSet rs = preparedStatement.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }
 

src/test/java/org/mariadb/jdbc/integration/codec/ClobCodecTest.java

@@ -51,22 +51,27 @@ public static void beforeAll2() throws SQLException {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from ClobCodec");
  assertTrue(rs.next());
+ sharedConn.commit();
  return rs;
  }
 
  private ResultSet getPrepare(Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement preparedStatement =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from ClobCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- ResultSet rs = stmt.executeQuery();
+ preparedStatement.closeOnCompletion();
+ preparedStatement.setInt(1, 0);
+ ResultSet rs = preparedStatement.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }
 

src/test/java/org/mariadb/jdbc/integration/codec/DateCodecTest.java

@@ -42,22 +42,27 @@ public static void beforeAll2() throws SQLException {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from DateCodec");
  assertTrue(rs.next());
+ sharedConn.commit();
  return rs;
  }
 
  private ResultSet getPrepare(Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement preparedStatement =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from DateCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- ResultSet rs = stmt.executeQuery();
+ preparedStatement.closeOnCompletion();
+ preparedStatement.setInt(1, 0);
+ ResultSet rs = preparedStatement.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }
 

src/test/java/org/mariadb/jdbc/integration/codec/DateTimeCodecTest.java

@@ -48,22 +48,27 @@ public static void beforeAll2() throws SQLException {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from DateTimeCodec");
  assertTrue(rs.next());
+ sharedConn.commit();
  return rs;
  }
 
  private ResultSet getPrepare(Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement prepStmt =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from DateTimeCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- ResultSet rs = stmt.executeQuery();
+ prepStmt.closeOnCompletion();
+ prepStmt.setInt(1, 0);
+ ResultSet rs = prepStmt.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }
 
@@ -76,6 +81,7 @@ public void getObject() throws SQLException {
  public void getObjectPrepare() throws SQLException {
  getObject(getPrepare(sharedConn));
  getObject(getPrepare(sharedConnBinary));
+
  }
 
  public void getObject(ResultSet rs) throws SQLException {

src/test/java/org/mariadb/jdbc/integration/codec/DecimalCodecTest.java

@@ -43,22 +43,27 @@ public static void beforeAll2() throws SQLException {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from DecimalCodec");
  assertTrue(rs.next());
+ sharedConn.commit();
  return rs;
  }
 
  private ResultSet getPrepare(Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement preparedStatement =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from DecimalCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- ResultSet rs = stmt.executeQuery();
+ preparedStatement.closeOnCompletion();
+ preparedStatement.setInt(1, 0);
+ ResultSet rs = preparedStatement.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }
 

src/test/java/org/mariadb/jdbc/integration/codec/DoubleCodecTest.java

@@ -39,22 +39,27 @@ public static void beforeAll2() throws SQLException {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from DoubleCodec");
  assertTrue(rs.next());
+ sharedConn.commit();
  return rs;
  }
 
  private ResultSet getPrepare(Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement preparedStatement =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from DoubleCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- ResultSet rs = stmt.executeQuery();
+ preparedStatement.closeOnCompletion();
+ preparedStatement.setInt(1, 0);
+ ResultSet rs = preparedStatement.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }
 

src/test/java/org/mariadb/jdbc/integration/codec/EnumCodecTest.java

@@ -49,22 +49,27 @@ public static void beforeAll2() throws SQLException {
 
  private ResultSet get() throws SQLException {
  Statement stmt = sharedConn.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
  ResultSet rs =
  stmt.executeQuery(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from EnumCodec");
  assertTrue(rs.next());
+ sharedConn.commit();
  return rs;
  }
 
  private ResultSet getPrepare(Connection con) throws SQLException {
- PreparedStatement stmt =
+ java.sql.Statement stmt = con.createStatement();
+ stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER
+ PreparedStatement preparedStatement =
  con.prepareStatement(
  "select t1 as t1alias, t2 as t2alias, t3 as t3alias, t4 as t4alias from EnumCodec"
  + " WHERE 1 > ?");
- stmt.closeOnCompletion();
- stmt.setInt(1, 0);
- ResultSet rs = stmt.executeQuery();
+ preparedStatement.closeOnCompletion();
+ preparedStatement.setInt(1, 0);
+ ResultSet rs = preparedStatement.executeQuery();
  assertTrue(rs.next());
+ con.commit();
  return rs;
  }