fix: fix sql order (#94)

qevolg · web-flow · commit b36d1e69d3c6 · 2025-11-25T16:57:38.000+08:00
* style: format code

* fix: fix sql order

* style: format code
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -38,7 +38,7 @@ jobs:
             libgeos-dev libjansson-dev libsnappy-dev liblzma-dev libz-dev \
             zlib1g pkg-config libssl-dev gawk
 
-      - name: install TDengine
+      - name: Install TDengine
         run: |
           cd TDengine
           mkdir debug
@@ -49,11 +49,11 @@ jobs:
           which taosd
           which taosadapter
 
-      - name: start taosd
+      - name: Start taosd
         run: |
           nohup sudo taosd &
 
-      - name: start taosadapter
+      - name: Start taosadapter
         run: |
           nohup sudo taosadapter &
 
@@ -69,7 +69,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: test nodejs websocket
+      - name: Test nodejs websocket
         working-directory: nodejs-connector/nodejs
         run: |
           export TDENGINE_CLOUD_URL=${{ secrets.TDENGINE_CLOUD_URL }}
diff --git a/nodejs/example/all_type_query.ts b/nodejs/example/all_type_query.ts
@@ -1,5 +1,5 @@
 import { WSConfig } from "../src/common/config";
-import { sqlConnect, destroy, setLogLevel } from "../src";
+import { sqlConnect, destroy } from "../src";
 
 let dsn = "ws://127.0.0.1:6041";
 async function json_tag_example() {
@@ -29,8 +29,8 @@ async function json_tag_example() {
         let taosResult = await wsSql.exec(insertQuery);
         console.log(
             "Successfully inserted " +
-                taosResult.getAffectRows() +
-                " rows to example_json_tag.stb."
+            taosResult.getAffectRows() +
+            " rows to example_json_tag.stb."
         );
 
         let sql = "SELECT ts, v, jt FROM example_json_tag.stb limit 100";
@@ -70,10 +70,10 @@ async function all_type_example() {
         // create table
         await wsSql.exec(
             "create table if not exists all_type_example.stb (ts timestamp, " +
-                "int_col INT, double_col DOUBLE, bool_col BOOL, binary_col BINARY(100)," +
-                "nchar_col NCHAR(100), varbinary_col VARBINARY(100), geometry_col GEOMETRY(100)) " +
-                "tags(int_tag INT, double_tag DOUBLE, bool_tag BOOL, binary_tag BINARY(100)," +
-                "nchar_tag NCHAR(100), varbinary_tag VARBINARY(100), geometry_tag GEOMETRY(100));"
+            "int_col INT, double_col DOUBLE, bool_col BOOL, binary_col BINARY(100)," +
+            "nchar_col NCHAR(100), varbinary_col VARBINARY(100), geometry_col GEOMETRY(100)) " +
+            "tags(int_tag INT, double_tag DOUBLE, bool_tag BOOL, binary_tag BINARY(100)," +
+            "nchar_tag NCHAR(100), varbinary_tag VARBINARY(100), geometry_tag GEOMETRY(100));"
         );
 
         console.log("Create stable all_type_example.stb successfully");
@@ -85,8 +85,8 @@ async function all_type_example() {
         let taosResult = await wsSql.exec(insertQuery);
         console.log(
             "Successfully inserted " +
-                taosResult.getAffectRows() +
-                " rows to all_type_example.stb."
+            taosResult.getAffectRows() +
+            " rows to all_type_example.stb."
         );
 
         let sql = "SELECT * FROM all_type_example.stb limit 100";
diff --git a/nodejs/example/all_type_stmt.ts b/nodejs/example/all_type_stmt.ts
@@ -80,10 +80,10 @@ async function all_type_example() {
         // create table
         await wsSql.exec(
             "create table if not exists stb (ts timestamp, " +
-                "int_col INT, double_col DOUBLE, bool_col BOOL, binary_col BINARY(100)," +
-                "nchar_col NCHAR(100), varbinary_col VARBINARY(100), geometry_col GEOMETRY(100)) " +
-                "tags(int_tag INT, double_tag DOUBLE, bool_tag BOOL, binary_tag BINARY(100)," +
-                "nchar_tag NCHAR(100), varbinary_tag VARBINARY(100), geometry_tag GEOMETRY(100));"
+            "int_col INT, double_col DOUBLE, bool_col BOOL, binary_col BINARY(100)," +
+            "nchar_col NCHAR(100), varbinary_col VARBINARY(100), geometry_col GEOMETRY(100)) " +
+            "tags(int_tag INT, double_tag DOUBLE, bool_tag BOOL, binary_tag BINARY(100)," +
+            "nchar_tag NCHAR(100), varbinary_tag VARBINARY(100), geometry_tag GEOMETRY(100));"
         );
 
         console.log("Create stable all_type_example.stb successfully");
diff --git a/nodejs/example/basicBatchTmq.ts b/nodejs/example/basicBatchTmq.ts
@@ -62,8 +62,7 @@ async function insert() {
     let wsSql = await sqlConnect(conf);
     for (let i = 0; i < 10000; i++) {
         await wsSql.exec(
-            `INSERT INTO d1001 USING ${stable} (location, groupId) TAGS ("California.SanFrancisco", 3) VALUES (NOW + ${i}a, ${
-                10 + i
+            `INSERT INTO d1001 USING ${stable} (location, groupId) TAGS ("California.SanFrancisco", 3) VALUES (NOW + ${i}a, ${10 + i
             }, ${200 + i}, ${0.32 + i})`
         );
     }
diff --git a/nodejs/example/basicTmq.ts b/nodejs/example/basicTmq.ts
@@ -5,7 +5,6 @@ import { destroy, setLogLevel, sqlConnect, tmqConnect } from "../src";
 const stable = "meters";
 const db = "power";
 const topics: string[] = ["topic_ws_map"];
-let dropTopic = `DROP TOPIC IF EXISTS ${topics[0]};`;
 let configMap = new Map([
     [TMQConstants.GROUP_ID, "gId_11"],
     [TMQConstants.CONNECT_USER, "root"],
@@ -31,8 +30,7 @@ async function Prepare() {
     await ws.exec(createTopic);
     for (let i = 0; i < 1000; i++) {
         await ws.exec(
-            `INSERT INTO d1001 USING ${stable} (location, groupId) TAGS ("California.SanFrancisco", 3) VALUES (NOW + ${i}a, ${
-                10 + i
+            `INSERT INTO d1001 USING ${stable} (location, groupId) TAGS ("California.SanFrancisco", 3) VALUES (NOW + ${i}a, ${10 + i
             }, ${200 + i}, ${0.32 + i})`
         );
     }
diff --git a/nodejs/src/client/wsClient.ts b/nodejs/src/client/wsClient.ts
@@ -347,7 +347,6 @@ export class WsClient {
                 this._wsConnector
             );
             this._wsConnector = undefined;
-            // this._wsConnector.close();
         }
     }
 
diff --git a/nodejs/src/client/wsConnector.ts b/nodejs/src/client/wsConnector.ts
@@ -210,9 +210,9 @@ export class WebSocketConnector {
                 }
                 logger.debug(
                     "[wsClient.sendBinaryMsg()]===>" +
-                        reqId +
-                        action +
-                        message.byteLength
+                    reqId +
+                    action +
+                    message.byteLength
                 );
                 this._wsConn.send(message);
             } else {
diff --git a/nodejs/src/client/wsConnectorPool.ts b/nodejs/src/client/wsConnectorPool.ts
@@ -67,28 +67,28 @@ export class WebSocketConnectionPool {
             if (connector) {
                 logger.debug(
                     "get connection success:" +
-                        Atomics.load(WebSocketConnectionPool.sharedArray, 0)
+                    Atomics.load(WebSocketConnectionPool.sharedArray, 0)
                 );
                 return connector;
             }
 
             if (
                 this._maxConnections != -1 &&
                 Atomics.load(WebSocketConnectionPool.sharedArray, 0) >
-                    this._maxConnections
+                this._maxConnections
             ) {
                 throw new TDWebSocketClientError(
                     ErrorCode.ERR_WEBSOCKET_CONNECTION_ARRIVED_LIMIT,
                     "websocket connect arrived limited:" +
-                        Atomics.load(WebSocketConnectionPool.sharedArray, 0)
+                    Atomics.load(WebSocketConnectionPool.sharedArray, 0)
                 );
             }
             Atomics.add(WebSocketConnectionPool.sharedArray, 0, 1);
             logger.info(
                 "getConnection, new connection count:" +
-                    Atomics.load(WebSocketConnectionPool.sharedArray, 0) +
-                    ", connectAddr:" +
-                    connectAddr
+                Atomics.load(WebSocketConnectionPool.sharedArray, 0) +
+                ", connectAddr:" +
+                connectAddr
             );
             return new WebSocketConnector(url, timeout);
         } finally {
@@ -115,14 +115,14 @@ export class WebSocketConnectionPool {
                     }
                     logger.info(
                         "releaseConnection, current connection count:" +
-                            connectors.length
+                        connectors.length
                     );
                 } else {
                     Atomics.add(WebSocketConnectionPool.sharedArray, 0, -1);
                     connector.close();
                     logger.info(
                         "releaseConnection, current connection status fail:" +
-                            Atomics.load(WebSocketConnectionPool.sharedArray, 0)
+                        Atomics.load(WebSocketConnectionPool.sharedArray, 0)
                     );
                 }
             } finally {
@@ -143,9 +143,9 @@ export class WebSocketConnectionPool {
         }
         logger.info(
             "destroyed connect:" +
-                Atomics.load(WebSocketConnectionPool.sharedArray, 0) +
-                " current count:" +
-                num
+            Atomics.load(WebSocketConnectionPool.sharedArray, 0) +
+            " current count:" +
+            num
         );
         Atomics.store(WebSocketConnectionPool.sharedArray, 0, 0);
         this.pool = new Map();
diff --git a/nodejs/src/client/wsEventCallback.ts b/nodejs/src/client/wsEventCallback.ts
@@ -33,7 +33,7 @@ export class WsEventCallback {
     private static _instance?: WsEventCallback;
     private static _msgActionRegister: Map<MessageId, MessageAction> =
         new Map();
-    private constructor() {}
+    private constructor() { }
 
     public static instance(): WsEventCallback {
         if (!WsEventCallback._instance) {
@@ -124,9 +124,9 @@ export class WsEventCallback {
             throw new TDWebSocketClientError(
                 ErrorCode.ERR_WS_NO_CALLBACK,
                 "no callback registered for fetch_block with req_id=" +
-                    msg.req_id +
-                    " action" +
-                    msg.action
+                msg.req_id +
+                " action" +
+                msg.action
             );
         }
     }
diff --git a/nodejs/src/common/config.ts b/nodejs/src/common/config.ts
@@ -22,27 +22,31 @@ export class WSConfig {
     public getToken(): string | undefined | null {
         return this._token;
     }
+
     public setToken(token: string) {
         this._token = token;
     }
 
     public getUser(): string | undefined | null {
         return this._user;
     }
+
     public setUser(user: string) {
         this._user = user;
     }
 
     public getPwd(): string | undefined | null {
         return this._password;
     }
+
     public setPwd(pws: string) {
         this._password = pws;
     }
 
     public getDb(): string | undefined | null {
         return this._db;
     }
+
     public setDb(db: string) {
         this._db = db;
     }
@@ -55,18 +59,22 @@ export class WSConfig {
         this._url = url;
     }
 
-    public setTimeOut(ms: number) {
-        this._timeout = ms;
-    }
     public getTimeOut(): number | undefined | null {
         return this._timeout;
     }
-    public setTimezone(timezone: string) {
-        this._timezone = timezone;
+
+    public setTimeOut(ms: number) {
+        this._timeout = ms;
     }
+
     public getTimezone(): string | undefined | null {
         return this._timezone;
     }
+
+    public setTimezone(timezone: string) {
+        this._timezone = timezone;
+    }
+
     public getMinStmt2Version() {
         return this._minStmt2Version;
     }
diff --git a/nodejs/src/common/constant.ts b/nodejs/src/common/constant.ts
@@ -67,9 +67,9 @@ export enum TDengineTypeCode {
 }
 
 export enum TSDB_OPTION_CONNECTION {
-    TSDB_OPTION_CONNECTION_CHARSET, // charset, Same as the scope supported by the system
+    TSDB_OPTION_CONNECTION_CHARSET,  // charset, Same as the scope supported by the system
     TSDB_OPTION_CONNECTION_TIMEZONE, // timezone, Same as the scope supported by the system
-    TSDB_OPTION_CONNECTION_USER_IP, // user ip
+    TSDB_OPTION_CONNECTION_USER_IP,  // user ip
     TSDB_OPTION_CONNECTION_USER_APP, // user app
 }
 
diff --git a/nodejs/src/common/taosResult.ts b/nodejs/src/common/taosResult.ts
@@ -123,9 +123,11 @@ export class TaosResult {
     public getData(): Array<Array<any>> | null {
         return this._data;
     }
+
     public setData(value: Array<Array<any>> | null) {
         this._data = value;
     }
+
     public getAffectRows(): number | null | undefined {
         return this._affectRows;
     }
@@ -137,9 +139,11 @@ export class TaosResult {
     public getPrecision(): number | null | undefined {
         return this._precision;
     }
+
     public getTotalTime() {
         return this._totalTime;
     }
+
     public addTotalTime(totalTime: number) {
         this._totalTime += totalTime;
     }
diff --git a/nodejs/src/common/wsError.ts b/nodejs/src/common/wsError.ts
@@ -14,11 +14,11 @@ export class TDWebSocketClientError extends Error {
         }
     }
 }
-export class WebSocketQueryError extends TDWebSocketClientError {}
-export class WebSocketInterfaceError extends TDWebSocketClientError {}
-export class WebSocketQueryInterFaceError extends WebSocketInterfaceError {}
-export class TaosResultError extends TDWebSocketClientError {}
-export class TaosError extends TDWebSocketClientError {}
+export class WebSocketQueryError extends TDWebSocketClientError { }
+export class WebSocketInterfaceError extends TDWebSocketClientError { }
+export class WebSocketQueryInterFaceError extends WebSocketInterfaceError { }
+export class TaosResultError extends TDWebSocketClientError { }
+export class TaosError extends TDWebSocketClientError { }
 
 export enum ErrorCode {
     ERR_INVALID_PARAMS = 100,
diff --git a/nodejs/src/index.ts b/nodejs/src/index.ts
@@ -2,7 +2,6 @@ import { WsSql } from "./sql/wsSql";
 import { WSConfig } from "./common/config";
 import { WsConsumer } from "./tmq/wsTmq";
 import logger, { setLevel } from "./common/log";
-
 import { WebSocketConnectionPool } from "./client/wsConnectorPool";
 
 let sqlConnect = async (conf: WSConfig) => {
diff --git a/nodejs/src/sql/wsRows.ts b/nodejs/src/sql/wsRows.ts
@@ -5,7 +5,7 @@ import { WsClient } from "../client/wsClient";
 import logger from "../common/log";
 import { ReqId } from "../common/reqid";
 import { getBinarySql } from "../common/utils";
-import { BinaryQueryMessage, FetchRawBlockMessage } from "../common/constant";
+import { FetchRawBlockMessage } from "../common/constant";
 
 export class WSRows {
     private _wsClient: WsClient;
@@ -107,7 +107,7 @@ export class WSRows {
         let data = this._taosResult.getData();
         if (this._taosResult && data != null) {
             if (Array.isArray(data) && data.length > 0) {
-                return data.pop();
+                return data.shift();
             }
         }
         return undefined;
diff --git a/nodejs/src/sql/wsSql.ts b/nodejs/src/sql/wsSql.ts
@@ -15,7 +15,6 @@ import { ReqId } from "../common/reqid";
 import {
     BinaryQueryMessage,
     FetchRawBlockMessage,
-    MinStmt2Version,
     PrecisionLength,
     TSDB_OPTION_CONNECTION,
 } from "../common/constant";
@@ -27,10 +26,11 @@ import { WsStmt2 } from "../stmt/wsStmt2";
 export class WsSql {
     private wsConfig: WSConfig;
     private _wsClient: WsClient;
+
     constructor(wsConfig: WSConfig) {
         let url = getUrl(wsConfig);
-        this._wsClient = new WsClient(url, wsConfig.getTimeOut());
         this.wsConfig = wsConfig;
+        this._wsClient = new WsClient(url, wsConfig.getTimeOut());
     }
 
     static async open(wsConfig: WSConfig): Promise<WsSql> {
diff --git a/nodejs/src/stmt/wsParams1.ts b/nodejs/src/stmt/wsParams1.ts
diff --git a/nodejs/src/stmt/wsParams2.ts b/nodejs/src/stmt/wsParams2.ts
diff --git a/nodejs/src/stmt/wsProto.ts b/nodejs/src/stmt/wsProto.ts
diff --git a/nodejs/src/tmq/tmqResponse.ts b/nodejs/src/tmq/tmqResponse.ts
diff --git a/nodejs/src/tmq/wsTmq.ts b/nodejs/src/tmq/wsTmq.ts
diff --git a/nodejs/test/bulkPulling/queryTables.test.ts b/nodejs/test/bulkPulling/queryTables.test.ts
diff --git a/nodejs/test/bulkPulling/sql.test.ts b/nodejs/test/bulkPulling/sql.test.ts

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,6 @@ export class WsClient {`
`347`	`347`	`this._wsConnector`
`348`	`348`	`);`
`349`	`349`	`this._wsConnector = undefined;`
`350`		`- // this._wsConnector.close();`
`351`	`350`	`}`
`352`	`351`	`}`
`353`	`352`
Original file line number	Diff line number	Diff line change
`@@ -22,27 +22,31 @@ export class WSConfig {`
`22`	`22`	`public getToken(): string \| undefined \| null {`
`23`	`23`	`return this._token;`
`24`	`24`	`}`
	`25`	`+`
`25`	`26`	`public setToken(token: string) {`
`26`	`27`	`this._token = token;`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`public getUser(): string \| undefined \| null {`
`30`	`31`	`return this._user;`
`31`	`32`	`}`
	`33`	`+`
`32`	`34`	`public setUser(user: string) {`
`33`	`35`	`this._user = user;`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`public getPwd(): string \| undefined \| null {`
`37`	`39`	`return this._password;`
`38`	`40`	`}`
	`41`	`+`
`39`	`42`	`public setPwd(pws: string) {`
`40`	`43`	`this._password = pws;`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`public getDb(): string \| undefined \| null {`
`44`	`47`	`return this._db;`
`45`	`48`	`}`
	`49`	`+`
`46`	`50`	`public setDb(db: string) {`
`47`	`51`	`this._db = db;`
`48`	`52`	`}`
`@@ -55,18 +59,22 @@ export class WSConfig {`
`55`	`59`	`this._url = url;`
`56`	`60`	`}`
`57`	`61`
`58`		`- public setTimeOut(ms: number) {`
`59`		`- this._timeout = ms;`
`60`		`- }`
`61`	`62`	`public getTimeOut(): number \| undefined \| null {`
`62`	`63`	`return this._timeout;`
`63`	`64`	`}`
`64`		`- public setTimezone(timezone: string) {`
`65`		`- this._timezone = timezone;`
	`65`	`+`
	`66`	`+ public setTimeOut(ms: number) {`
	`67`	`+ this._timeout = ms;`
`66`	`68`	`}`
	`69`	`+`
`67`	`70`	`public getTimezone(): string \| undefined \| null {`
`68`	`71`	`return this._timezone;`
`69`	`72`	`}`
	`73`	`+`
	`74`	`+ public setTimezone(timezone: string) {`
	`75`	`+ this._timezone = timezone;`
	`76`	`+ }`
	`77`	`+`
`70`	`78`	`public getMinStmt2Version() {`
`71`	`79`	`return this._minStmt2Version;`
`72`	`80`	`}`