@tdengine/websocket 3.1.9 → 3.2.1

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

@@ -4,44 +4,44 @@ const wsConnectorPool_1 = require("../../src/client/wsConnectorPool");
 const config_1 = require("../../src/common/config");
 const wsProto_1 = require("../../src/sql/wsProto");
 const wsSql_1 = require("../../src/sql/wsSql");
-let dns = 'ws://localhost:6041';
+let dns = "ws://localhost:6041";
 beforeAll(async () => {
     let conf = new config_1.WSConfig(dns);
-    conf.setUser('root');
-    conf.setPwd('taosdata');
+    conf.setUser("root");
+    conf.setPwd("taosdata");
     let wsSql = await wsSql_1.WsSql.open(conf);
-    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.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()', () => {
+describe("TDWebSocket.WsSchemaless()", () => {
     jest.setTimeout(20 * 1000);
-    let influxdbData = "st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000";
+    let influxdbData = 'st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"passit",c2=false,c4=4f64 1626006833639000000';
     let telnetData = "stb0_0 1626006833 4 host=host0 interface=eth0";
-    let jsonData = "{\"metric\": \"meter_current\",\"timestamp\": 1626846400,\"value\": 10.3, \"tags\": {\"groupid\": 2, \"location\": \"California.SanFrancisco\", \"id\": \"d1001\"}}";
-    test('normal connect', async () => {
+    let jsonData = '{"metric": "meter_current","timestamp": 1626846400,"value": 10.3, "tags": {"groupid": 2, "location": "California.SanFrancisco", "id": "d1001"}}';
+    test("normal connect", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
-        conf.setDb('power_schemaless');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
+        conf.setDb("power_schemaless");
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         await wsSchemaless.close();
     });
-    test('connect db with error', async () => {
+    test("connect db with error", async () => {
         expect.assertions(1);
         let wsSchemaless = null;
         try {
             let conf = new config_1.WSConfig(dns);
-            conf.setUser('root');
-            conf.setPwd('taosdata');
-            conf.setDb('jest');
+            conf.setUser("root");
+            conf.setPwd("taosdata");
+            conf.setDb("jest");
             wsSchemaless = await wsSql_1.WsSql.open(conf);
         }
         catch (e) {
             console.log(e);
-            expect(e.message).toMatch('Database not exist');
+            expect(e.message).toMatch("Database not exist");
         }
         finally {
             if (wsSchemaless) {
@@ -49,11 +49,11 @@ describe('TDWebSocket.WsSchemaless()', () => {
             }
         }
     });
-    test('normal insert', async () => {
+    test("normal insert", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
-        conf.setDb('power_schemaless');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
+        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);
@@ -61,11 +61,11 @@ describe('TDWebSocket.WsSchemaless()', () => {
         await wsSchemaless.schemalessInsert([jsonData], wsProto_1.SchemalessProto.OpenTSDBJsonFormatProtocol, wsProto_1.Precision.SECONDS, 0);
         await wsSchemaless.close();
     });
-    test('normal wsSql insert', async () => {
+    test("normal wsSql insert", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
-        conf.setDb('power_schemaless');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
+        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);
@@ -74,28 +74,28 @@ describe('TDWebSocket.WsSchemaless()', () => {
         await wsSchemaless.schemalessInsert([jsonData], wsProto_1.SchemalessProto.OpenTSDBJsonFormatProtocol, wsProto_1.Precision.SECONDS, 0);
         await wsSchemaless.close();
     });
-    test('SchemalessProto error', async () => {
+    test("SchemalessProto error", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
-        conf.setDb('power_schemaless');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
+        conf.setDb("power_schemaless");
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         try {
             await wsSchemaless.schemalessInsert([influxdbData], wsProto_1.SchemalessProto.OpenTSDBTelnetLineProtocol, wsProto_1.Precision.NANO_SECONDS, 0);
         }
         catch (e) {
-            expect(e.message).toMatch('parse timestamp failed');
+            expect(e.message).toMatch("parse timestamp failed");
         }
         await wsSchemaless.close();
     });
 });
 afterAll(async () => {
     let conf = new config_1.WSConfig(dns);
-    conf.setUser('root');
-    conf.setPwd('taosdata');
+    conf.setUser("root");
+    conf.setPwd("taosdata");
     let wsSql = await wsSql_1.WsSql.open(conf);
-    await wsSql.exec('drop database if exists power_schemaless;');
+    await wsSql.exec("drop database if exists power_schemaless;");
     await wsSql.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });

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

@@ -5,49 +5,51 @@ const config_1 = require("../../src/common/config");
 const wsSql_1 = require("../../src/sql/wsSql");
 const utils_1 = require("../utils");
 const log_1 = require("../../src/common/log");
-let dns = 'ws://localhost:6041';
-let password1 = 'Ab1!@#$%,.:?<>;~';
-let password2 = 'Bc%^&*()-_+=[]{}';
+let dns = "ws://localhost:6041";
+let password1 = "Ab1!@#$%,.:?<>;~";
+let password2 = "Bc%^&*()-_+=[]{}";
 (0, log_1.setLevel)("debug");
 beforeAll(async () => {
     let conf = new config_1.WSConfig(dns);
-    conf.setUser('root');
-    conf.setPwd('taosdata');
+    conf.setUser("root");
+    conf.setPwd("taosdata");
     let wsSql = await wsSql_1.WsSql.open(conf);
+    await wsSql.exec("drop database if exists sql_test");
+    await wsSql.exec("drop database if exists sql_create");
     await wsSql.exec(`CREATE USER user1 PASS '${password1}'`);
     await wsSql.exec(`CREATE USER user2 PASS '${password2}'`);
-    await wsSql.exec('create database if not exists sql_test KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
+    await wsSql.exec("create database if not exists sql_test KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;");
     await (0, utils_1.Sleep)(100);
-    await wsSql.exec('use sql_test');
-    await wsSql.exec('CREATE STABLE if not exists meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
+    await wsSql.exec("use sql_test");
+    await wsSql.exec("CREATE STABLE if not exists meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);");
     await wsSql.close();
 });
-describe('TDWebSocket.WsSql()', () => {
+describe("TDWebSocket.WsSql()", () => {
     jest.setTimeout(20 * 1000);
-    test('normal connect', async () => {
+    test("normal connect", async () => {
         let wsSql = null;
-        let conf = new config_1.WSConfig('');
+        let conf = new config_1.WSConfig("");
         conf.setUrl(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
-        conf.setDb('sql_test');
-        conf.setTimezone('America/New_York');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
+        conf.setDb("sql_test");
+        conf.setTimezone("America/New_York");
         conf.setTimeOut(6000);
         wsSql = await wsSql_1.WsSql.open(conf);
         expect(wsSql.state()).toBeGreaterThan(0);
-        let wsRows = await wsSql.query('select timezone()');
+        let wsRows = await wsSql.query("select timezone()");
         while (await wsRows.next()) {
             let result = wsRows.getData();
             console.log(result);
             expect(result).toBeTruthy();
-            expect(JSON.stringify(result)).toContain('America/New_York');
+            expect(JSON.stringify(result)).toContain("America/New_York");
         }
         await wsSql.close();
     });
-    test('special characters connect1', async () => {
+    test("special characters connect1", async () => {
         let wsSql = null;
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('user1');
+        conf.setUser("user1");
         conf.setPwd(password1);
         wsSql = await wsSql_1.WsSql.open(conf);
         expect(wsSql.state()).toBeGreaterThan(0);
@@ -56,10 +58,10 @@ describe('TDWebSocket.WsSql()', () => {
         expect(version).not.toBeUndefined();
         await wsSql.close();
     });
-    test('special characters connect2', async () => {
+    test("special characters connect2", async () => {
         let wsSql = null;
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('user2');
+        conf.setUser("user2");
         conf.setPwd(password2);
         wsSql = await wsSql_1.WsSql.open(conf);
         expect(wsSql.state()).toBeGreaterThan(0);
@@ -68,19 +70,19 @@ describe('TDWebSocket.WsSql()', () => {
         expect(version).not.toBeUndefined();
         await wsSql.close();
     });
-    test('connect db with error', async () => {
+    test("connect db with error", async () => {
         expect.assertions(1);
         let wsSql = null;
         try {
             let conf = new config_1.WSConfig(dns);
-            conf.setUser('root');
-            conf.setPwd('taosdata');
-            conf.setDb('jest');
+            conf.setUser("root");
+            conf.setPwd("taosdata");
+            conf.setDb("jest");
             wsSql = await wsSql_1.WsSql.open(conf);
         }
         catch (e) {
             let err = e;
-            expect(err.message).toMatch('Database not exist');
+            expect(err.message).toMatch("Database not exist");
         }
         finally {
             if (wsSql) {
@@ -88,90 +90,90 @@ describe('TDWebSocket.WsSql()', () => {
             }
         }
     });
-    test('connect url', async () => {
-        let url = 'ws://root:taosdata@localhost:6041/information_schema?timezone=Asia/Shanghai';
+    test("connect url", async () => {
+        let url = "ws://root:taosdata@localhost:6041/information_schema?timezone=Asia/Shanghai";
         let conf = new config_1.WSConfig(url);
         let wsSql = await wsSql_1.WsSql.open(conf);
         let version = await wsSql.version();
         console.log(version);
         expect(version).toBeTruthy();
-        let wsRows = await wsSql.query('select timezone()');
+        let wsRows = await wsSql.query("select timezone()");
         while (await wsRows.next()) {
             let result = wsRows.getData();
             console.log(result);
             expect(result).toBeTruthy();
-            expect(JSON.stringify(result)).toContain('Asia/Shanghai');
+            expect(JSON.stringify(result)).toContain("Asia/Shanghai");
         }
         await wsSql.close();
     });
-    test('get taosc version', async () => {
+    test("get taosc version", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
         let wsSql = await wsSql_1.WsSql.open(conf);
         let version = await wsSql.version();
         await wsSql.close();
         console.log(version);
         expect(version).toBeTruthy();
     });
-    test('show databases', async () => {
+    test("show databases", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
         let wsSql = await wsSql_1.WsSql.open(conf);
-        let taosResult = await wsSql.exec('show databases');
+        let taosResult = await wsSql.exec("show databases");
         await wsSql.close();
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
     });
-    test('create databases', async () => {
+    test("create databases", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
         let wsSql = await wsSql_1.WsSql.open(conf);
-        let taosResult = await wsSql.exec('create database if not exists sql_create KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
+        let taosResult = await wsSql.exec("create database if not exists sql_create KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;");
         await wsSql.close();
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
     });
-    test('create stable', async () => {
+    test("create stable", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
         let wsSql = await wsSql_1.WsSql.open(conf);
-        let taosResult = await wsSql.exec('use sql_test');
+        let taosResult = await wsSql.exec("use sql_test");
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
-        taosResult = await wsSql.exec('CREATE STABLE if not exists meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
+        taosResult = await wsSql.exec("CREATE STABLE if not exists meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);");
         await wsSql.close();
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
     });
-    test('insert recoder', async () => {
+    test("insert recoder", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
         let wsSql = await wsSql_1.WsSql.open(conf);
-        let taosResult = await wsSql.exec('use sql_test');
+        let taosResult = await wsSql.exec("use sql_test");
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
-        taosResult = await wsSql.exec('describe meters');
+        taosResult = await wsSql.exec("describe meters");
         console.log(taosResult);
         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 () => {
+    test("query sql", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
         let wsSql = await wsSql_1.WsSql.open(conf);
-        let taosResult = await wsSql.exec('use sql_test');
+        let taosResult = await wsSql.exec("use sql_test");
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
         for (let i = 0; i < 10; i++) {
-            let wsRows = await wsSql.query('select * from meters limit 3');
+            let wsRows = await wsSql.query("select * from meters limit 3");
             expect(wsRows).toBeTruthy();
             let meta = wsRows.getMeta();
             expect(meta).toBeTruthy();
@@ -184,27 +186,67 @@ describe('TDWebSocket.WsSql()', () => {
         }
         await wsSql.close();
     });
-    test('query sql no getdata', async () => {
+    test("query sql no getdata", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
         let wsSql = await wsSql_1.WsSql.open(conf);
-        let taosResult = await wsSql.exec('use sql_test');
+        let taosResult = await wsSql.exec("use sql_test");
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
-        let wsRows = await wsSql.query('select * from meters');
+        let wsRows = await wsSql.query("select * from meters");
         await wsRows.close();
         await wsSql.close();
     });
+    test("timestamp order check", async () => {
+        const conf = new config_1.WSConfig(dns);
+        conf.setUser("root");
+        conf.setPwd("taosdata");
+        const wsSql = await wsSql_1.WsSql.open(conf);
+        await wsSql.exec("use sql_test");
+        await wsSql.exec("drop table if exists t_order");
+        await wsSql.exec("create table t_order (ts timestamp, c1 int)");
+        await wsSql.exec("insert into t_order values (1726803356466, 1)");
+        await wsSql.exec("insert into t_order values (1726803357466, 2)");
+        await wsSql.exec("insert into t_order values (1726803358466, 3)");
+        const expectRowsAsc = [
+            [1726803356466n, 1],
+            [1726803357466n, 2],
+            [1726803358466n, 3],
+        ];
+        const expectRowsDesc = expectRowsAsc.slice().reverse();
+        const actualRowsAsc = [];
+        const actualRowsDesc = [];
+        const rowsAsc = await wsSql.query("select * from t_order order by ts asc");
+        while (await rowsAsc.next()) {
+            const data = rowsAsc.getData();
+            if (!data)
+                break;
+            actualRowsAsc.push(data);
+        }
+        await rowsAsc.close();
+        expect(actualRowsAsc).toEqual(expectRowsAsc);
+        const rowsDesc = await wsSql.query("select * from t_order order by ts desc");
+        while (await rowsDesc.next()) {
+            const data = rowsDesc.getData();
+            if (!data)
+                break;
+            actualRowsDesc.push(data);
+        }
+        await rowsDesc.close();
+        expect(actualRowsDesc).toEqual(expectRowsDesc);
+        await wsSql.close();
+    });
 });
 afterAll(async () => {
     let conf = new config_1.WSConfig(dns);
-    conf.setUser('root');
-    conf.setPwd('taosdata');
+    conf.setUser("root");
+    conf.setPwd("taosdata");
     let wsSql = await wsSql_1.WsSql.open(conf);
-    await wsSql.exec('drop database sql_test');
-    await wsSql.exec('DROP USER user1;');
-    await wsSql.exec('DROP USER user2;');
+    await wsSql.exec("drop database sql_test");
+    await wsSql.exec("drop database sql_create");
+    await wsSql.exec("DROP USER user1;");
+    await wsSql.exec("DROP USER user2;");
     await wsSql.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });

package/lib/test/bulkPulling/stmt1.func.test.d.ts

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

package/lib/test/bulkPulling/stmt1.func.test.d.ts.map

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