[misc] small performance enhancement using fastpath

mariadb-corporation · Sep 6, 2022 · 9a972b1 · 9a972b1
1 parent f07e232
commit 9a972b1
Show file tree

Hide file tree

Showing 15 changed files with 111 additions and 117 deletions.
diff --git a/src/benchmark/java/org/mariadb/jdbc/Common.java b/src/benchmark/java/org/mariadb/jdbc/Common.java
@@ -42,21 +42,16 @@ public static class MyState {
 
     @Param({"mysql", "mariadb"})
     String driver;
-
-    int fetchSize;
-
     @Setup(Level.Trial)
     public void createConnections() throws Exception {
 
       String className;
       switch (driver) {
         case "mysql":
           className = "com.mysql.cj.jdbc.Driver";
-          fetchSize = Integer.MIN_VALUE;
           break;
         case "mariadb":
           className = "org.mariadb.jdbc.Driver";
-          fetchSize = 1;
           break;
         default:
           throw new RuntimeException("wrong param");

diff --git a/src/benchmark/java/org/mariadb/jdbc/Select_1000_Rows.java b/src/benchmark/java/org/mariadb/jdbc/Select_1000_Rows.java
@@ -15,26 +15,24 @@ public class Select_1000_Rows extends Common {
       "select seq, 'abcdefghijabcdefghijabcdefghijaa' from seq_1_to_1000";
 
   @Benchmark
-  public String[] text(MyState state) throws Throwable {
-    return run(state.connectionText, state.fetchSize);
+  public int text(MyState state) throws Throwable {
+    return run(state.connectionText);
   }
 
   @Benchmark
-  public String[] binary(MyState state) throws Throwable {
-    return run(state.connectionBinary, state.fetchSize);
+  public int binary(MyState state) throws Throwable {
+    return run(state.connectionBinary);
   }
 
-  private String[] run(Connection con, int fetchSize) throws Throwable {
+  private int run(Connection con) throws Throwable {
     try (PreparedStatement st = con.prepareStatement(sql)) {
-      st.setFetchSize(fetchSize);
       ResultSet rs = st.executeQuery();
-      String[] res = new String[1000];
       int i = 0;
       while (rs.next()) {
-        rs.getInt(1);
-        res[i++] = rs.getString(2);
+        i = rs.getInt(1);
+        rs.getString(2);
       }
-      return res;
+      return i;
     }
   }
 }
diff --git a/src/main/java/org/mariadb/jdbc/client/ReadableByteBuf.java b/src/main/java/org/mariadb/jdbc/client/ReadableByteBuf.java
@@ -56,6 +56,9 @@ public interface ReadableByteBuf {
    */
   void skip(int length);
 
+  /** Skip length encoded value */
+  void skipLengthEncoded();
+
   /**
    * Read Blob at current position
    *
@@ -111,6 +114,14 @@ public interface ReadableByteBuf {
    */
   int skipIdentifier();
 
+  /**
+   * Fast long from text parsing
+   *
+   * @param length data length
+   * @return long value
+   */
+  long atoi(int length);
+
   /**
    * Read encoded length value see
    * https://mariadb.com/kb/en/protocol-data-types/#length-encoded-integers

diff --git a/src/main/java/org/mariadb/jdbc/client/impl/StandardReadableByteBuf.java b/src/main/java/org/mariadb/jdbc/client/impl/StandardReadableByteBuf.java
@@ -12,7 +12,7 @@
 public final class StandardReadableByteBuf implements ReadableByteBuf {
 
   private int limit;
-  private byte[] buf;
+  public byte[] buf;
   private int pos;
 
   /**
@@ -57,11 +57,48 @@ public void skip(int length) {
     pos += length;
   }
 
+  public void skipLengthEncoded() {
+    int len = buf[pos++] & 0xff;
+    if (len < 251) {
+      pos += len;
+    } else {
+      switch (len) {
+        case 252:
+          pos += readUnsignedShort();
+          break;
+        case 253:
+          pos += readUnsignedMedium();
+          break;
+        case 254:
+          pos += 4 + readUnsignedInt();
+          break;
+      }
+    }
+  }
+
   public MariaDbBlob readBlob(int length) {
     pos += length;
     return MariaDbBlob.safeMariaDbBlob(buf, pos - length, length);
   }
 
+  public long atoi(int length) {
+    boolean negate = false;
+    int idx = 0;
+    long result = 0;
+
+    if (length > 0 && buf[pos] == 45) { // minus sign
+      negate = true;
+      pos++;
+      idx++;
+    }
+
+    while (idx++ < length) {
+      result = result * 10 + buf[pos++] - 48;
+    }
+
+    return (negate) ? -1 * result : result;
+  }
+
   public byte getByte() {
     return buf[pos];
   }

diff --git a/src/main/java/org/mariadb/jdbc/client/result/Result.java b/src/main/java/org/mariadb/jdbc/client/result/Result.java
@@ -377,7 +377,7 @@ public boolean wasNull() {
 
   @Override
   public String getString(int columnIndex) throws SQLException {
-    return row.getValue(columnIndex, StringCodec.INSTANCE, null);
+    return row.getStringValue(columnIndex);
   }
 
   @Override

diff --git a/src/main/java/org/mariadb/jdbc/codec/BinaryRowDecoder.java b/src/main/java/org/mariadb/jdbc/codec/BinaryRowDecoder.java
@@ -24,6 +24,11 @@ public <T> T decode(Codec<T> codec, Calendar cal) throws SQLException {
     return codec.decodeBinary(readBuf, length, columns[index], cal);
   }
 
+  @Override
+  public String decodeString() throws SQLException {
+    return StringCodec.INSTANCE.decodeBinary(readBuf, length, columns[index], null);
+  }
+
   @Override
   public byte decodeByte() throws SQLException {
     return ByteCodec.INSTANCE.decodeBinaryByte(readBuf, length, columns[index]);
@@ -119,25 +124,7 @@ public void setPosition(int newIndex) {
             break;
 
           default:
-            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;
-
-              case 253:
-                this.readBuf.skip(this.readBuf.readUnsignedMedium());
-                break;
-
-              case 254:
-                this.readBuf.skip((int) this.readBuf.readLong());
-                break;
-            }
+            this.readBuf.skipLengthEncoded();
             break;
         }
       }

diff --git a/src/main/java/org/mariadb/jdbc/codec/RowDecoder.java b/src/main/java/org/mariadb/jdbc/codec/RowDecoder.java
@@ -9,14 +9,13 @@
 import java.util.*;
 import org.mariadb.jdbc.Configuration;
 import org.mariadb.jdbc.client.Column;
-import org.mariadb.jdbc.client.ReadableByteBuf;
 import org.mariadb.jdbc.client.impl.StandardReadableByteBuf;
 import org.mariadb.jdbc.plugin.Codec;
 
 public abstract class RowDecoder {
   protected static final int NULL_LENGTH = -1;
   private final Configuration conf;
-  protected final ReadableByteBuf readBuf = new StandardReadableByteBuf(null, 0);
+  protected final StandardReadableByteBuf readBuf = new StandardReadableByteBuf(null, 0);
   protected final Column[] columns;
 
   protected int length;
@@ -47,6 +46,8 @@ public void setRow(byte[] buf) {
 
   public abstract int decodeInt() throws SQLException;
 
+  public abstract String decodeString() throws SQLException;
+
   public abstract long decodeLong() throws SQLException;
 
   public abstract float decodeFloat() throws SQLException;
@@ -90,7 +91,7 @@ private void checkIndexAndSetPosition(int index) throws SQLException {
           String.format(
               "Wrong index position. Is %s but must be in 1-%s range", index, columnCount));
     }
-    if (readBuf.buf() == null) {
+    if (readBuf.buf == null) {
       throw new SQLDataException("wrong row position", "22023");
     }
 
@@ -145,6 +146,14 @@ public int getIntValue(int index) throws SQLException {
     return decodeInt();
   }
 
+  public String getStringValue(int index) throws SQLException {
+    checkIndexAndSetPosition(index);
+    if (length == NULL_LENGTH) {
+      return null;
+    }
+    return decodeString();
+  }
+
   public long getLongValue(int index) throws SQLException {
     checkIndexAndSetPosition(index);
     if (length == NULL_LENGTH) {

diff --git a/src/main/java/org/mariadb/jdbc/codec/TextRowDecoder.java b/src/main/java/org/mariadb/jdbc/codec/TextRowDecoder.java
@@ -22,6 +22,11 @@ public <T> T decode(Codec<T> codec, Calendar cal) throws SQLException {
     return codec.decodeText(readBuf, length, columns[index], cal);
   }
 
+  @Override
+  public String decodeString() throws SQLException {
+    return StringCodec.INSTANCE.decodeText(readBuf, length, columns[index], null);
+  }
+
   @Override
   public byte decodeByte() throws SQLException {
     return ByteCodec.INSTANCE.decodeTextByte(readBuf, length, columns[index]);
@@ -77,25 +82,7 @@ public void setPosition(int newIndex) {
     }
 
     while (index < newIndex) {
-      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;
-        }
-      }
+      this.readBuf.skipLengthEncoded();
       index++;
     }
 

diff --git a/src/main/java/org/mariadb/jdbc/plugin/codec/ByteCodec.java b/src/main/java/org/mariadb/jdbc/plugin/codec/ByteCodec.java
@@ -106,7 +106,7 @@ public byte decodeTextByte(ReadableByteBuf buf, int length, Column column)
       case INTEGER:
       case BIGINT:
       case YEAR:
-        result = LongCodec.parseNotEmpty(buf, length);
+        result = buf.atoi(length);
         break;
 
       case BIT:

diff --git a/src/main/java/org/mariadb/jdbc/plugin/codec/DateCodec.java b/src/main/java/org/mariadb/jdbc/plugin/codec/DateCodec.java
@@ -58,7 +58,7 @@ public Date decodeText(ReadableByteBuf buf, int length, Column column, Calendar
 
     switch (column.getType()) {
       case YEAR:
-        short y = (short) LongCodec.parseNotEmpty(buf, length);
+        short y = (short) buf.atoi(length);
         if (column.getLength() == 2) {
           // YEAR(2) - deprecated
           if (y <= 69) {

diff --git a/src/main/java/org/mariadb/jdbc/plugin/codec/IntCodec.java b/src/main/java/org/mariadb/jdbc/plugin/codec/IntCodec.java
@@ -80,16 +80,16 @@ public int decodeTextInt(final ReadableByteBuf buf, final int length, final Colu
       throws SQLDataException {
     long result;
     switch (column.getType()) {
+      case INTEGER:
+      case BIGINT:
+        result = buf.atoi(length);
+        break;
+
       case TINYINT:
       case SMALLINT:
       case MEDIUMINT:
       case YEAR:
-        return (int) LongCodec.parseNotEmpty(buf, length);
-
-      case INTEGER:
-      case BIGINT:
-        result = LongCodec.parseNotEmpty(buf, length);
-        break;
+        return (int) buf.atoi(length);
 
       case BIT:
         result = 0;

diff --git a/src/main/java/org/mariadb/jdbc/plugin/codec/LocalDateCodec.java b/src/main/java/org/mariadb/jdbc/plugin/codec/LocalDateCodec.java
@@ -86,7 +86,7 @@ public LocalDate decodeText(ReadableByteBuf buf, int length, Column column, Cale
     int[] parts;
     switch (column.getType()) {
       case YEAR:
-        short y = (short) LongCodec.parseNotEmpty(buf, length);
+        short y = (short) buf.atoi(length);
 
         if (length == 2 && column.getLength() == 2) {
           // YEAR(2) - deprecated

diff --git a/src/main/java/org/mariadb/jdbc/plugin/codec/LongCodec.java b/src/main/java/org/mariadb/jdbc/plugin/codec/LongCodec.java
@@ -46,33 +46,6 @@ public class LongCodec implements Codec<Long> {
           DataType.MEDIUMBLOB,
           DataType.LONGBLOB);
 
-  /**
-   * Fast long from text parsing
-   *
-   * @param buf packet buffer
-   * @param length data length
-   * @return long value
-   */
-  public static long parseNotEmpty(ReadableByteBuf buf, int length) {
-
-    boolean negate = false;
-    int idx = 0;
-    long result = 0;
-
-    if (length > 0 && buf.getByte() == 45) { // minus sign
-      negate = true;
-      buf.skip();
-      idx++;
-    }
-
-    while (idx++ < length) {
-      result = result * 10 + buf.readByte() - 48;
-    }
-
-    if (negate) result = -1 * result;
-    return result;
-  }
-
   public String className() {
     return Long.class.getName();
   }
@@ -112,11 +85,11 @@ public long decodeTextLong(ReadableByteBuf buf, int length, Column column)
       case MEDIUMINT:
       case INTEGER:
       case YEAR:
-        return parseNotEmpty(buf, length);
+        return buf.atoi(length);
 
       case BIGINT:
         if (column.isSigned()) {
-          return parseNotEmpty(buf, length);
+          return buf.atoi(length);
         } else {
           BigInteger val = new BigInteger(buf.readAscii(length));
           try {

diff --git a/src/main/java/org/mariadb/jdbc/plugin/codec/ShortCodec.java b/src/main/java/org/mariadb/jdbc/plugin/codec/ShortCodec.java
@@ -84,7 +84,7 @@ public short decodeTextShort(ReadableByteBuf buf, int length, Column column)
       case INTEGER:
       case BIGINT:
       case YEAR:
-        result = LongCodec.parseNotEmpty(buf, length);
+        result = buf.atoi(length);
         break;
 
       case BIT: