[misc] performance improvement for multi-rows result-set.

Author: diego Dupin

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

@@ -15,14 +15,10 @@ public interface ReadableByteBuf {
 
  byte[] buf();
 
- ReadableByteBuf buf(byte[] buf, int limit);
+ void buf(byte[] buf, int limit, int pos);
 
  void pos(int pos);
 
- void mark();
-
- void reset();
-
  void skip();
 
  ReadableByteBuf skip(int length);
@@ -65,7 +61,7 @@ public interface ReadableByteBuf {
 
  long readLongBE();
 
- ReadableByteBuf readBytes(byte[] dst);
+ void readBytes(byte[] dst);
 
  byte[] readBytesNullEnd();
 

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

@@ -14,14 +14,12 @@ public final class StandardReadableByteBuf implements ReadableByteBuf {
  private int limit;
  private byte[] buf;
  private int pos;
- private int mark;
 
  public StandardReadableByteBuf(MutableInt sequence, byte[] buf, int limit) {
  this.sequence = sequence;
  this.pos = 0;
  this.buf = buf;
  this.limit = limit;
- this.mark = -1;
  }
 
  public int readableBytes() {
@@ -36,25 +34,16 @@ public byte[] buf() {
  return buf;
  }
 
- public StandardReadableByteBuf buf(byte[] buf, int limit) {
+ public void buf(byte[] buf, int limit, int pos) {
  this.buf = buf;
  this.limit = limit;
- return this;
+ this.pos = pos;
  }
 
  public void pos(int pos) {
  this.pos = pos;
  }
 
- public void mark() {
- mark = pos;
- }
-
- public void reset() {
- if (mark == -1) throw new IllegalStateException("mark was not set");
- pos = mark;
- }
-
  public void skip() {
  pos++;
  }
@@ -202,10 +191,9 @@ public long readLongBE() {
  + (buf[pos++] & 0xffL));
  }
 
- public StandardReadableByteBuf readBytes(byte[] dst) {
+ public void readBytes(byte[] dst) {
  System.arraycopy(buf, pos, dst, 0, dst.length);
  pos += dst.length;
- return this;
  }
 
  public byte[] readBytesNullEnd() {

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

@@ -78,51 +78,50 @@ public void write(byte[] b, int off, int len) throws IOException {
  out.write(b, off, len);
 
  } else {
- // *******************************************************************************
- // compressing packet
- // *******************************************************************************
- int sent = 0;
- try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- try (DeflaterOutputStream deflater = new DeflaterOutputStream(baos)) {
-
- /**
- * For multi packet, len will be 0x00ffffff + 4 bytes for header.
- * but compression can only compress up to 0x00ffffff bytes (header initial length size cannot be > 3 bytes)
- * so, for this specific case, a buffer will be
- */
-
- if (longPacketBuffer != null) {
- deflater.write(longPacketBuffer, 0, longPacketBuffer.length);
- sent = longPacketBuffer.length;
- longPacketBuffer = null;
- }
- if ( len + sent > 0x00ffffff) {
- int remaining = len + sent - 0x00ffffff;
- longPacketBuffer = new byte[remaining];
- System.arraycopy(b, off + 0x00ffffff - sent, longPacketBuffer, 0, remaining);
- }
-
- int bufLenSent = Math.min(0x00ffffff - sent, len);
- deflater.write(b, off, bufLenSent);
- sent += bufLenSent;
- deflater.finish();
+ // *******************************************************************************
+ // compressing packet
+ // *******************************************************************************
+ int sent = 0;
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ try (DeflaterOutputStream deflater = new DeflaterOutputStream(baos)) {
+
+ /**
+ * For multi packet, len will be 0x00ffffff + 4 bytes for header. but compression can only
+ * compress up to 0x00ffffff bytes (header initial length size cannot be > 3 bytes) so,
+ * for this specific case, a buffer will save remaining data
+ */
+ if (longPacketBuffer != null) {
+ deflater.write(longPacketBuffer, 0, longPacketBuffer.length);
+ sent = longPacketBuffer.length;
+ longPacketBuffer = null;
+ }
+ if (len + sent > 0x00ffffff) {
+ int remaining = len + sent - 0x00ffffff;
+ longPacketBuffer = new byte[remaining];
+ System.arraycopy(b, off + 0x00ffffff - sent, longPacketBuffer, 0, remaining);
  }
 
- byte[] compressedBytes = baos.toByteArray();
+ int bufLenSent = Math.min(0x00ffffff - sent, len);
+ deflater.write(b, off, bufLenSent);
+ sent += bufLenSent;
+ deflater.finish();
+ }
 
-  int compressLen = compressedBytes.length;
+ byte[] compressedBytes = baos.toByteArray();
 
- header[0] = (byte) compressLen;
- header[1] = (byte) (compressLen >>> 8);
- header[2] = (byte) (compressLen >>> 16);
- header[3] = sequence.incrementAndGet();
- header[4] = (byte) sent;
- header[5] = (byte) (sent >>> 8);
- header[6] = (byte) (sent >>> 16);
+ int compressLen = compressedBytes.length;
 
- out.write(header, 0, 7);
- out.write(compressedBytes, 0, compressLen);
- }
+ header[0] = (byte) compressLen;
+ header[1] = (byte) (compressLen >>> 8);
+ header[2] = (byte) (compressLen >>> 16);
+ header[3] = sequence.incrementAndGet();
+ header[4] = (byte) sent;
+ header[5] = (byte) (sent >>> 8);
+ header[6] = (byte) (sent >>> 16);
+
+ out.write(header, 0, 7);
+ out.write(compressedBytes, 0, compressLen);
+ }
  }
  }
 

src/main/java/org/mariadb/jdbc/codec/BinaryRowDecoder.java

@@ -62,11 +62,13 @@ public double decodeDouble() throws SQLException {
  @Override
  public void setRow(byte[] buf) {
  if (buf != null) {
- this.readBuf.buf(buf, buf.length).pos(1); // skip 0x00 header
  nullBitmap = new byte[(columnCount + 9) / 8];
- this.readBuf.readBytes(nullBitmap).mark();
+ for (int i = 0; i < nullBitmap.length; i++) {
+ nullBitmap[i] = buf[i + 1];
+ }
+ this.readBuf.buf(buf, buf.length, 1 + nullBitmap.length);
  } else {
- this.readBuf.buf(null, 0);
+ this.readBuf.buf(null, 0, 0);
  }
  index = -1;
  }
@@ -86,7 +88,8 @@ public void setPosition(int newIndex) {
 
  if (index >= newIndex) {
  index = 0;
- readBuf.reset();
+ // skip header + null-bitmap
+ readBuf.pos(1 + ((columnCount + 9) / 8));
  } else {
  index++;
  }
@@ -116,8 +119,13 @@ public void setPosition(int newIndex) {
  break;
 
  default:
- int type = this.readBuf.readUnsignedByte();
- switch (type) {
+ int len = this.readBuf.readUnsignedByte();
+ if (len < 251) {
+ // length is encoded on 1 bytes (is then less than 251)
+ this.readBuf.skip(len);
+ break;
+ }
+ switch (len) {
  case 252:
  this.readBuf.skip(this.readBuf.readUnsignedShort());
  break;
@@ -129,18 +137,14 @@ public void setPosition(int newIndex) {
  case 254:
  this.readBuf.skip((int) this.readBuf.readLong());
  break;
-
- default:
- this.readBuf.skip(type);
- break;
  }
  break;
  }
  }
  index++;
  }
 
- if ((nullBitmap[(index + 2) / 8] & (1 << ((index + 2) % 8))) > 0) {
+ if (wasNull()) {
  length = NULL_LENGTH;
  return;
  }
@@ -170,6 +174,11 @@ public void setPosition(int newIndex) {
  default:
  // field with variable length
  int len = this.readBuf.readUnsignedByte();
+ if (len < 251) {
+ // length is encoded on 1 bytes (is then less than 251)
+ length = len;
+ return;
+ }
  switch (len) {
  case 252:
  // length is encoded on 3 bytes (0xfc header + 2 bytes indicating length)
@@ -185,10 +194,6 @@ public void setPosition(int newIndex) {
  // length is encoded on 9 bytes (0xfe header + 8 bytes indicating length)
  length = (int) this.readBuf.readLong();
  return;
-
- default:
- // length is encoded on 1 bytes (is then less than 251)
- length = len;
  }
  }
  }

src/main/java/org/mariadb/jdbc/codec/RowDecoder.java

@@ -31,7 +31,7 @@ public RowDecoder(int columnCount, Column[] columns, Configuration conf) {
  }
 
  public void setRow(byte[] buf) {
- this.readBuf.buf(buf, buf == null ? 0 : buf.length).pos(0);
+ this.readBuf.buf(buf, buf == null ? 0 : buf.length, 0);
  index = -1;
  }
 

src/main/java/org/mariadb/jdbc/codec/TextRowDecoder.java

@@ -77,28 +77,35 @@ public void setPosition(int newIndex) {
  }
 
  while (index < newIndex) {
- short type = this.readBuf.readUnsignedByte();
- switch (type) {
- case 252:
- readBuf.skip(readBuf.readUnsignedShort());
- break;
- case 253:
- readBuf.skip(readBuf.readUnsignedMedium());
- break;
- case 254:
- readBuf.skip((int) (4 + readBuf.readUnsignedInt()));
- break;
- case 251:
- break;
- default:
- readBuf.skip(type);
- break;
+ short len = this.readBuf.readUnsignedByte();
+ if (len < 251) {
+ // length is encoded on 1 bytes (is then less than 251)
+ readBuf.skip(len);
+ } else {
+ switch (len) {
+ case 252:
+ readBuf.skip(readBuf.readUnsignedShort());
+ break;
+ case 253:
+ readBuf.skip(readBuf.readUnsignedMedium());
+ break;
+ case 254:
+ readBuf.skip((int) (4 + readBuf.readUnsignedInt()));
+ break;
+ case 251:
+ break;
+ }
  }
  index++;
  }
 
- short type = this.readBuf.readUnsignedByte();
- switch (type) {
+ short len = this.readBuf.readUnsignedByte();
+ if (len < 251) {
+ // length is encoded on 1 bytes (is then less than 251)
+ length = len;
+ return;
+ }
+ switch (len) {
  case 251:
  length = NULL_LENGTH;
  break;
@@ -112,9 +119,6 @@ public void setPosition(int newIndex) {
  length = (int) readBuf.readUnsignedInt();
  readBuf.skip(4);
  break;
- default:
- length = type;
- break;
  }
  }
 }

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

@@ -10,7 +10,6 @@
 import org.junit.jupiter.api.*;
 import org.mariadb.jdbc.Connection;
 import org.mariadb.jdbc.Statement;
-import org.mariadb.jdbc.util.constants.Capabilities;
 
 public class CompressTest extends Common {
  private static Connection shareCompressCon;
@@ -43,7 +42,8 @@ public void bigSend() throws SQLException {
  }
 
  public void bigSend(Connection con, int maxLen) throws SQLException {
- char[] arr2 = new char[Math.min(maxLen, Math.min(16 * 1024 * 1024, (getMaxAllowedPacket() / 2) - 1000))];
+ char[] arr2 =
+ new char[Math.min(maxLen, Math.min(16 * 1024 * 1024, (getMaxAllowedPacket() / 2) - 1000))];
  for (int pos = 0; pos < arr2.length; pos++) {
  arr2[pos] = (char) ('A' + (pos % 60));
  }