[misc] bulk command correction.

max_allowed_packet is not requested at connection creation. if max_allowed_packet is known and less than 16M (not default) Driver will prevent to add bunch of parameter until reaching max_allowed_packet. if unknown, bulk will split command by bunch of 16Mb, avoiding unknown limitation

Author: diego Dupin

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

@@ -35,7 +35,7 @@ public class PacketWriter implements Writer {
  protected byte[] buf;
  protected int pos = 4;
  private int maxPacketLength = MAX_PACKET_LENGTH;
- private int maxAllowedPacket;
+ private Integer maxAllowedPacket;
  private long cmdLength;
  private boolean permitTrace = true;
  private String serverThreadLog = "";
@@ -62,7 +62,7 @@ public PacketWriter(
  this.cmdLength = 0;
  this.sequence = sequence;
  this.compressSequence = compressSequence;
- this.maxAllowedPacket = maxAllowedPacket == null ? Integer.MAX_VALUE : maxAllowedPacket;
+ this.maxAllowedPacket = maxAllowedPacket;
  }
 
  public int pos() {
@@ -688,20 +688,24 @@ public void flush() throws IOException {
  * @throws MaxAllowedPacketException if query has not to be sent.
  */
  private void checkMaxAllowedLength(int length) throws MaxAllowedPacketException {
- if (cmdLength + length >= maxAllowedPacket) {
- // launch exception only if no packet has been sent.
- throw new MaxAllowedPacketException(
- "query size ("
- + (cmdLength + length)
- + ") is >= to max_allowed_packet ("
- + maxAllowedPacket
- + ")",
- cmdLength != 0);
+ if (maxAllowedPacket != null) {
+ if (cmdLength + length >= maxAllowedPacket) {
+ // launch exception only if no packet has been sent.
+ throw new MaxAllowedPacketException(
+ "query size ("
+ + (cmdLength + length)
+ + ") is >= to max_allowed_packet ("
+ + maxAllowedPacket
+ + ")",
+ cmdLength != 0);
+ }
  }
  }
 
  public boolean throwMaxAllowedLength(int length) {
- return cmdLength + length >= maxAllowedPacket;
+ if (maxAllowedPacket != null)
+ return cmdLength + length >= maxAllowedPacket;
+ return false;
  }
 
  public void permitTrace(boolean permitTrace) {

src/main/java/org/mariadb/jdbc/message/client/BulkExecutePacket.java

@@ -124,6 +124,15 @@ public int encode(Writer writer, Context context, Prepare newPrepareResult)
  break;
  }
 
+ if (writer.isMarked() && writer.throwMaxAllowedLength(writer.pos())) {
+ // for max_allowed_packet < 16Mb
+ // packet length was ok at last mark, but won't with new data
+ writer.flushBufferStopAtMark();
+ writer.mark();
+ lastCmdData = writer.resetMark();
+ break;
+ }
+
  writer.mark();
 
  if (writer.bufIsDataAfterMark()) {

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

@@ -272,27 +272,33 @@ public void largeBatch(Connection con) throws SQLException {
  public void bulkPacketSplitMaxAllowedPacket() throws SQLException {
  int maxAllowedPacket = getMaxAllowedPacket();
  bulkPacketSplit(2, maxAllowedPacket - 40, maxAllowedPacket);
+ if (maxAllowedPacket >= 16 * 1024 * 1024)
+ bulkPacketSplit(2, maxAllowedPacket - 40, null);
  }
 
  @Test
  public void bulkPacketSplitMultiplePacket() throws SQLException {
  int maxAllowedPacket = getMaxAllowedPacket();
  bulkPacketSplit(4, getMaxAllowedPacket() / 3, maxAllowedPacket);
+ if (maxAllowedPacket >= 16 * 1024 * 1024)
+ bulkPacketSplit(4, getMaxAllowedPacket() / 3, null);
  }
 
  @Test
  public void bulkPacketSplitHugeNbPacket() throws SQLException {
  int maxAllowedPacket = getMaxAllowedPacket();
  bulkPacketSplit(getMaxAllowedPacket() / 8000, 20, maxAllowedPacket);
+ if (maxAllowedPacket >= 16 * 1024 * 1024)
+ bulkPacketSplit(getMaxAllowedPacket() / 8000, 20, null);
  }
 
- public void bulkPacketSplit(int nb, int len, int maxAllowedPacket) throws SQLException {
+ public void bulkPacketSplit(int nb, int len, Integer maxAllowedPacket) throws SQLException {
  byte[] arr = new byte[Math.min(16 * 1024 * 1024, len)];
  for (int pos = 0; pos < arr.length; pos++) {
  arr[pos] = (byte) ((pos % 60) + 65);
  }
 
- try (Connection con = createCon("&useServerPrepStmts&useBulkStmts&maxAllowedPacket=" + maxAllowedPacket)) {
+ try (Connection con = createCon("&useServerPrepStmts&useBulkStmts" + (maxAllowedPacket != null ? "&maxAllowedPacket=" + maxAllowedPacket: ""))) {
  Statement stmt = con.createStatement();
  stmt.execute("TRUNCATE BatchTest");
  stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER