@tdengine/websocket 3.1.0 → 3.1.1

package/lib/src/tmq/tmqResponse.js

@@ -1,10 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTmqBlock = exports.TopicPartition = exports.CommittedResp = exports.PartitionsResp = exports.SubscriptionResp = exports.AssignmentResp = exports.WSTmqFetchBlockResponse = exports.TaosTmqResult = exports.WsTmqQueryResponse = exports.WsPollResponse = void 0;
+exports.TopicPartition = exports.CommittedResp = exports.PartitionsResp = exports.SubscriptionResp = exports.AssignmentResp = exports.WSTmqFetchBlockInfo = exports.TaosTmqResult = exports.WsTmqQueryResponse = exports.WsPollResponse = void 0;
 const wsResponse_1 = require("../client/wsResponse");
 const constant_1 = require("../common/constant");
 const taosResult_1 = require("../common/taosResult");
 const wsError_1 = require("../common/wsError");
+const constant_2 = require("./constant");
+const utils_1 = require("../common/utils");
+const log_1 = __importDefault(require("../common/log"));
 class WsPollResponse {
     constructor(resp) {
         this.totalTime = resp.totalTime;
@@ -39,23 +45,220 @@ class WsTmqQueryResponse extends wsResponse_1.WSQueryResponse {
 }
 exports.WsTmqQueryResponse = WsTmqQueryResponse;
 class TaosTmqResult extends taosResult_1.TaosResult {
-    constructor(resp, pollResp) {
-        super(resp);
-        this.table_name = resp.table_name;
-        // this._affectRows = resp.rows;
-        this.topic = pollResp.topic;
+    constructor(pollResp) {
+        super();
+        this.setTopic(pollResp.topic);
         this.database = pollResp.database;
         this.vgroup_id = pollResp.vgroup_id;
     }
 }
 exports.TaosTmqResult = TaosTmqResult;
-class WSTmqFetchBlockResponse {
-    constructor(resp) {
-        this.totalTime = resp.totalTime;
-        this.blockData = resp.msg;
+class WSTmqFetchBlockInfo {
+    constructor(dataView, taosResult) {
+        // this.totalTime = resp.totalTime
+        // this.blockData = resp.msg
+        this.textDecoder = new TextDecoder();
+        this.taosResult = taosResult;
+        this.schema = [];
+        this.schemaLen = 0;
+        let blockDataView = this.skipHead(dataView);
+        this.rows = this.parseBlockInfos(blockDataView);
+    }
+    getRows() {
+        return this.rows;
+    }
+    skipHead(dataView) {
+        let v = dataView.getUint8(0);
+        if (v >= 100) {
+            let skip = dataView.getUint32(1, true);
+            return new DataView(dataView.buffer, dataView.byteOffset + skip + 5);
+        }
+        let skip1 = this.getTypeSkip(v);
+        v = dataView.getUint8(1 + skip1);
+        let skip2 = this.getTypeSkip(v);
+        return new DataView(dataView.buffer, dataView.byteOffset + skip1 + 2 + skip2);
+    }
+    getTypeSkip(v) {
+        switch (v) {
+            case 1:
+                return 8;
+            case 2:
+            case 3:
+                return 16;
+            default:
+                throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_FETCH_MESSAGE_DATA, `FetchBlockRawResp getTypeSkip error, type: ${v}`));
+        }
+    }
+    parseBlockInfos(dataView) {
+        let blockNum = dataView.getUint32(0, true);
+        if (blockNum == 0) {
+            return 0;
+        }
+        this.withTableName = dataView.getUint8(4) == 1 ? true : false;
+        this.withSchema = dataView.getUint8(5) == 1 ? true : false;
+        // let dataBuffer = dataView.buffer.slice(6)
+        let dataBuffer = new DataView(dataView.buffer, dataView.byteOffset + 6);
+        let rows = 0;
+        // const parseStartTime = new Date().getTime();
+        // console.log("parseBlockInfos blockNum="+ blockNum)
+        for (let i = 0; i < blockNum; i++) {
+            let variableInfo = this.parseVariableByteInteger(dataBuffer);
+            this.taosResult.setPrecision(variableInfo[1].getUint8(17));
+            dataView = new DataView(variableInfo[1].buffer, variableInfo[1].byteOffset + 17);
+            let offset = variableInfo[0] - 17;
+            dataBuffer = this.parseSchemaInfo(dataView, offset);
+            rows += this.parseTmqBlock(dataView, 1);
+        }
+        // const parseEndTime = new Date().getTime();
+        // console.log("------------->", parseEndTime- parseStartTime, rows);
+        log_1.default.info("parseBlockInfos blockNum=" + blockNum + ", withTableName=" + this.withTableName + ", withSchema=" + this.withSchema + ", rows=" + rows);
+        return rows;
+    }
+    parseSchemaInfo(dataBuffer, offset) {
+        if (this.withSchema) {
+            let isSkip = this.schema.length > 0;
+            if (!isSkip) {
+                dataBuffer = new DataView(dataBuffer.buffer, dataBuffer.byteOffset + offset);
+                let variableInfo = this.parseVariableByteInteger(dataBuffer);
+                this.schemaLen = variableInfo[2];
+                let cols = (0, utils_1.zigzagDecode)(variableInfo[0]);
+                variableInfo = this.parseVariableByteInteger(variableInfo[1]);
+                this.schemaLen += variableInfo[2];
+                let dataView = variableInfo[1];
+                for (let index = 0; index < cols; index++) {
+                    let schema = new constant_2.TMQRawDataSchema();
+                    schema.colType = dataView.getInt8(0);
+                    schema.flag = dataView.getInt8(1);
+                    variableInfo = this.parseVariableByteInteger(dataView, 2);
+                    this.schemaLen += 2 + variableInfo[2];
+                    schema.bytes = BigInt((0, utils_1.zigzagDecode)(variableInfo[0]));
+                    variableInfo = this.parseVariableByteInteger(variableInfo[1]);
+                    this.schemaLen += variableInfo[2];
+                    schema.colID = (0, utils_1.zigzagDecode)(variableInfo[0]);
+                    variableInfo = this.parseVariableByteInteger(variableInfo[1]);
+                    this.schemaLen += variableInfo[2];
+                    schema.name = (0, taosResult_1.getString)(variableInfo[1], 0, variableInfo[0], this.textDecoder);
+                    if (!isSkip) {
+                        this.taosResult.setMeta({
+                            name: schema.name,
+                            type: schema.colType,
+                            length: Number(schema.bytes)
+                        });
+                        this.schema.push(schema);
+                    }
+                    dataView = new DataView(variableInfo[1].buffer, variableInfo[1].byteOffset + variableInfo[0]);
+                    this.schemaLen += variableInfo[0];
+                }
+                if (this.withTableName) {
+                    variableInfo = this.parseVariableByteInteger(dataView);
+                    this.schemaLen += variableInfo[2];
+                    this.tableName = (0, taosResult_1.readVarchar)(variableInfo[1].buffer, variableInfo[1].byteOffset, variableInfo[0], this.textDecoder);
+                    dataView = new DataView(variableInfo[1].buffer, variableInfo[1].byteOffset + variableInfo[0]);
+                    this.schemaLen += variableInfo[0];
+                }
+                return dataView;
+            }
+            else {
+                return new DataView(dataBuffer.buffer, dataBuffer.byteOffset + this.schemaLen + offset);
+            }
+        }
+        return dataBuffer;
+    }
+    parseVariableByteInteger(dataView, offset = 0) {
+        let value = 0;
+        let multiplier = 1;
+        let count = 0;
+        while (true) {
+            let encodedByte = dataView.getUint8(count + offset);
+            value += (encodedByte & 127) * multiplier;
+            if ((encodedByte & 128) == 0) {
+                break;
+            }
+            multiplier *= 128;
+            count++;
+        }
+        return [value, new DataView(dataView.buffer, dataView.byteOffset + count + 1 + offset), count + 1];
+    }
+    parseTmqBlock(dataView, startOffset) {
+        // let dataView = new DataView(dataBuffer)
+        let rows = dataView.getInt32(8 + startOffset, true);
+        if (rows == 0) {
+            return rows;
+        }
+        let taosData = this.taosResult.getData();
+        let metaData = this.taosResult.getMeta();
+        if (metaData && rows && taosData) {
+            let dataList = new Array(rows);
+            //get bitmap length
+            let bitMapOffset = getBitmapLen(rows);
+            //skip data head
+            let bufferOffset = 28 + 5 * this.schema.length + startOffset;
+            let metaLens = [];
+            for (let i = 0; i < this.schema.length; i++) {
+                //get data len
+                metaLens.push(dataView.getInt32(bufferOffset + i * 4, true));
+            }
+            bufferOffset += this.schema.length * 4;
+            for (let i = 0; i < this.schema.length; i++) {
+                let data = [];
+                //get type code     
+                let isVarType = (0, taosResult_1._isVarType)(this.schema[i].colType);
+                //fixed length type 
+                if (isVarType == constant_1.ColumnsBlockType.SOLID) {
+                    // let bitMapArr = dataBuffer.slice(bufferOffset, bufferOffset + bitMapOffset);
+                    let bitMapArr = new Uint8Array(dataView.buffer, dataView.byteOffset + bufferOffset, bitMapOffset);
+                    bufferOffset += bitMapOffset;
+                    //decode column data, data is array
+                    data = (0, taosResult_1.readSolidDataToArray)(dataView, bufferOffset, rows, this.schema[i].colType, bitMapArr);
+                }
+                else {
+                    //Variable length type   
+                    let start = bufferOffset;
+                    let offsets = [];
+                    for (let i = 0; i < rows; i++, start += constant_1.TDengineTypeLength['INT']) {
+                        //get data length, -1 is null
+                        offsets.push(dataView.getInt32(start, true));
+                    }
+                    for (let i = 0; i < rows; i++) {
+                        let value = '';
+                        if (-1 == offsets[i]) {
+                            value = null;
+                        }
+                        else {
+                            let header = start + offsets[i];
+                            let dataLength = dataView.getInt16(header, true) & 0xFFFF;
+                            if (isVarType == constant_1.ColumnsBlockType.VARCHAR) {
+                                //decode var char
+                                value = (0, taosResult_1.readVarchar)(dataView.buffer, dataView.byteOffset + header + 2, dataLength, this.textDecoder);
+                            }
+                            else if (isVarType == constant_1.ColumnsBlockType.GEOMETRY || isVarType == constant_1.ColumnsBlockType.VARBINARY) {
+                                //decode binary
+                                value = (0, taosResult_1.readBinary)(dataView.buffer, dataView.byteOffset + header + 2, dataLength);
+                            }
+                            else {
+                                //decode nchar
+                                value = (0, taosResult_1.readNchar)(dataView.buffer, dataView.byteOffset + header + 2, dataLength);
+                            }
+                        }
+                        data.push(value);
+                    }
+                    bufferOffset += rows * 4;
+                }
+                bufferOffset += metaLens[i];
+                //column data to row data
+                for (let row = 0; row < data.length; row++) {
+                    if (dataList[row] == null) {
+                        dataList[row] = [];
+                    }
+                    dataList[row].push(data[row]);
+                }
+            }
+            taosData.push(...dataList);
+        }
+        return rows;
     }
 }
-exports.WSTmqFetchBlockResponse = WSTmqFetchBlockResponse;
+exports.WSTmqFetchBlockInfo = WSTmqFetchBlockInfo;
 class AssignmentResp {
     constructor(resp, topic) {
         this.timing = BigInt(resp.msg.timing);
@@ -121,84 +324,6 @@ class TopicPartition {
     }
 }
 exports.TopicPartition = TopicPartition;
-function parseTmqBlock(rows, resp, taosResult) {
-    let dataList = new Array(rows);
-    if (!resp || !taosResult) {
-        return taosResult;
-    }
-    let metaList = taosResult.getTaosMeta();
-    let taosdata = taosResult.getData();
-    if (metaList && rows && taosdata) {
-        //get bitmap length
-        let bitMapOffset = getBitmapLen(rows);
-        //skip data head
-        let bufferOffset = 24 + 28 + 5 * metaList.length;
-        let dataBuffer = resp.blockData.slice(bufferOffset);
-        let metaLens = [];
-        for (let i = 0; i < metaList.length; i++) {
-            //get data len
-            metaLens.push(new DataView(dataBuffer, i * 4, 4).getInt32(0, true));
-        }
-        bufferOffset = metaList.length * 4;
-        for (let i = 0; i < metaList.length; i++) {
-            let data = [];
-            //get type code
-            let isVarType = (0, taosResult_1._isVarType)(metaList[i]);
-            //fixed length type 
-            if (isVarType == constant_1.ColumnsBlockType.SOLID) {
-                let bitMapArr = dataBuffer.slice(bufferOffset, bufferOffset + bitMapOffset);
-                bufferOffset += bitMapOffset;
-                //decode column data, data is array
-                data = (0, taosResult_1.readSolidDataToArray)(dataBuffer, bufferOffset, rows, metaList[i], bitMapArr);
-            }
-            else {
-                //Variable length type   
-                let offset = bufferOffset;
-                let offsets = [];
-                for (let i = 0; i < rows; i++, offset += constant_1.TDengineTypeLength['INT']) {
-                    //get data length, -1 is null
-                    offsets.push(new DataView(dataBuffer, offset, 4).getInt32(0, true));
-                }
-                let start = offset;
-                for (let i = 0; i < rows; i++) {
-                    let value = '';
-                    if (-1 == offsets[i]) {
-                        value = null;
-                    }
-                    else {
-                        let header = start + offsets[i];
-                        let dataLength = new DataView(dataBuffer, header, 2).getInt16(0, true) & 0xFFFF;
-                        if (isVarType == constant_1.ColumnsBlockType.VARCHAR) {
-                            //decode var char
-                            value = (0, taosResult_1.readVarchar)(dataBuffer, header + 2, dataLength);
-                        }
-                        else if (isVarType == constant_1.ColumnsBlockType.GEOMETRY || isVarType == constant_1.ColumnsBlockType.VARBINARY) {
-                            //decode binary
-                            value = (0, taosResult_1.readBinary)(dataBuffer, header + 2, dataLength);
-                        }
-                        else {
-                            //decode nchar
-                            value = (0, taosResult_1.readNchar)(dataBuffer, header + 2, dataLength);
-                        }
-                    }
-                    data.push(value);
-                }
-                bufferOffset += rows * 4;
-            }
-            bufferOffset += metaLens[i];
-            //column data to row data
-            for (let row = 0; row < data.length; row++) {
-                if (dataList[row] == null) {
-                    dataList[row] = [];
-                }
-                dataList[row].push(data[row]);
-            }
-        }
-        taosdata.push(...dataList);
-    }
-    return taosResult;
-}
-exports.parseTmqBlock = parseTmqBlock;
 function getBitmapLen(n) {
     return (n + 0x7) >> 3;
 }

package/lib/src/tmq/wsTmq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAkF,cAAc,EAA6E,MAAM,eAAe,CAAC;AAI1M,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO;YAMO,IAAI;WAML,WAAW,CAAC,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAE,OAAO,CAAC,UAAU,CAAC;IAUjE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB9D,WAAW,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAkBvE,YAAY,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYlD,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK5C,QAAQ;IAYhB,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,aAAa,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAc9E,YAAY,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkBnE,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,IAAI,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkB3D,eAAe,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IAQ/D,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IASzD,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;YAIb,KAAK;YAcL,cAAc;YAed,QAAQ;YAkCR,iBAAiB;IAczB,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBnD,gBAAgB;CA6BjC"}
+{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAkF,cAAc,EAA0D,MAAM,eAAe,CAAC;AAKvL,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO;YAMO,IAAI;WAML,WAAW,CAAC,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAE,OAAO,CAAC,UAAU,CAAC;IAUjE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB9D,WAAW,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgBvE,YAAY,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYlD,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK5C,QAAQ;IAYhB,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,aAAa,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAc9E,YAAY,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkBnE,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,IAAI,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkB3D,eAAe,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IAQ/D,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IASzD,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;YAIb,KAAK;YAcL,cAAc;YA4Bd,QAAQ;YA4BR,iBAAiB;IAczB,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBnD,gBAAgB;CA6BjC"}

package/lib/src/tmq/wsTmq.js

@@ -11,6 +11,7 @@ const wsError_1 = require("../common/wsError");
 const tmqResponse_1 = require("./tmqResponse");
 const reqid_1 = require("../common/reqid");
 const log_1 = __importDefault(require("../common/log"));
+const wsResponse_1 = require("../client/wsResponse");
 class WsConsumer {
     constructor(wsConfig) {
         this._wsConfig = new config_1.TmqConfig(wsConfig);
@@ -211,19 +212,30 @@ class WsConsumer {
         let result = await this._wsClient.exec(jsonStr, false);
         return new tmqResponse_1.WsTmqQueryResponse(result);
     }
-    async fetchBlockData(fetchResponse, taosResult) {
+    async fetchBlockData(pollResp, taosResult) {
         let fetchMsg = {
-            action: 'fetch_block',
+            action: 'fetch_raw_data',
             args: {
-                req_id: fetchResponse.req_id,
-                message_id: fetchResponse.message_id,
+                req_id: reqid_1.ReqId.getReqID(),
+                message_id: pollResp.message_id,
             },
         };
         let jsonStr = JSON.stringify(fetchMsg);
         log_1.default.debug('[wsQueryInterface.fetch.fetchMsg]===>' + jsonStr);
+        // const startTime = new Date().getTime();
         let result = await this._wsClient.sendMsg(jsonStr);
-        (0, tmqResponse_1.parseTmqBlock)(fetchResponse.rows, new tmqResponse_1.WSTmqFetchBlockResponse(result), taosResult);
-        return taosResult;
+        let wsResponse = new wsResponse_1.WSFetchBlockResponse(result.msg);
+        if (wsResponse && wsResponse.data && wsResponse.blockLen > 0) {
+            // const parseStartTime = new Date().getTime();
+            let wsTmqResponse = new tmqResponse_1.WSTmqFetchBlockInfo(wsResponse.data, taosResult);
+            log_1.default.debug('[WSTmqFetchBlockInfo.fetchBlockData]===>' + wsTmqResponse.taosResult);
+            if (wsTmqResponse.rows > 0) {
+                // const endTime = new Date().getTime();
+                // console.log(endTime - parseStartTime, endTime - startTime);
+                return true;
+            }
+        }
+        return false;
     }
     async pollData(timeoutMs, reqId) {
         let queryMsg = {
@@ -233,26 +245,17 @@ class WsConsumer {
                 blocking_time: timeoutMs
             },
         };
-        var taosResults = new Map();
         let resp = await this._wsClient.exec(JSON.stringify(queryMsg), false);
         let pollResp = new tmqResponse_1.WsPollResponse(resp);
+        let taosResult = new tmqResponse_1.TaosTmqResult(pollResp);
+        var taosResults = new Map();
+        taosResults.set(pollResp.topic, taosResult);
         if (!pollResp.have_message || pollResp.message_type != constant_1.TMQMessageType.ResDataType) {
             return taosResults;
         }
-        while (true) {
-            let fetchResp = await this.fetch(pollResp);
-            if (fetchResp.completed || fetchResp.rows == 0) {
-                break;
-            }
-            let taosResult = taosResults.get(pollResp.topic + pollResp.vgroup_id);
-            if (taosResult == null) {
-                taosResult = new tmqResponse_1.TaosTmqResult(fetchResp, pollResp);
-                taosResults.set(pollResp.topic + pollResp.vgroup_id, taosResult);
-            }
-            else {
-                taosResult.setRowsAndTime(fetchResp.rows);
-            }
-            await this.fetchBlockData(fetchResp, taosResult);
+        let finish = false;
+        while (!finish) {
+            finish = await this.fetchBlockData(pollResp, taosResult);
         }
         return taosResults;
     }

package/lib/test/bulkPulling/log.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=log.test.d.ts.map

package/lib/test/bulkPulling/log.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.test.d.ts","sourceRoot":"","sources":["../../../test/bulkPulling/log.test.ts"],"names":[],"mappings":""}

package/lib/test/bulkPulling/log.test.js

@@ -0,0 +1,44 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const log_1 = __importStar(require("../../src/common/log"));
+describe('log level print', () => {
+    test('normal connect', async () => {
+        log_1.default.info('log level is info');
+        log_1.default.debug('log level is debug');
+        log_1.default.error('log level is error');
+        let isLevel = log_1.default.isLevelEnabled("info");
+        expect(isLevel).toEqual(true);
+        (0, log_1.setLevel)("debug");
+        log_1.default.debug('log level is debug');
+        isLevel = log_1.default.isLevelEnabled("debug");
+        expect(isLevel).toEqual(true);
+        (0, log_1.setLevel)("error");
+        log_1.default.error('log level is error');
+        log_1.default.debug('log level is debug');
+        isLevel = log_1.default.isLevelEnabled("error");
+        expect(isLevel).toEqual(true);
+    });
+});

package/lib/test/bulkPulling/schemaless.test.js

@@ -10,8 +10,9 @@ beforeAll(async () => {
     conf.setUser('root');
     conf.setPwd('taosdata');
     let wsSql = await wsSql_1.WsSql.open(conf);
-    await wsSql.exec('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
-    await wsSql.exec('CREATE STABLE if not exists power.meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
+    await wsSql.exec('drop database if exists power_schemaless;');
+    await wsSql.exec('create database if not exists power_schemaless KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
+    await wsSql.exec('CREATE STABLE if not exists power_schemaless.meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
     await wsSql.close();
 });
 describe('TDWebSocket.WsSchemaless()', () => {
@@ -23,7 +24,7 @@ describe('TDWebSocket.WsSchemaless()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_schemaless');
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         await wsSchemaless.close();
@@ -52,7 +53,7 @@ describe('TDWebSocket.WsSchemaless()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_schemaless');
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         await wsSchemaless.schemalessInsert([influxdbData], wsProto_1.SchemalessProto.InfluxDBLineProtocol, wsProto_1.Precision.NANO_SECONDS, 0);
@@ -64,7 +65,7 @@ describe('TDWebSocket.WsSchemaless()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_schemaless');
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         await wsSchemaless.schemalessInsert([influxdbData], wsProto_1.SchemalessProto.InfluxDBLineProtocol, wsProto_1.Precision.NOT_CONFIGURED, 0);
@@ -77,7 +78,7 @@ describe('TDWebSocket.WsSchemaless()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_schemaless');
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         try {

package/lib/test/bulkPulling/sql.test.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const wsConnectorPool_1 = require("../../src/client/wsConnectorPool");
 const config_1 = require("../../src/common/config");
 const wsSql_1 = require("../../src/sql/wsSql");
+let dns = 'ws://localhost:6041';
 beforeAll(async () => {
-    let dns = 'ws://localhost:6041';
     let conf = new config_1.WSConfig(dns);
     conf.setUser('root');
     conf.setPwd('taosdata');
@@ -17,9 +17,10 @@ beforeAll(async () => {
 describe('TDWebSocket.WsSql()', () => {
     jest.setTimeout(20 * 1000);
     test('normal connect', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
         let wsSql = null;
-        let conf = new config_1.WSConfig(dsn);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
         conf.setDb('power');
         wsSql = await wsSql_1.WsSql.open(conf);
         expect(wsSql.state()).toBeGreaterThan(0);
@@ -29,8 +30,9 @@ describe('TDWebSocket.WsSql()', () => {
         expect.assertions(1);
         let wsSql = null;
         try {
-            let dsn = 'ws://root:taosdata@localhost:6041';
-            let conf = new config_1.WSConfig(dsn);
+            let conf = new config_1.WSConfig(dns);
+            conf.setUser('root');
+            conf.setPwd('taosdata');
             conf.setDb('jest');
             wsSql = await wsSql_1.WsSql.open(conf);
         }
@@ -45,8 +47,9 @@ describe('TDWebSocket.WsSql()', () => {
         }
     });
     test('get taosc version', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
         let wsSql = await wsSql_1.WsSql.open(conf);
         let version = await wsSql.version();
         await wsSql.close();
@@ -54,8 +57,9 @@ describe('TDWebSocket.WsSql()', () => {
         expect(version).toBeTruthy();
     });
     test('show databases', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
         let wsSql = await wsSql_1.WsSql.open(conf);
         let taosResult = await wsSql.exec('show databases');
         await wsSql.close();
@@ -63,8 +67,9 @@ describe('TDWebSocket.WsSql()', () => {
         expect(taosResult).toBeTruthy();
     });
     test('create databases', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
         let wsSql = await wsSql_1.WsSql.open(conf);
         let taosResult = await wsSql.exec('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
         await wsSql.close();
@@ -72,8 +77,9 @@ describe('TDWebSocket.WsSql()', () => {
         expect(taosResult).toBeTruthy();
     });
     test('create stable', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
         let wsSql = await wsSql_1.WsSql.open(conf);
         let taosResult = await wsSql.exec('use power');
         console.log(taosResult);
@@ -84,22 +90,24 @@ describe('TDWebSocket.WsSql()', () => {
         expect(taosResult).toBeTruthy();
     });
     test('insert recoder', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
         let wsSql = await wsSql_1.WsSql.open(conf);
         let taosResult = await wsSql.exec('use power');
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
         taosResult = await wsSql.exec('describe meters');
         console.log(taosResult);
-        taosResult = await wsSql.exec('INSERT INTO d1001 USING meters (location, groupid) TAGS ("California.SanFrancisco", 3) VALUES (NOW, 10.2, 219, 0.32)');
+        taosResult = await wsSql.exec('INSERT INTO d1001 USING meters (location, groupid) TAGS ("California", 3) VALUES (NOW, 10.2, 219, 0.32)');
         console.log(taosResult);
         expect(taosResult.getAffectRows()).toBeGreaterThanOrEqual(1);
         await wsSql.close();
     });
     test('query sql', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
         let wsSql = await wsSql_1.WsSql.open(conf);
         let taosResult = await wsSql.exec('use power');
         console.log(taosResult);
@@ -118,6 +126,18 @@ describe('TDWebSocket.WsSql()', () => {
         }
         await wsSql.close();
     });
+    test('query sql no getdata', async () => {
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        let wsSql = await wsSql_1.WsSql.open(conf);
+        let taosResult = await wsSql.exec('use power');
+        console.log(taosResult);
+        expect(taosResult).toBeTruthy();
+        let wsRows = await wsSql.query('select * from meters');
+        await wsRows.close();
+        await wsSql.close();
+    });
 });
 afterAll(async () => {
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();