From 63d62fdfd320fcc273b35e07566073d2e2445712 Mon Sep 17 00:00:00 2001 From: menshibin Date: Wed, 25 Sep 2024 15:29:34 +0800 Subject: [PATCH] modify node ci example --- .../node/websocketexample/all_type_query.js | 9 ++------- .../node/websocketexample/all_type_stmt.js | 16 ++++------------ .../node/websocketexample/json_line_example.js | 13 ++++++++----- .../node/websocketexample/line_example.js | 10 ++++++++-- .../node/websocketexample/nodejsChecker.js | 6 +++++- .../node/websocketexample/sql_example.js | 17 ++++++----------- .../node/websocketexample/stmt_example.js | 12 +++++++++--- .../websocketexample/telnet_line_example.js | 9 +++++++-- .../node/websocketexample/tmq_example.js | 8 ++++++-- .../node/websocketexample/tmq_seek_example.js | 9 +++++++-- tests/docs-examples-test/node.sh | 2 ++ tests/docs-examples-test/python.sh | 2 +- 12 files changed, 65 insertions(+), 48 deletions(-) diff --git a/docs/examples/node/websocketexample/all_type_query.js b/docs/examples/node/websocketexample/all_type_query.js index c628b2f7b4..6524d35718 100644 --- a/docs/examples/node/websocketexample/all_type_query.js +++ b/docs/examples/node/websocketexample/all_type_query.js @@ -92,13 +92,8 @@ async function all_type_example() { } async function test() { - try { - await json_tag_example() - await all_type_example() - } catch (err) { - process.exitCode = 1; - } - + await json_tag_example() + await all_type_example() taos.destroy(); } diff --git a/docs/examples/node/websocketexample/all_type_stmt.js b/docs/examples/node/websocketexample/all_type_stmt.js index d4f0380621..f095bee090 100644 --- a/docs/examples/node/websocketexample/all_type_stmt.js +++ b/docs/examples/node/websocketexample/all_type_stmt.js @@ -138,18 +138,10 @@ async function all_type_example() { } - - -async function test() { - try { - taos.setLevel("debug") - await json_tag_example() - await all_type_example() - taos.destroy(); - } catch(e) { - process.exitCode = 1 - } - +async function test() { + await json_tag_example() + await all_type_example() + taos.destroy(); } test() diff --git a/docs/examples/node/websocketexample/json_line_example.js b/docs/examples/node/websocketexample/json_line_example.js index 42fd3f175e..df172278fa 100644 --- a/docs/examples/node/websocketexample/json_line_example.js +++ b/docs/examples/node/websocketexample/json_line_example.js @@ -10,9 +10,8 @@ for(var i = 2; i < global.process.argv.length; i++){ } if(host == null){ - console.log("Usage: node nodejsChecker.js host= port="); - process.exit(0); - } + host = 'localhost' +} let dbData = ["{\"metric\": \"meter_current\",\"timestamp\": 1626846402,\"value\": 10.3, \"tags\": {\"groupid\": 2, \"location\": \"California.SanFrancisco\", \"id\": \"d1001\"}}", "{\"metric\": \"meter_current\",\"timestamp\": 1626846403,\"value\": 10.3, \"tags\": {\"groupid\": 2, \"location\": \"California.SanFrancisco\", \"id\": \"d1002\"}}", @@ -27,7 +26,7 @@ async function createConnect() { return await taos.sqlConnect(conf); } -async function test() { +async function schemalessInsert() { let wsSql = null; let wsRows = null; let reqId = 0; @@ -38,7 +37,7 @@ async function test() { } catch (err) { console.error(err.code, err.message); - process.exitCode = 1; + throw err } finally { if (wsRows) { @@ -51,4 +50,8 @@ async function test() { } } +async function test() { + await schemalessInsert(); +} + test() \ No newline at end of file diff --git a/docs/examples/node/websocketexample/line_example.js b/docs/examples/node/websocketexample/line_example.js index 8934807c75..d4e052538b 100644 --- a/docs/examples/node/websocketexample/line_example.js +++ b/docs/examples/node/websocketexample/line_example.js @@ -15,7 +15,8 @@ async function createConnect() { return wsSql; } -async function test() { + +async function schemalessInsert() { let wsSql = null; let wsRows = null; let ttl = 0; @@ -28,7 +29,7 @@ async function test() { } catch (err) { console.error(`Failed to insert data with schemaless, ErrCode: ${err.code}, ErrMessage: ${err.message}`); - process.exitCode = 1; + throw err; } finally { if (wsRows) { @@ -40,4 +41,9 @@ async function test() { taos.destroy(); } } + +async function test() { + await schemalessInsert(); +} + test() diff --git a/docs/examples/node/websocketexample/nodejsChecker.js b/docs/examples/node/websocketexample/nodejsChecker.js index 2db8cac3af..2525ba18e0 100644 --- a/docs/examples/node/websocketexample/nodejsChecker.js +++ b/docs/examples/node/websocketexample/nodejsChecker.js @@ -22,7 +22,7 @@ async function createConnect() { return await taos.sqlConnect(conf); } -async function test() { +async function execSql() { let wsSql = null; let wsRows = null; let reqId = 0; @@ -73,4 +73,8 @@ async function test() { } } +async function test() { + await execSql(); +} + test() \ No newline at end of file diff --git a/docs/examples/node/websocketexample/sql_example.js b/docs/examples/node/websocketexample/sql_example.js index b7b2d4a23d..c759162136 100644 --- a/docs/examples/node/websocketexample/sql_example.js +++ b/docs/examples/node/websocketexample/sql_example.js @@ -63,7 +63,7 @@ async function insertData() { "power.d1002 USING power.meters TAGS('California.SanFrancisco', 3) " + "VALUES " + "(NOW + 1a, 10.30000, 218, 0.25000) "; - + try { wsSql = await createConnect(); taosResult = await wsSql.exec(insertQuery); @@ -136,16 +136,11 @@ async function sqlWithReqid() { // ANCHOR_END: sqlWithReqid async function test() { - try { - await createDbAndTable(); - await insertData(); - await queryData(); - await sqlWithReqid(); - taos.destroy(); - } catch(e) { - process.exitCode = 1; - } - + await createDbAndTable(); + await insertData(); + await queryData(); + await sqlWithReqid(); + taos.destroy(); } test() diff --git a/docs/examples/node/websocketexample/stmt_example.js b/docs/examples/node/websocketexample/stmt_example.js index cdd9cd6a15..7dcc777b75 100644 --- a/docs/examples/node/websocketexample/stmt_example.js +++ b/docs/examples/node/websocketexample/stmt_example.js @@ -23,7 +23,7 @@ async function prepare() { return wsSql } -(async () => { +async function stmtInsert() { let stmt = null; let connector = null; try { @@ -60,7 +60,7 @@ async function prepare() { } catch (err) { console.error(`Failed to insert to table meters using stmt, ErrCode: ${err.code}, ErrMessage: ${err.message}`); - process.exitCode = 1; + throw err; } finally { if (stmt) { @@ -71,4 +71,10 @@ async function prepare() { } taos.destroy(); } -})(); +} + +async function test () { + await stmtInsert(); +} + +test() \ No newline at end of file diff --git a/docs/examples/node/websocketexample/telnet_line_example.js b/docs/examples/node/websocketexample/telnet_line_example.js index a2b0cc0c38..dd249a93ee 100644 --- a/docs/examples/node/websocketexample/telnet_line_example.js +++ b/docs/examples/node/websocketexample/telnet_line_example.js @@ -32,7 +32,7 @@ async function createConnect() { return await taos.sqlConnect(conf); } -async function test() { +async function schemalessInsert() { let wsSql = null; let wsRows = null; let reqId = 0; @@ -56,4 +56,9 @@ async function test() { taos.destroy(); } } -test() \ No newline at end of file + +async function test() { + await schemalessInsert(); + } + + test() \ No newline at end of file diff --git a/docs/examples/node/websocketexample/tmq_example.js b/docs/examples/node/websocketexample/tmq_example.js index 3250b1aba3..d020b4e27a 100644 --- a/docs/examples/node/websocketexample/tmq_example.js +++ b/docs/examples/node/websocketexample/tmq_example.js @@ -77,7 +77,7 @@ async function subscribe(consumer) { // ANCHOR_END: commit } -async function test() { +async function consumer() { // ANCHOR: unsubscribe let consumer = null; try { @@ -89,7 +89,7 @@ async function test() { } catch (err) { console.error(`Failed to unsubscribe consumer, topic: ${topic}, groupId: ${groupId}, clientId: ${clientId}, ErrCode: ${err.code}, ErrMessage: ${err.message}`); - process.exitCode = 1; + throw err; } finally { if (consumer) { @@ -101,4 +101,8 @@ async function test() { // ANCHOR_END: unsubscribe } +async function test() { + await consumer(); +} + test() diff --git a/docs/examples/node/websocketexample/tmq_seek_example.js b/docs/examples/node/websocketexample/tmq_seek_example.js index a5ef783ef9..8cfc487733 100644 --- a/docs/examples/node/websocketexample/tmq_seek_example.js +++ b/docs/examples/node/websocketexample/tmq_seek_example.js @@ -72,7 +72,7 @@ async function subscribe(consumer) { // ANCHOR_END: subscribe // ANCHOR: offset -async function test() { +async function consumer() { let consumer = null; try { await prepare(); @@ -89,7 +89,7 @@ async function test() { } catch (err) { console.error(`Failed to seek offset, topic: ${topic}, groupId: ${groupId}, clientId: ${clientId}, ErrCode: ${err.code}, ErrMessage: ${err.message}`); - process.exitCode = 1; + throw err; } finally { if (consumer) { @@ -99,4 +99,9 @@ async function test() { } } // ANCHOR_END: offset + +async function test() { + await consumer(); + } + test() diff --git a/tests/docs-examples-test/node.sh b/tests/docs-examples-test/node.sh index b1291c2c03..fcb7763adb 100644 --- a/tests/docs-examples-test/node.sh +++ b/tests/docs-examples-test/node.sh @@ -5,6 +5,8 @@ set -e pgrep taosd || taosd >> /dev/null 2>&1 & pgrep taosadapter || taosadapter >> /dev/null 2>&1 & +sleep 10 + cd ../../docs/examples/node npm install diff --git a/tests/docs-examples-test/python.sh b/tests/docs-examples-test/python.sh index 8426beae36..5ee16c7899 100644 --- a/tests/docs-examples-test/python.sh +++ b/tests/docs-examples-test/python.sh @@ -86,7 +86,7 @@ pip3 install kafka-python python3 kafka_example_consumer.py # 21 -pip3 install taos-ws-py==0.3.1 +pip3 install taos-ws-py==0.3.3 python3 conn_websocket_pandas.py # 22