Internal changes to improve protocol handling between the database and the client

Author: sharadraju

doc/src/release_notes.rst

@@ -59,6 +59,9 @@ Thin Mode Changes
 #)  Improved overall pool connection creation time by caching information
     during the first connection establishment.
 
+#)  Internal changes to improve protocol handling between the database and
+    the client.
+
 Thick Mode Changes
 ++++++++++++++++++
 

lib/thin/protocol/capabilities.js

@@ -89,7 +89,9 @@ class Capabilities {
     this.compileCaps[constants.TNS_CCAP_DBF_VERSION] =
       constants.TNS_CCAP_DBF_VERSION_MAX;
     this.compileCaps[constants.TNS_CCAP_LOB] =
-      constants.TNS_CCAP_LOB_UB8_SIZE | constants.TNS_CCAP_LOB_ENCS | constants.TNS_CCAP_LOB_PREFETCH;
+      constants.TNS_CCAP_LOB_UB8_SIZE | constants.TNS_CCAP_LOB_ENCS
+      | constants.TNS_CCAP_LOB_PREFETCH | constants.TNS_CCAP_LOB_TEMP_SIZE
+      | constants.TNS_CCAP_LOB_12C | constants.TNS_CCAP_LOB_PREFETCH_DATA;
     this.compileCaps[constants.TNS_CCAP_UB2_DTY] = 1;
     this.compileCaps[constants.TNS_CCAP_LOB2] =
       constants.TNS_CCAP_LOB2_QUASI | constants.TNS_CCAP_LOB2_2GB_PREFETCH;

lib/thin/protocol/constants.js

@@ -650,7 +650,10 @@ module.exports = {
   TNS_CCAP_KEEP_OUT_ORDER: 0x80,
   TNS_CCAP_LOB_UB8_SIZE: 0x01,
   TNS_CCAP_LOB_ENCS: 0x02,
+  TNS_CCAP_LOB_PREFETCH_DATA: 0x04,
+  TNS_CCAP_LOB_TEMP_SIZE: 0x08,
   TNS_CCAP_LOB_PREFETCH: 0x40,
+  TNS_CCAP_LOB_12C: 0x80,
   TNS_CCAP_DRCP: 0x10,
   TNS_CCAP_ZLNP: 0x04,
   TNS_CCAP_INBAND_NOTIFICATION: 0x04,

lib/thin/protocol/messages/base.js

@@ -69,11 +69,11 @@ class Message {
     buf.skipUB2();                              // array elem error
     buf.skipUB2();                              // array elem error
     this.errorInfo.cursorId = buf.readUB2();    // cursor id
-    this.errorInfo.pos = buf.readUB2();         // error position
+    const errorPos = buf.readSB2();             // error position
     buf.skipUB1();                              // sql type (19c and earlier)
     buf.skipUB1();                              // fatal ?
-    buf.skipUB2();                              // flags
-    buf.skipUB2();                              // user cursor options
+    buf.skipUB1();                              // flags
+    buf.skipUB1();                              // user cursor options
     buf.skipUB1();                              // UPI parameter
     buf.skipUB1();                              // warning flag
     this.errorInfo.rowID = buf.readRowID();     // rowid
@@ -138,8 +138,13 @@ class Message {
       buf.skipUB4();                           // sql type
       buf.skipUB4();                           // server checksum
     }
+
+    // error message
     if (this.errorInfo.num !== 0) {
       this.errorOccurred = true;
+      if (errorPos >= 0) {
+        this.errorInfo.pos = errorPos;
+      }
       this.errorInfo.message = buf.readStr(constants.CSFRM_IMPLICIT);
       /*
        * Remove ending newline from ORA error message
@@ -154,7 +159,7 @@ class Message {
 
   processWarningInfo(buf) {
     this.errorInfo.num = buf.readUB2();         // error number
-    const numBytes = buf.readUB2();               // length of error message
+    const numBytes = buf.readUB2();             // length of error message
     buf.skipUB2();                              // flags
     if (this.errorInfo.num != 0 && numBytes > 0) {
       this.errorInfo.message = buf.readStr(constants.CSFRM_IMPLICIT);

lib/thin/protocol/messages/dataType.js

@@ -81,7 +81,7 @@ const dataTypes = [
   [constants.TNS_DATA_TYPE_LONG_RAW, constants.TNS_DATA_TYPE_LONG_RAW, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_UB2, constants.TNS_DATA_TYPE_UB2, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_UB4, constants.TNS_DATA_TYPE_UB4, constants.TNS_TYPE_REP_UNIVERSAL],
-  [constants.TNS_DATA_TYPE_SB1, constants.TNS_DATA_TYPE_SB1, constants.TNS_TYPE_REP_UNIVERSAL],
+  [constants.TNS_DATA_TYPE_SB1, constants.TNS_DATA_TYPE_SB1, constants.TNS_TYPE_REP_ORACLE],
   [constants.TNS_DATA_TYPE_SB2, constants.TNS_DATA_TYPE_SB2, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_SB4, constants.TNS_DATA_TYPE_SB4, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_SWORD, constants.TNS_DATA_TYPE_SWORD, constants.TNS_TYPE_REP_UNIVERSAL],

lib/thin/protocol/messages/lobOp.js

@@ -169,7 +169,7 @@ class LobOpMessage extends Message {
   processReturnParameter(buf) {
     let lobArray;
     let locator;
-    let temp16;
+    let temp8;
     let numBytes;
     if (this.sourceLobImpl !== null) {
       numBytes = this.sourceLobImpl._locator.length;
@@ -184,15 +184,14 @@ class LobOpMessage extends Message {
       locator.copy(this.destLobImpl._locator);
     }
     if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP) {
-      buf.skipUB2();
-    }
-    if (this.sendAmount) {
+      buf.skipUB2();        // skip character set
+      buf.skipBytes(3);     // skip trailing flags, amount
+    } else if (this.sendAmount) {
       this.amount = buf.readSB8();
     }
-    if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP
-      || this.operation === constants.TNS_LOB_OP_IS_OPEN) {
-      temp16 = buf.readUB2();
-      this.boolFlag = temp16 > 0;
+    if (this.operation === constants.TNS_LOB_OP_IS_OPEN) {
+      temp8 = buf.readUB1();
+      this.boolFlag = temp8 > 0;
     }
   }
 

lib/thin/protocol/messages/withData.js

@@ -177,16 +177,7 @@ class MessageWithData extends Message {
     const dataType = buf.readUInt8();
     buf.skipUB1(); // flags
     const precision = buf.readInt8();
-    let scale;
-    if (dataType === constants.TNS_DATA_TYPE_NUMBER ||
-        dataType === constants.TNS_DATA_TYPE_INTERVAL_DS ||
-        dataType === constants.TNS_DATA_TYPE_TIMESTAMP ||
-        dataType === constants.TNS_DATA_TYPE_TIMESTAMP_LTZ ||
-        dataType === constants.TNS_DATA_TYPE_TIMESTAMP_TZ) {
-      scale = buf.readSB2();
-    } else {
-      scale = buf.readInt8();
-    }
+    const scale = buf.readInt8();
     const maxSize = buf.readUB4();
     buf.skipUB4();                              // max number of array elements
     buf.skipUB8();                              // cont flags