@tdengine/websocket 3.1.0 → 3.1.2

package/lib/src/common/taosResult.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bitmapLen = exports.setBitmapNull = exports.getCharOffset = exports.readNchar = exports.readVarchar = exports.readBinary = exports.readSolidData = exports.readSolidDataToArray = exports._isVarType = exports.parseBlock = exports.TaosResult = void 0;
+exports.bitmapLen = exports.setBitmapNull = exports.getCharOffset = exports.getString = exports.readNchar = exports.readVarchar = exports.readBinary = exports.readSolidData = exports.readSolidDataToArray = exports._isVarType = exports.parseBlock = exports.TaosResult = void 0;
 const constant_1 = require("./constant");
 const wsError_1 = require("./wsError");
 const ut8Helper_1 = require("./ut8Helper");
@@ -12,8 +12,8 @@ class TaosResult {
     constructor(queryResponse) {
         this._totalTime = 0;
         if (queryResponse == null) {
-            this._meta = null;
-            this._data = null;
+            this._meta = [];
+            this._data = [];
             this._timing = BigInt(0);
             return;
         }
@@ -43,6 +43,9 @@ class TaosResult {
         this._precision = queryResponse.precision;
         this._totalTime = queryResponse.totalTime;
     }
+    setPrecision(precision) {
+        this._precision = precision;
+    }
     setRowsAndTime(rows, timing) {
         if (this._affectRows) {
             this._affectRows += rows;
@@ -54,9 +57,23 @@ class TaosResult {
             this.setTiming(timing);
         }
     }
+    getTopic() {
+        if (this._topic) {
+            return this._topic;
+        }
+        return "";
+    }
+    setTopic(topic = "") {
+        this._topic = topic;
+    }
     getMeta() {
         return this.getTDengineMeta();
     }
+    setMeta(metaData) {
+        if (this._meta) {
+            this._meta.push(metaData);
+        }
+    }
     getData() {
         return this._data;
     }
@@ -105,10 +122,15 @@ class TaosResult {
     }
 }
 exports.TaosResult = TaosResult;
-function parseBlock(rows, blocks, taosResult) {
+function parseBlock(blocks, taosResult) {
     let metaList = taosResult.getTaosMeta();
     let dataList = taosResult.getData();
-    if (metaList && dataList) {
+    let textDecoder = new TextDecoder();
+    if (metaList && dataList && blocks && blocks.data) {
+        let rows = blocks.data.getUint32(8, true);
+        if (rows == 0) {
+            return taosResult;
+        }
         taosResult.setTiming(blocks.timing);
         const INT_32_SIZE = 4;
         // Offset num of bytes from rawBlockBuffer.
@@ -117,7 +139,9 @@ function parseBlock(rows, blocks, taosResult) {
         log_1.default.debug("===colLengthBlockSize:" + colLengthBlockSize);
         let bitMapSize = (rows + (1 << 3) - 1) >> 3;
         // whole raw block ArrayBuffer
-        let dataBuffer = blocks.data.slice(bufferOffset);
+        // let dataBuffer = blocks.data.slice(bufferOffset);
+        let headOffset = blocks.data.byteOffset + bufferOffset;
+        let dataView = new DataView(blocks.data.buffer, headOffset);
         // record the head of column in block
         let colBlockHead = 0;
         for (let i = 0; i < rows; i++) {
@@ -128,41 +152,42 @@ function parseBlock(rows, blocks, taosResult) {
             let colDataHead = colBlockHead;
             // traverse row after row. 
             for (let j = 0; j < metaList.length; j++) {
-                let isVarType = _isVarType(metaList[j]);
+                let isVarType = _isVarType(metaList[j].type);
                 if (isVarType == constant_1.ColumnsBlockType.SOLID) {
                     colDataHead = colBlockHead + bitMapSize + metaList[j].length * i;
                     let byteArrayIndex = i >> 3;
                     let bitwiseOffset = 7 - (i & 7);
-                    let bitMapArr = dataBuffer.slice(colBlockHead, colBlockHead + bitMapSize);
-                    let bitFlag = ((new DataView(bitMapArr).getUint8(byteArrayIndex)) & (1 << bitwiseOffset)) >> bitwiseOffset;
+                    // let bitMapArr = dataBuffer.slice(colBlockHead, colBlockHead + bitMapSize)
+                    let bitMapArr = new DataView(dataView.buffer, dataView.byteOffset + colBlockHead, bitMapSize);
+                    let bitFlag = (bitMapArr.getUint8(byteArrayIndex) & (1 << bitwiseOffset)) >> bitwiseOffset;
                     if (bitFlag == 1) {
                         row.push("NULL");
                     }
                     else {
-                        row.push(readSolidData(dataBuffer, colDataHead, metaList[j]));
+                        row.push(readSolidData(dataView, colDataHead, metaList[j]));
                     }
-                    colBlockHead = colBlockHead + bitMapSize + (new DataView(dataBuffer, INT_32_SIZE * j, INT_32_SIZE).getInt32(0, true));
+                    colBlockHead = colBlockHead + bitMapSize + dataView.getInt32(INT_32_SIZE * j, true);
                 }
                 else {
                     // if null check
-                    let varOffset = new DataView(dataBuffer, colBlockHead + (INT_32_SIZE * i), INT_32_SIZE).getInt32(0, true);
+                    let varOffset = dataView.getInt32(colBlockHead + (INT_32_SIZE * i), true);
                     if (varOffset == -1) {
                         row.push("NULL");
-                        colBlockHead = colBlockHead + INT_32_SIZE * rows + (new DataView(dataBuffer, j * INT_32_SIZE, INT_32_SIZE).getInt32(0, true));
+                        colBlockHead = colBlockHead + INT_32_SIZE * rows + dataView.getInt32(j * INT_32_SIZE, true);
                     }
                     else {
                         colDataHead = colBlockHead + INT_32_SIZE * rows + varOffset;
-                        let dataLength = (new DataView(dataBuffer, colDataHead, 2).getInt16(0, true));
+                        let dataLength = dataView.getInt16(colDataHead, true);
                         if (isVarType == constant_1.ColumnsBlockType.VARCHAR) {
-                            row.push(readVarchar(dataBuffer, colDataHead + 2, dataLength));
+                            row.push(readVarchar(dataView.buffer, dataView.byteOffset + colDataHead + 2, dataLength, textDecoder));
                         }
                         else if (isVarType == constant_1.ColumnsBlockType.GEOMETRY || isVarType == constant_1.ColumnsBlockType.VARBINARY) {
-                            row.push(readBinary(dataBuffer, colDataHead + 2, dataLength));
+                            row.push(readBinary(dataView.buffer, dataView.byteOffset + colDataHead + 2, dataLength));
                         }
                         else {
-                            row.push(readNchar(dataBuffer, colDataHead + 2, dataLength));
+                            row.push(readNchar(dataView.buffer, dataView.byteOffset + colDataHead + 2, dataLength));
                         }
-                        colBlockHead = colBlockHead + INT_32_SIZE * rows + (new DataView(dataBuffer, j * INT_32_SIZE, INT_32_SIZE).getInt32(0, true));
+                        colBlockHead = colBlockHead + INT_32_SIZE * rows + dataView.getInt32(j * INT_32_SIZE, true);
                     }
                 }
             }
@@ -175,25 +200,25 @@ function parseBlock(rows, blocks, taosResult) {
     }
 }
 exports.parseBlock = parseBlock;
-function _isVarType(meta) {
-    switch (meta.type) {
-        case constant_1.TDengineTypeCode['NCHAR']: {
+function _isVarType(metaType) {
+    switch (metaType) {
+        case constant_1.TDengineTypeCode.NCHAR: {
             return constant_1.ColumnsBlockType['NCHAR'];
         }
-        case constant_1.TDengineTypeCode['VARCHAR']: {
+        case constant_1.TDengineTypeCode.VARCHAR: {
             return constant_1.ColumnsBlockType['VARCHAR'];
         }
-        case constant_1.TDengineTypeCode['BINARY']: {
+        case constant_1.TDengineTypeCode.BINARY: {
             return constant_1.ColumnsBlockType['VARCHAR'];
         }
-        case constant_1.TDengineTypeCode['JSON']: {
+        case constant_1.TDengineTypeCode.JSON: {
             return constant_1.ColumnsBlockType['VARCHAR'];
         }
-        case constant_1.TDengineTypeCode['GEOMETRY']: {
+        case constant_1.TDengineTypeCode.GEOMETRY: {
             return constant_1.ColumnsBlockType['GEOMETRY'];
         }
-        case constant_1.TDengineTypeCode['VARBINARY']: {
-            return constant_1.ColumnsBlockType['VARBINARY'];
+        case constant_1.TDengineTypeCode.VARBINARY: {
+            return constant_1.ColumnsBlockType.VARBINARY;
         }
         default: {
             return constant_1.ColumnsBlockType['SOLID'];
@@ -201,13 +226,12 @@ function _isVarType(meta) {
     }
 }
 exports._isVarType = _isVarType;
-function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
-    let dataBuffer = new DataView(buffer);
+function readSolidDataToArray(dataBuffer, colBlockHead, rows, metaType, bitMapArr) {
     let result = [];
-    switch (meta.type) {
-        case constant_1.TDengineTypeCode['BOOL']:
-        case constant_1.TDengineTypeCode['TINYINT']:
-        case constant_1.TDengineTypeCode['TINYINT UNSIGNED']: {
+    switch (metaType) {
+        case constant_1.TDengineTypeCode.BOOL:
+        case constant_1.TDengineTypeCode.TINYINT:
+        case constant_1.TDengineTypeCode.TINYINT_UNSIGNED: {
             for (let i = 0; i < rows; i++, colBlockHead++) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -218,7 +242,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             }
             break;
         }
-        case constant_1.TDengineTypeCode['SMALLINT']: {
+        case constant_1.TDengineTypeCode.SMALLINT: {
             for (let i = 0; i < rows; i++, colBlockHead += 2) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -229,7 +253,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             }
             break;
         }
-        case constant_1.TDengineTypeCode['INT']: {
+        case constant_1.TDengineTypeCode.INT: {
             for (let i = 0; i < rows; i++, colBlockHead += 4) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -240,7 +264,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             }
             break;
         }
-        case constant_1.TDengineTypeCode['BIGINT']: {
+        case constant_1.TDengineTypeCode.BIGINT: {
             for (let i = 0; i < rows; i++, colBlockHead += 8) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -251,7 +275,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             }
             break;
         }
-        case constant_1.TDengineTypeCode['SMALLINT UNSIGNED']: {
+        case constant_1.TDengineTypeCode.SMALLINT_UNSIGNED: {
             for (let i = 0; i < rows; i++, colBlockHead += 2) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -262,7 +286,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             }
             break;
         }
-        case constant_1.TDengineTypeCode['INT UNSIGNED']: {
+        case constant_1.TDengineTypeCode.INT_UNSIGNED: {
             for (let i = 0; i < rows; i++, colBlockHead += 4) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -273,7 +297,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             }
             break;
         }
-        case constant_1.TDengineTypeCode['BIGINT UNSIGNED']: {
+        case constant_1.TDengineTypeCode.BIGINT_UNSIGNED: {
             for (let i = 0; i < rows; i++, colBlockHead += 8) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -284,7 +308,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             }
             break;
         }
-        case constant_1.TDengineTypeCode['FLOAT']: {
+        case constant_1.TDengineTypeCode.FLOAT: {
             for (let i = 0; i < rows; i++, colBlockHead += 4) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -295,7 +319,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             }
             break;
         }
-        case constant_1.TDengineTypeCode['DOUBLE']: {
+        case constant_1.TDengineTypeCode.DOUBLE: {
             for (let i = 0; i < rows; i++, colBlockHead += 8) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -306,7 +330,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             }
             break;
         }
-        case constant_1.TDengineTypeCode['TIMESTAMP']: {
+        case constant_1.TDengineTypeCode.TIMESTAMP: {
             for (let i = 0; i < rows; i++, colBlockHead += 8) {
                 if (isNull(bitMapArr, i)) {
                     result.push(null);
@@ -318,7 +342,7 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
             break;
         }
         default: {
-            throw new wsError_1.WebSocketQueryInterFaceError(wsError_1.ErrorCode.ERR_UNSUPPORTED_TDENGINE_TYPE, `unspported type ${meta.type} for column ${meta.name}`);
+            throw new wsError_1.WebSocketQueryInterFaceError(wsError_1.ErrorCode.ERR_UNSUPPORTED_TDENGINE_TYPE, `unspported type ${metaType}`);
         }
     }
     return result;
@@ -326,41 +350,41 @@ function readSolidDataToArray(buffer, colBlockHead, rows, meta, bitMapArr) {
 exports.readSolidDataToArray = readSolidDataToArray;
 function readSolidData(dataBuffer, colDataHead, meta) {
     switch (meta.type) {
-        case constant_1.TDengineTypeCode['BOOL']: {
-            return (Boolean)(new DataView(dataBuffer, colDataHead, 1).getInt8(0));
+        case constant_1.TDengineTypeCode.BOOL: {
+            return (Boolean)(dataBuffer.getInt8(colDataHead));
         }
-        case constant_1.TDengineTypeCode['TINYINT']: {
-            return (new DataView(dataBuffer, colDataHead, 1).getInt8(0));
+        case constant_1.TDengineTypeCode.TINYINT: {
+            return dataBuffer.getInt8(colDataHead);
         }
-        case constant_1.TDengineTypeCode['SMALLINT']: {
-            return (new DataView(dataBuffer, colDataHead, 2).getInt16(0, true));
+        case constant_1.TDengineTypeCode.SMALLINT: {
+            return dataBuffer.getInt16(colDataHead, true);
         }
-        case constant_1.TDengineTypeCode['INT']: {
-            return (new DataView(dataBuffer, colDataHead, 4).getInt32(0, true));
+        case constant_1.TDengineTypeCode.INT: {
+            return dataBuffer.getInt32(colDataHead, true);
         }
-        case constant_1.TDengineTypeCode['BIGINT']: {
-            return (new DataView(dataBuffer, colDataHead, 8).getBigInt64(0, true));
+        case constant_1.TDengineTypeCode.BIGINT: {
+            return dataBuffer.getBigInt64(colDataHead, true);
         }
-        case constant_1.TDengineTypeCode['TINYINT UNSIGNED']: {
-            return (new DataView(dataBuffer, colDataHead, 1).getUint8(0));
+        case constant_1.TDengineTypeCode.TINYINT_UNSIGNED: {
+            return dataBuffer.getUint8(colDataHead);
         }
-        case constant_1.TDengineTypeCode['SMALLINT UNSIGNED']: {
-            return (new DataView(dataBuffer, colDataHead, 2).getUint16(0, true));
+        case constant_1.TDengineTypeCode.SMALLINT_UNSIGNED: {
+            return dataBuffer.getUint16(colDataHead, true);
         }
-        case constant_1.TDengineTypeCode['INT UNSIGNED']: {
-            return (new DataView(dataBuffer, colDataHead, 4).getUint32(0, true));
+        case constant_1.TDengineTypeCode.INT_UNSIGNED: {
+            return dataBuffer.getUint32(colDataHead, true);
         }
-        case constant_1.TDengineTypeCode['BIGINT UNSIGNED']: {
-            return (new DataView(dataBuffer, colDataHead, 8).getBigUint64(0, true));
+        case constant_1.TDengineTypeCode.BIGINT_UNSIGNED: {
+            return dataBuffer.getBigUint64(colDataHead, true);
         }
-        case constant_1.TDengineTypeCode['FLOAT']: {
-            return (parseFloat(new DataView(dataBuffer, colDataHead, 4).getFloat32(0, true).toFixed(5)));
+        case constant_1.TDengineTypeCode.FLOAT: {
+            return parseFloat(dataBuffer.getFloat32(colDataHead, true).toFixed(5));
         }
-        case constant_1.TDengineTypeCode['DOUBLE']: {
-            return (parseFloat(new DataView(dataBuffer, colDataHead, 8).getFloat64(0, true).toFixed(15)));
+        case constant_1.TDengineTypeCode.DOUBLE: {
+            return parseFloat(dataBuffer.getFloat64(colDataHead, true).toFixed(15));
         }
-        case constant_1.TDengineTypeCode['TIMESTAMP']: {
-            return (new DataView(dataBuffer, colDataHead, 8).getBigInt64(0, true));
+        case constant_1.TDengineTypeCode.TIMESTAMP: {
+            return dataBuffer.getBigInt64(colDataHead, true);
             // could change 
         }
         default: {
@@ -374,22 +398,28 @@ function readBinary(dataBuffer, colDataHead, length) {
     return buff;
 }
 exports.readBinary = readBinary;
-function readVarchar(dataBuffer, colDataHead, length) {
-    let data = "";
-    let buff = dataBuffer.slice(colDataHead, colDataHead + length);
-    data += new TextDecoder().decode(buff);
-    return data;
+function readVarchar(dataBuffer, colDataHead, length, textDecoder) {
+    // let buff = dataBuffer.slice(colDataHead, colDataHead + length)
+    let dataView = new DataView(dataBuffer, colDataHead, length);
+    return textDecoder.decode(dataView);
 }
 exports.readVarchar = readVarchar;
 function readNchar(dataBuffer, colDataHead, length) {
-    let data = "";
-    let buff = dataBuffer.slice(colDataHead, colDataHead + length);
+    let data = [];
+    // let buff: ArrayBuffer = dataBuffer.slice(colDataHead, colDataHead + length);
+    let dataView = new DataView(dataBuffer, colDataHead, length);
     for (let i = 0; i < length / 4; i++) {
-        data += (0, ut8Helper_1.appendRune)(new DataView(buff, i * 4, 4).getUint32(0, true));
+        data.push((0, ut8Helper_1.appendRune)(dataView.getUint32(i * 4, true)));
     }
-    return data;
+    return data.join('');
 }
 exports.readNchar = readNchar;
+function getString(dataBuffer, colDataHead, length, textDecoder) {
+    // let buff = dataBuffer.slice(colDataHead, colDataHead + length - 1)
+    let dataView = new Uint8Array(dataBuffer.buffer, dataBuffer.byteOffset + colDataHead, length - 1);
+    return textDecoder.decode(dataView);
+}
+exports.getString = getString;
 function iteratorBuff(arr) {
     let buf = Buffer.from(arr);
     for (const value of buf) {

package/lib/src/common/utils.d.ts

@@ -2,4 +2,6 @@ import { WSConfig } from "./config";
 export declare function getUrl(wsConfig: WSConfig): URL;
 export declare function sleep(ms: number): Promise<void>;
 export declare function isEmpty(value: any): boolean;
+export declare function getBinarySql(action: bigint, reqId: bigint, resultId: bigint, sql?: string): ArrayBuffer;
+export declare function zigzagDecode(n: number): number;
 //# sourceMappingURL=utils.d.ts.map

package/lib/src/common/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAgB,MAAM,CAAC,QAAQ,EAAC,QAAQ,GAAE,GAAG,CAe5C;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAGD,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAM3C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAgB,MAAM,CAAC,QAAQ,EAAC,QAAQ,GAAE,GAAG,CAe5C;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAGD,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAM3C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAC,MAAM,GAAG,WAAW,CA6BnG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9C"}

package/lib/src/common/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmpty = exports.sleep = exports.getUrl = void 0;
+exports.zigzagDecode = exports.getBinarySql = exports.isEmpty = exports.sleep = exports.getUrl = void 0;
 function getUrl(wsConfig) {
     let url = new URL(wsConfig.getUrl());
     if (wsConfig.getUser()) {
@@ -31,3 +31,36 @@ function isEmpty(value) {
     return false;
 }
 exports.isEmpty = isEmpty;
+function getBinarySql(action, reqId, resultId, sql) {
+    // construct msg
+    if (sql) {
+        const encoder = new TextEncoder();
+        const buffer = encoder.encode(sql);
+        let messageLen = 30 + buffer.length;
+        let sqlBuffer = new ArrayBuffer(messageLen);
+        let sqlView = new DataView(sqlBuffer);
+        sqlView.setBigUint64(0, reqId, true);
+        sqlView.setBigInt64(8, resultId, true);
+        sqlView.setBigInt64(16, action, true);
+        sqlView.setInt16(24, 1, true);
+        sqlView.setInt32(26, buffer.length, true);
+        let offset = 30;
+        for (let i = 0; i < buffer.length; i++) {
+            sqlView.setUint8(offset + i, buffer[i]);
+        }
+        return sqlBuffer;
+    }
+    let messageLen = 26;
+    let sqlBuffer = new ArrayBuffer(messageLen);
+    let sqlView = new DataView(sqlBuffer);
+    sqlView.setBigUint64(0, reqId, true);
+    sqlView.setBigInt64(8, resultId, true);
+    sqlView.setBigInt64(16, action, true);
+    sqlView.setInt16(24, 1, true);
+    return sqlBuffer;
+}
+exports.getBinarySql = getBinarySql;
+function zigzagDecode(n) {
+    return (n >> 1) ^ (-(n & 1));
+}
+exports.zigzagDecode = zigzagDecode;

package/lib/src/sql/wsRows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsRows.d.ts","sourceRoot":"","sources":["../../../src/sql/wsRows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAG9C,qBAAa,MAAM;IACf,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IACnD,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAW;gBACf,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe;IAOlD,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;YAoBhB,YAAY;IAkB1B,OAAO,IAAG,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI;IAIpC,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS;IAc3B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;CAQ9B"}
+{"version":3,"file":"wsRows.d.ts","sourceRoot":"","sources":["../../../src/sql/wsRows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA0B,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAwB,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAM9C,qBAAa,MAAM;IACf,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IACnD,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAW;gBAEf,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe;IAOlD,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;YAoBhB,YAAY;IA4B1B,OAAO,IAAG,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI;IAIpC,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS;IAc3B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;CAQ9B"}

package/lib/src/sql/wsRows.js

@@ -6,7 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WSRows = void 0;
 const taosResult_1 = require("../common/taosResult");
 const wsError_1 = require("../common/wsError");
+const wsResponse_1 = require("../client/wsResponse");
 const log_1 = __importDefault(require("../common/log"));
+const reqid_1 = require("../common/reqid");
+const utils_1 = require("../common/utils");
+const constant_1 = require("../common/constant");
 class WSRows {
     constructor(wsInterface, resp) {
         this._wsClient = wsInterface;
@@ -33,15 +37,22 @@ class WSRows {
     }
     async getBlockData() {
         try {
-            let wsFetchResponse = await this._wsClient.fetch(this._wsQueryResponse);
-            log_1.default.debug("[wsQuery.execute.wsFetchResponse]==>\n", wsFetchResponse);
-            if (wsFetchResponse.completed) {
-                this.close();
-                this._taosResult.setData(null);
-            }
-            else {
-                this._taosResult.setRowsAndTime(wsFetchResponse.rows, wsFetchResponse.timing);
-                return await this._wsClient.fetchBlock(wsFetchResponse, this._taosResult);
+            if (this._wsQueryResponse.id) {
+                let bigintReqId = BigInt(reqid_1.ReqId.getReqID());
+                let resp = await this._wsClient.sendBinaryMsg(bigintReqId, "binary_query", (0, utils_1.getBinarySql)(constant_1.FetchRawBlockMessage, bigintReqId, BigInt(this._wsQueryResponse.id)), false, true);
+                this._taosResult.addTotalTime(resp.totalTime);
+                let wsResponse = new wsResponse_1.WSFetchBlockResponse(resp.msg);
+                if (wsResponse.code != 0) {
+                    log_1.default.error("Executing SQL statement returns error: ", wsResponse.code, wsResponse.message);
+                    throw new wsError_1.TaosResultError(wsResponse.code, wsResponse.message);
+                }
+                if (wsResponse.finished == 1) {
+                    this.close();
+                    this._taosResult.setData(null);
+                }
+                else {
+                    (0, taosResult_1.parseBlock)(wsResponse, this._taosResult);
+                }
             }
             return this._taosResult;
         }
@@ -70,7 +81,7 @@ class WSRows {
             return;
         }
         this._isClose = true;
-        await this._wsClient.freeResult(this._wsQueryResponse);
+        this._wsClient.freeResult(this._wsQueryResponse);
     }
 }
 exports.WSRows = WSRows;

package/lib/src/sql/wsSql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsSql.d.ts","sourceRoot":"","sources":["../../../src/sql/wsSql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAyB,eAAe,EAAE,MAAM,WAAW,CAAA;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAKvC,qBAAa,KAAK;IACd,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAW;gBAChB,QAAQ,EAAC,QAAQ;WAMhB,IAAI,CAAC,QAAQ,EAAC,QAAQ,GAAE,OAAO,CAAC,KAAK,CAAC;IAmBnD,KAAK;IAIL;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;IAIrB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnI,QAAQ,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBxC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,GAAC,MAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;YA6BvE,uBAAuB;IAa/B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IASxD,OAAO,CAAC,MAAM;CAYjB"}
+{"version":3,"file":"wsSql.d.ts","sourceRoot":"","sources":["../../../src/sql/wsSql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAc,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAyB,eAAe,EAAE,MAAM,WAAW,CAAA;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAKvC,qBAAa,KAAK;IACd,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAW;gBAChB,QAAQ,EAAC,QAAQ;WAMhB,IAAI,CAAC,QAAQ,EAAC,QAAQ,GAAE,OAAO,CAAC,KAAK,CAAC;IAmBnD,KAAK;IAIL;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;IAIrB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnI,QAAQ,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBxC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,GAAC,MAAuB,GAAG,OAAO,CAAC,UAAU,CAAC;YA4C9E,uBAAuB;IAa/B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,OAAO,CAAC,MAAM;CAajB"}

package/lib/src/sql/wsSql.js

@@ -9,6 +9,7 @@ const taosResult_1 = require("../common/taosResult");
 const wsClient_1 = require("../client/wsClient");
 const wsError_1 = require("../common/wsError");
 const utils_1 = require("../common/utils");
+const wsResponse_1 = require("../client/wsResponse");
 const wsStmt_1 = require("../stmt/wsStmt");
 const reqid_1 = require("../common/reqid");
 const constant_1 = require("../common/constant");
@@ -93,33 +94,41 @@ class WsSql {
         }
         throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "stmt connect closed"));
     }
-    async exec(sql, reqId, action = 'query') {
+    async exec(sql, reqId, action = 'binary_query') {
         try {
-            let wsQueryResponse = await this._wsClient.exec(this.getSql(sql, reqId, action));
+            let bigintReqId = BigInt(reqid_1.ReqId.getReqID(reqId));
+            let wsQueryResponse = await this._wsClient.sendBinaryMsg(bigintReqId, action, (0, utils_1.getBinarySql)(constant_1.BinaryQueryMessage, bigintReqId, BigInt(0), sql));
             let taosResult = new taosResult_1.TaosResult(wsQueryResponse);
             if (wsQueryResponse.is_update) {
                 return taosResult;
             }
             else {
-                try {
-                    while (true) {
-                        let wsFetchResponse = await this._wsClient.fetch(wsQueryResponse);
-                        if (wsFetchResponse.completed) {
-                            break;
-                        }
-                        else {
-                            taosResult.setRowsAndTime(wsFetchResponse.rows, wsFetchResponse.timing);
-                            taosResult = await this._wsClient.fetchBlock(wsFetchResponse, taosResult);
+                if (wsQueryResponse.id) {
+                    try {
+                        while (true) {
+                            let bigintReqId = BigInt(reqid_1.ReqId.getReqID(reqId));
+                            let resp = await this._wsClient.sendBinaryMsg(bigintReqId, action, (0, utils_1.getBinarySql)(constant_1.FetchRawBlockMessage, bigintReqId, BigInt(wsQueryResponse.id)), false, true);
+                            taosResult.addTotalTime(resp.totalTime);
+                            let wsResponse = new wsResponse_1.WSFetchBlockResponse(resp.msg);
+                            if (wsResponse.code != 0) {
+                                log_1.default.error("Executing SQL statement returns error: ", wsResponse.code, wsResponse.message);
+                                throw new wsError_1.TaosResultError(wsResponse.code, wsResponse.message);
+                            }
+                            if (wsResponse.finished == 1) {
+                                break;
+                            }
+                            (0, taosResult_1.parseBlock)(wsResponse, taosResult);
                         }
+                        return taosResult;
+                    }
+                    catch (err) {
+                        throw new wsError_1.TaosResultError(err.code, err.message);
+                    }
+                    finally {
+                        this._wsClient.freeResult(wsQueryResponse);
                     }
-                    return taosResult;
-                }
-                catch (err) {
-                    throw new wsError_1.TaosResultError(err.code, err.message);
-                }
-                finally {
-                    this._wsClient.freeResult(wsQueryResponse);
                 }
+                throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_FETCH_MESSAGE_DATA, "The result data of the query is incorrect");
             }
         }
         catch (err) {
@@ -141,7 +150,8 @@ class WsSql {
     }
     async query(sql, reqId) {
         try {
-            let wsQueryResponse = await this._wsClient.exec(this.getSql(sql, reqId));
+            let bigintReqId = BigInt(reqid_1.ReqId.getReqID(reqId));
+            let wsQueryResponse = await this._wsClient.sendBinaryMsg(bigintReqId, 'binary_query', (0, utils_1.getBinarySql)(constant_1.BinaryQueryMessage, bigintReqId, BigInt(0), sql));
             return new wsRows_1.WSRows(this._wsClient, wsQueryResponse);
         }
         catch (err) {