[misc] parsing performance improvement - part 2

Author: rusher

lib/io/packet-output-stream.js

@@ -19,7 +19,7 @@ const MEDIUM_BUFFER_SIZE = 16384; //16k
 const LARGE_BUFFER_SIZE = 131072; //128k
 const BIG_BUFFER_SIZE = 1048576; //1M
 const MAX_BUFFER_SIZE = 16777219; //16M + 4
-const CHARS_GLOBAL_REGEXP = /[\0\"\'\\\b\n\r\t\u001A]/g; // eslint-disable-line no-control-regex
+const CHARS_GLOBAL_REGEXP = /[\000\032"'\\\n\r\t]/g;
 
 /**
  * MySQL packet builder.
@@ -496,8 +496,9 @@ class PacketOutputStream {
    * - \\
    * - \'
    * - \"
+   * - \032
    * regex split part of string writing part, and escaping special char.
-   * Those chars are <= 7f meaning that this will work even with multi-byte encoding
+   * Those chars are <= 7f meaning that this will work even with multibyte encoding
    *
    * @param str string to escape.
    */
@@ -623,11 +624,11 @@ class PacketOutputStream {
    *
    * @param length additional length to query size
    * @param info current connection information
-   * @throws Error if query has not to be send.
+   * @throws Error if query has not to be sent.
    */
   checkMaxAllowedLength(length, info) {
     if (this.cmdLength + length >= this.maxAllowedPacket) {
-      // launch exception only if no packet has been send.
+      // launch exception only if no packet has been sent.
       return Errors.createFatalError(
         `query size (${this.cmdLength + length}) is >= to max_allowed_packet (${this.maxAllowedPacket})`,
         Errors.ER_MAX_ALLOWED_PACKET,

lib/io/packet.js

@@ -248,6 +248,7 @@ class Packet {
 
   readSignedLengthBigInt() {
     const type = this.buf[this.pos++];
+    if (type < 0xfb) return BigInt(type);
     switch (type) {
       // null test is not used for now, since only used for reading insertId
       // case 0xfb:
@@ -258,8 +259,6 @@ class Packet {
         return BigInt(this.readUInt24());
       case 0xfe:
         return this.readBigInt64();
-      default:
-        return BigInt(type);
     }
   }
 
@@ -276,17 +275,18 @@ class Packet {
 
   readBigIntLengthEncoded() {
     const len = this.buf[this.pos++];
-    if (len === 0xfb) return null;
-    return this.readBigIntFromLen(len);
-  }
 
-  readBigIntFromLen(len) {
-    // fast-path: if length encoded is < to 16, value is in safe integer range
-    // atoi
+    // fast-path: if length encoded is < to 16, value is in safe integer range, using atoi
     if (len < 16) {
       return BigInt(this._atoi(len));
     }
 
+    if (len === 0xfb) return null;
+
+    return this.readBigIntFromLen(len);
+  }
+
+  readBigIntFromLen(len) {
     // atoll
     let result = 0n;
     let negate = false;
@@ -493,18 +493,8 @@ class Packet {
 
   readIntLengthEncoded() {
     const len = this.buf[this.pos++];
-    if (len < 0xfb) return this._atoi(len);
-    switch (len) {
-      case 0xfb:
-        return null;
-      case 0xfc:
-        return this._atoi(this.readUInt16());
-      case 0xfd:
-        return this._atoi(this.readUInt24());
-      case 0xfe:
-        // limitation to BigInt signed value
-        return this._atoi(Number(this.readBigInt64()));
-    }
+    if (len === 0xfb) return null;
+    return this._atoi(len);
   }
 
   _atoi(len) {
@@ -537,7 +527,7 @@ class Packet {
       case 251:
         return;
       case 252:
-        this.pos += 2 + (0xffff & ((this.buf[this.pos]) + ((this.buf[this.pos + 1]) << 8)));
+        this.pos += 2 + (0xffff & (this.buf[this.pos] + (this.buf[this.pos + 1] << 8)));
         return;
       case 253:
         this.pos +=

lib/misc/utils.js

@@ -243,17 +243,17 @@ const LITTERAL_ESCAPE = {
   '\\': '\\\\'
 };
 
-const escapeString = (val) => {
-  const pattern = /[\u0000'"\b\n\r\t\u001A\\]/g;
+const CHARS_GLOBAL_REGEXP = /[\000\032"'\\\b\n\r\t]/g;
 
+const escapeString = (val) => {
   let offset = 0;
   let escaped = '';
   let match;
 
-  while ((match = pattern.exec(val))) {
+  while ((match = CHARS_GLOBAL_REGEXP.exec(val))) {
     escaped += val.substring(offset, match.index);
     escaped += LITTERAL_ESCAPE[match[0]];
-    offset = pattern.lastIndex;
+    offset = CHARS_GLOBAL_REGEXP.lastIndex;
   }
 
   if (offset === 0) {

test/integration/datatype/test-buffer.js

@@ -22,10 +22,10 @@ describe('buffer', () => {
   const hex = buf.toString('hex').toUpperCase();
 
   it('buffer escape', async function () {
-    const buf = Buffer.from(base.utf8Collation() ? "let's rocks\n😊 🤘" : "let's rocks\nmore simple");
+    const buf = Buffer.from(base.utf8Collation() ? "let's r\0cks\n😊 🤘" : "let's r\0cks\nmore simple");
     assert.equal(
       shareConn.escape(buf),
-      base.utf8Collation() ? "_binary'let\\'s rocks\\n😊 🤘'" : "_binary'let\\'s rocks\\nmore simple'"
+      base.utf8Collation() ? "_binary'let\\'s r\\0cks\\n😊 🤘'" : "_binary'let\\'s r\\0cks\\nmore simple'"
     );
     await shareConn.query('DROP TABLE IF EXISTS BufEscape');
     await shareConn.query('CREATE TABLE BufEscape(b blob)');
@@ -38,10 +38,10 @@ describe('buffer', () => {
   });
 
   it('buffer escape binary', async function () {
-    const buf = Buffer.from(base.utf8Collation() ? "let's rocks\n😊 🤘" : "let's rocks\nmore simple");
+    const buf = Buffer.from(base.utf8Collation() ? "let's r\0cks\n😊 🤘" : "let's r\0cks\nmore simple");
     assert.equal(
       shareConn.escape(buf),
-      base.utf8Collation() ? "_binary'let\\'s rocks\\n😊 🤘'" : "_binary'let\\'s rocks\\nmore simple'"
+      base.utf8Collation() ? "_binary'let\\'s r\\0cks\\n😊 🤘'" : "_binary'let\\'s r\\0cks\\nmore simple'"
     );
     await shareConn.query('DROP TABLE IF EXISTS BufEscape');
     await shareConn.query('CREATE TABLE BufEscape(b blob)');