From 44df51f98f2c95700c447feb6d329a1e3c4ff548 Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Thu, 11 Aug 2022 20:56:31 +0800 Subject: [PATCH] enh: show command optimize --- tests/pytest/account/account_create.py | 4 ++-- tests/script/tmp/data.sim | 6 ++--- tests/script/tmp/monitor.sim | 2 +- tests/script/tmp/r1.sim | 2 +- .../arbitrator/check_cluster_cfg_para.sim | 4 ++-- .../arbitrator/dn2_mn1_cache_file_sync.sim | 4 ++-- .../dn2_mn1_cache_file_sync_second.sim | 2 +- ...3_mn1_nw_disable_timeout_autoDropDnode.sim | 6 ++--- .../arbitrator/dn3_mn1_r2_vnode_delDir.sim | 8 +++---- .../arbitrator/dn3_mn1_r3_vnode_delDir.sim | 8 +++---- .../dn3_mn1_replica2_wal1_AddDelDnode.sim | 8 +++---- .../arbitrator/dn3_mn1_replica_change.sim | 8 +++---- .../dn3_mn1_replica_change_dropDnod.sim | 2 +- .../arbitrator/dn3_mn1_stopDnode_timeout.sim | 10 ++++---- .../arbitrator/dn3_mn1_vnode_change.sim | 8 +++---- .../dn3_mn1_vnode_corruptFile_offline.sim | 10 ++++---- .../dn3_mn1_vnode_corruptFile_online.sim | 10 ++++---- .../dn3_mn1_vnode_createErrData_online.sim | 6 ++--- .../arbitrator/dn3_mn1_vnode_delDir.sim | 12 +++++----- .../dn3_mn1_vnode_noCorruptFile_offline.sim | 10 ++++---- .../arbitrator/dn3_mn1_vnode_nomaster.sim | 4 ++-- .../arbitrator/insert_duplicationTs.sim | 4 ++-- .../offline_replica2_alterTable_online.sim | 4 ++-- .../offline_replica2_alterTag_online.sim | 4 ++-- .../offline_replica2_createTable_online.sim | 4 ++-- .../offline_replica2_dropDb_online.sim | 2 +- .../offline_replica2_dropTable_online.sim | 4 ++-- .../offline_replica3_alterTable_online.sim | 4 ++-- .../offline_replica3_alterTag_online.sim | 4 ++-- .../offline_replica3_createTable_online.sim | 4 ++-- .../offline_replica3_dropDb_online.sim | 2 +- .../offline_replica3_dropTable_online.sim | 4 ++-- .../replica_changeWithArbitrator.sim | 4 ++-- .../sync_replica2_alterTable_add.sim | 2 +- .../sync_replica2_alterTable_drop.sim | 2 +- .../arbitrator/sync_replica2_dropDb.sim | 2 +- .../arbitrator/sync_replica2_dropTable.sim | 2 +- .../sync_replica3_alterTable_add.sim | 2 +- .../sync_replica3_alterTable_drop.sim | 2 +- .../arbitrator/sync_replica3_createTable.sim | 2 +- ...ca3_dnodeChang_DropAddAlterTableDropDb.sim | 8 +++---- .../arbitrator/sync_replica3_dropDb.sim | 2 +- .../arbitrator/sync_replica3_dropTable.sim | 2 +- .../backup/clusterSimCase/cluster_main.sim | 2 +- tests/script/tsim/bnode/basic1.sim | 6 ++--- tests/script/tsim/db/alter_option.sim | 2 +- tests/script/tsim/db/alter_replica_13.sim | 8 +++---- tests/script/tsim/db/alter_replica_31.sim | 6 ++--- tests/script/tsim/db/basic1.sim | 4 ++-- tests/script/tsim/db/commit.sim | 2 +- tests/script/tsim/db/create_all_options.sim | 2 +- tests/script/tsim/db/error1.sim | 2 +- tests/script/tsim/dnode/balance1.sim | 22 ++++++++--------- tests/script/tsim/dnode/balance2.sim | 12 +++++----- tests/script/tsim/dnode/balance3.sim | 18 +++++++------- tests/script/tsim/dnode/balance_replica1.sim | 4 ++-- tests/script/tsim/dnode/balance_replica3.sim | 4 ++-- tests/script/tsim/dnode/balancex.sim | 14 +++++------ tests/script/tsim/dnode/create_dnode.sim | 6 ++--- .../tsim/dnode/drop_dnode_has_mnode.sim | 8 +++---- .../drop_dnode_has_multi_vnode_replica1.sim | 8 +++---- .../drop_dnode_has_multi_vnode_replica3.sim | 8 +++---- .../tsim/dnode/drop_dnode_has_qnode_snode.sim | 6 ++--- .../dnode/drop_dnode_has_vnode_replica1.sim | 10 ++++---- .../dnode/drop_dnode_has_vnode_replica3.sim | 8 +++---- tests/script/tsim/dnode/offline_reason.sim | 16 ++++++------- .../dnode/redistribute_vgroup_replica1.sim | 4 ++-- ...distribute_vgroup_replica3_v1_follower.sim | 4 ++-- ...redistribute_vgroup_replica3_v1_leader.sim | 4 ++-- .../dnode/redistribute_vgroup_replica3_v2.sim | 4 ++-- .../dnode/redistribute_vgroup_replica3_v3.sim | 4 ++-- tests/script/tsim/dnode/use_dropped_dnode.sim | 6 ++--- tests/script/tsim/dnode/vnode_clean.sim | 24 +++++++++---------- tests/script/tsim/mnode/basic1.sim | 4 ++-- tests/script/tsim/mnode/basic2.sim | 10 ++++---- tests/script/tsim/mnode/basic3.sim | 16 ++++++------- tests/script/tsim/mnode/basic4.sim | 4 ++-- tests/script/tsim/mnode/basic5.sim | 14 +++++------ .../tsim/parser/fourArithmetic-basic.sim | 2 +- tests/script/tsim/qnode/basic1.sim | 8 +++---- .../script/tsim/query/charScalarFunction.sim | 2 +- tests/script/tsim/query/complex_group.sim | 2 +- tests/script/tsim/query/complex_having.sim | 2 +- tests/script/tsim/query/complex_limit.sim | 2 +- tests/script/tsim/query/complex_select.sim | 2 +- tests/script/tsim/query/complex_where.sim | 2 +- tests/script/tsim/query/interval-offset.sim | 2 +- tests/script/tsim/query/scalarFunction.sim | 2 +- tests/script/tsim/query/session.sim | 2 +- tests/script/tsim/query/stddev.sim | 2 +- tests/script/tsim/query/time_process.sim | 2 +- tests/script/tsim/show/basic.sim | 12 +++++----- tests/script/tsim/sma/drop_sma.sim | 2 +- tests/script/tsim/snode/basic1.sim | 8 +++---- tests/script/tsim/stable/dnode3.sim | 2 +- .../tsim/stream/distributeInterval0.sim | 2 +- .../stream/distributeIntervalRetrive0.sim | 2 +- .../script/tsim/stream/distributeSession0.sim | 2 +- tests/script/tsim/stream/drop_stream.sim | 2 +- .../script/tsim/stream/ignoreExpiredData.sim | 2 +- tests/script/tsim/sync/3Replica1VgElect.sim | 6 ++--- tests/script/tsim/sync/3Replica5VgElect.sim | 6 ++--- .../tsim/sync/3Replica5VgElect3mnode.sim | 6 ++--- .../tsim/sync/3Replica5VgElect3mnodedrop.sim | 8 +++---- tests/script/tsim/sync/electTest.sim | 2 +- .../script/tsim/sync/mnodeLeaderTransfer.sim | 4 ++-- tests/script/tsim/sync/oneReplica1VgElect.sim | 2 +- .../sync/oneReplica1VgElectWithInsert.sim | 2 +- tests/script/tsim/sync/oneReplica5VgElect.sim | 4 ++-- .../script/tsim/sync/threeReplica1VgElect.sim | 2 +- .../sync/threeReplica1VgElectWihtInsert.sim | 2 +- tests/script/tsim/sync/vnode-insert.sim | 2 +- .../script/tsim/sync/vnodeLeaderTransfer.sim | 2 +- .../script/tsim/sync/vnodeLogAnalyzeTest.sim | 2 +- .../tsim/sync/vnodesnapshot-rsma-test.sim | 2 +- tests/script/tsim/sync/vnodesnapshot-test.sim | 2 +- tests/script/tsim/sync/vnodesnapshot.sim | 2 +- tests/script/tsim/trans/create_db.sim | 6 ++--- tests/script/tsim/trans/lossdata1.sim | 4 ++-- tests/script/tsim/user/basic.sim | 18 +++++++------- tests/script/tsim/user/password.sim | 8 +++---- tests/script/tsim/user/privilege_db.sim | 4 ++-- tests/script/tsim/user/privilege_sysinfo.sim | 4 ++-- tests/script/tsim/valgrind/basic1.sim | 4 ++-- tests/script/tsim/valgrind/basic2.sim | 4 ++-- tests/script/tsim/valgrind/basic3.sim | 4 ++-- tests/script/tsim/valgrind/basic4.sim | 4 ++-- tests/script/tsim/valgrind/checkError1.sim | 10 ++++---- tests/script/tsim/valgrind/checkError2.sim | 4 ++-- tests/script/tsim/valgrind/checkError3.sim | 4 ++-- tests/script/tsim/valgrind/checkError4.sim | 4 ++-- tests/script/tsim/valgrind/checkError5.sim | 4 ++-- tests/script/tsim/valgrind/checkError6.sim | 4 ++-- tests/script/tsim/vnode/replica3_basic.sim | 2 +- tests/script/tsim/vnode/replica3_import.sim | 2 +- tests/script/tsim/vnode/replica3_many.sim | 2 +- tests/script/tsim/vnode/replica3_repeat.sim | 2 +- tests/script/tsim/vnode/replica3_vgroup.sim | 2 +- .../tsim/vnode/stable_balance_replica1.sim | 6 ++--- tests/script/tsim/vnode/stable_dnode2.sim | 2 +- .../script/tsim/vnode/stable_dnode2_stop.sim | 6 ++--- tests/script/tsim/vnode/stable_dnode3.sim | 2 +- .../tsim/vnode/stable_replica3_dnode6.sim | 4 ++-- .../tsim/vnode/stable_replica3_vnode3.sim | 2 +- tests/system-test/0-others/user_control.py | 14 +++++------ .../6-cluster/5dnode3mnodeRecreateMnode.py | 2 +- 146 files changed, 370 insertions(+), 370 deletions(-) diff --git a/tests/pytest/account/account_create.py b/tests/pytest/account/account_create.py index c008acccd8..48b6bcde34 100644 --- a/tests/pytest/account/account_create.py +++ b/tests/pytest/account/account_create.py @@ -24,11 +24,11 @@ class TDTestCase: tdSql.init(conn.cursor(), logSql) def run(self): - tdSql.query("show users") + tdSql.query("select * from information_schema.ins_users") rows = tdSql.queryRows tdSql.execute("create user test PASS 'test' ") - tdSql.query("show users") + tdSql.query("select * from information_schema.ins_users") tdSql.checkRows(rows + 1) tdSql.error("create user tdenginetdenginetdengine PASS 'test' ") diff --git a/tests/script/tmp/data.sim b/tests/script/tmp/data.sim index adce1dd37c..6b7ab81529 100644 --- a/tests/script/tmp/data.sim +++ b/tests/script/tmp/data.sim @@ -23,7 +23,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> rows: $rows print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 @@ -57,7 +57,7 @@ if $data(db)[4] != 3 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $data(2)[2] != 1 then return -1 endi @@ -69,7 +69,7 @@ if $data(4)[2] != 1 then endi # vnodes -sql show dnodes +sql select * from information_schema.ins_dnodes if $data(2)[2] != 1 then return -1 endi diff --git a/tests/script/tmp/monitor.sim b/tests/script/tmp/monitor.sim index ec728fe733..8eb787e950 100644 --- a/tests/script/tmp/monitor.sim +++ b/tests/script/tmp/monitor.sim @@ -14,7 +14,7 @@ system sh/cfg.sh -n dnode1 -c monitorComp -v 1 system sh/exec.sh -n dnode1 -s start sql connect -print =============== show dnodes +print =============== select * from information_schema.ins_dnodes sql create database db vgroups 2; sql use db; sql create table db.stb (ts timestamp, c1 int, c2 binary(4)) tags(t1 int, t2 binary(16)) comment "abd"; diff --git a/tests/script/tmp/r1.sim b/tests/script/tmp/r1.sim index a51bf80b3d..42f7498d69 100644 --- a/tests/script/tmp/r1.sim +++ b/tests/script/tmp/r1.sim @@ -17,7 +17,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> rows: $rows print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 diff --git a/tests/script/tsim/backup/arbitrator/check_cluster_cfg_para.sim b/tests/script/tsim/backup/arbitrator/check_cluster_cfg_para.sim index 7bf2c2ac42..8ac75c3995 100644 --- a/tests/script/tsim/backup/arbitrator/check_cluster_cfg_para.sim +++ b/tests/script/tsim/backup/arbitrator/check_cluster_cfg_para.sim @@ -114,7 +114,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 8 then sleep 2000 goto wait_dnode_created @@ -164,7 +164,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 print $data0_3 $data1_3 $data2_3 $data3_3 $data4_3 diff --git a/tests/script/tsim/backup/arbitrator/dn2_mn1_cache_file_sync.sim b/tests/script/tsim/backup/arbitrator/dn2_mn1_cache_file_sync.sim index dbd0e2bd87..cc8130217a 100644 --- a/tests/script/tsim/backup/arbitrator/dn2_mn1_cache_file_sync.sim +++ b/tests/script/tsim/backup/arbitrator/dn2_mn1_cache_file_sync.sim @@ -119,7 +119,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode3_offline @@ -187,7 +187,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode3_ready diff --git a/tests/script/tsim/backup/arbitrator/dn2_mn1_cache_file_sync_second.sim b/tests/script/tsim/backup/arbitrator/dn2_mn1_cache_file_sync_second.sim index e15edb3f3d..9395beb0ef 100644 --- a/tests/script/tsim/backup/arbitrator/dn2_mn1_cache_file_sync_second.sim +++ b/tests/script/tsim/backup/arbitrator/dn2_mn1_cache_file_sync_second.sim @@ -16,7 +16,7 @@ system sh/exec.sh -n dnode2 -s start sleep 2000 wait_dnode2_ready: -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode2_ready diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim index 2af7cf56b7..a2c1bf9883 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim @@ -101,7 +101,7 @@ if $data00 != $totalRows then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then return -1 endi @@ -119,7 +119,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode4_dropped @@ -153,7 +153,7 @@ endi print ============== step4: restart dnode4, but there no dnode4 in cluster system sh/exec.sh -n dnode4 -s start -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then return -1 endi diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_r2_vnode_delDir.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_r2_vnode_delDir.sim index 96fde9061a..560aef5c17 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_r2_vnode_delDir.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_r2_vnode_delDir.sim @@ -102,7 +102,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode3_offline_0 @@ -169,7 +169,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode3_reready @@ -236,7 +236,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode2_offline @@ -281,7 +281,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode2_reready diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_r3_vnode_delDir.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_r3_vnode_delDir.sim index da76cc467b..d8a410283e 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_r3_vnode_delDir.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_r3_vnode_delDir.sim @@ -104,7 +104,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 @@ -171,7 +171,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_reready @@ -238,7 +238,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode23_offline @@ -282,7 +282,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode23_reready diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim index c924fee1ae..ab144212e4 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim @@ -140,7 +140,7 @@ if $data00 != $totalRows then endi #sleep 2000 -#sql show dnodes +#sql select * from information_schema.ins_dnodes #print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 #print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 #print $data0_3 $data1_3 $data2_3 $data3_3 $data4_3 @@ -173,7 +173,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_drop @@ -227,7 +227,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print rows: $rows if $rows != 4 then sleep 2000 @@ -279,7 +279,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode5 diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_replica_change.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_replica_change.sim index b9008e4c42..7ebba54418 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_replica_change.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_replica_change.sim @@ -59,7 +59,7 @@ step1: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 $data4_1 print dnode2 $data4_2 @@ -140,7 +140,7 @@ step2: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 $data4_1 print dnode2 $data4_2 print dnode3 $data4_3 @@ -229,7 +229,7 @@ step6: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 $data4_1 print dnode2 $data4_2 print dnode3 $data4_3 @@ -320,7 +320,7 @@ step9: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then goto step9 endi diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_replica_change_dropDnod.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_replica_change_dropDnod.sim index 73702835f4..31040ef0a1 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_replica_change_dropDnod.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_replica_change_dropDnod.sim @@ -106,7 +106,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_dropped diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_stopDnode_timeout.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_stopDnode_timeout.sim index 27b308411a..b9e92563ff 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_stopDnode_timeout.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_stopDnode_timeout.sim @@ -102,7 +102,7 @@ if $data00 != $totalRows then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then return -1 endi @@ -118,7 +118,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode4_dropped @@ -153,7 +153,7 @@ endi print ============== step4: restart dnode4, but there are not dnode4 in cluster system sh/exec.sh -n dnode4 -s start sleep 2000 -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then return -1 endi @@ -161,7 +161,7 @@ endi print ============== step5: recreate dnode4 into cluster, result should fail sql create dnode $hostname4 sleep 12000 -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then return -1 endi @@ -191,7 +191,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_ready diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_change.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_change.sim index 6d81effab6..5477ef3580 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_change.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_change.sim @@ -94,7 +94,7 @@ if $data00 != $totalRows then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 print $data0_3 $data1_3 $data2_3 $data3_3 $data4_3 @@ -109,7 +109,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 @@ -175,7 +175,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_reready @@ -244,7 +244,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode23_offline diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim index d22aca07cb..07475adad6 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim @@ -106,7 +106,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode3_offline_0 @@ -197,7 +197,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode3_reready @@ -275,7 +275,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode2_offline_0 @@ -334,7 +334,7 @@ endi print ============== step6: stop dnode3 for falling disck system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep $sleepTimer -sql show dnodes +sql select * from information_schema.ins_dnodes print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 print $data0_3 $data1_3 $data2_3 $data3_3 $data4_3 @@ -356,7 +356,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode23_reready_2 diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_corruptFile_online.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_corruptFile_online.sim index 884a43bce1..e3dfccf700 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_corruptFile_online.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_corruptFile_online.sim @@ -110,8 +110,8 @@ if $data00 != $totalRows then return -1 endi -print show dnodes -sql show dnodes +print select * from information_schema.ins_dnodes +sql select * from information_schema.ins_dnodes print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 print $data0_3 $data1_3 $data2_3 $data3_3 $data4_3 @@ -158,7 +158,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode2_offline_0 @@ -225,7 +225,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode3_offline_0 @@ -292,7 +292,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode3_reready diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_createErrData_online.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_createErrData_online.sim index 3c74de4916..677e9bbacb 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_createErrData_online.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_createErrData_online.sim @@ -120,7 +120,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode2_offline_0 @@ -187,7 +187,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode3_offline_0 @@ -254,7 +254,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode3_reready diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_delDir.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_delDir.sim index d0399222f1..0ac8f56d91 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_delDir.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_delDir.sim @@ -105,7 +105,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 @@ -166,7 +166,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_reready @@ -226,7 +226,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode3_offline @@ -266,7 +266,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode3_reready @@ -342,7 +342,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode2_offline @@ -382,7 +382,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode2_reready diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim index 19b29bf342..6448cc02b8 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim @@ -106,7 +106,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode3_offline_0 @@ -197,7 +197,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode3_reready @@ -275,7 +275,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode2_offline_0 @@ -334,7 +334,7 @@ endi print ============== step6: stop dnode3 for falling disck system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep $sleepTimer -sql show dnodes +sql select * from information_schema.ins_dnodes print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 print $data0_3 $data1_3 $data2_3 $data3_3 $data4_3 @@ -356,7 +356,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode23_reready_2 diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_nomaster.sim b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_nomaster.sim index b9ee508f78..f8ca114437 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_nomaster.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn1_vnode_nomaster.sim @@ -109,7 +109,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 @@ -218,7 +218,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode3_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/insert_duplicationTs.sim b/tests/script/tsim/backup/arbitrator/insert_duplicationTs.sim index 4af47ca336..1e439f1605 100644 --- a/tests/script/tsim/backup/arbitrator/insert_duplicationTs.sim +++ b/tests/script/tsim/backup/arbitrator/insert_duplicationTs.sim @@ -131,7 +131,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode2_offline @@ -189,7 +189,7 @@ if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode2_ready diff --git a/tests/script/tsim/backup/arbitrator/offline_replica2_alterTable_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica2_alterTable_online.sim index 0adb6b4759..f93332a21a 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica2_alterTable_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica2_alterTable_online.sim @@ -107,7 +107,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 @@ -173,7 +173,7 @@ $loopCnt = $loopCnt + 1 if $loopCnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_ready diff --git a/tests/script/tsim/backup/arbitrator/offline_replica2_alterTag_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica2_alterTag_online.sim index a0877ad89c..873005daf5 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica2_alterTag_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica2_alterTag_online.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 @@ -203,7 +203,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_ready diff --git a/tests/script/tsim/backup/arbitrator/offline_replica2_createTable_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica2_createTable_online.sim index 376484a066..02625ba490 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica2_createTable_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica2_createTable_online.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 @@ -189,7 +189,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_ready diff --git a/tests/script/tsim/backup/arbitrator/offline_replica2_dropDb_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica2_dropDb_online.sim index b923a71335..3b8dbeb637 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica2_dropDb_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica2_dropDb_online.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/offline_replica2_dropTable_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica2_dropTable_online.sim index cb3bbb3a73..a6d84da45a 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica2_dropTable_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica2_dropTable_online.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 @@ -175,7 +175,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_ready diff --git a/tests/script/tsim/backup/arbitrator/offline_replica3_alterTable_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica3_alterTable_online.sim index 8a9995f891..42be85bf4b 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica3_alterTable_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica3_alterTable_online.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 @@ -177,7 +177,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_ready diff --git a/tests/script/tsim/backup/arbitrator/offline_replica3_alterTag_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica3_alterTag_online.sim index 6eed563bbc..212c9130df 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica3_alterTag_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica3_alterTag_online.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 @@ -203,7 +203,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_ready diff --git a/tests/script/tsim/backup/arbitrator/offline_replica3_createTable_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica3_createTable_online.sim index 2633d822c9..ae26952b6b 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica3_createTable_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica3_createTable_online.sim @@ -107,7 +107,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 @@ -190,7 +190,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_ready diff --git a/tests/script/tsim/backup/arbitrator/offline_replica3_dropDb_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica3_dropDb_online.sim index 0dfc937408..a8143b2c75 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica3_dropDb_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica3_dropDb_online.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/offline_replica3_dropTable_online.sim b/tests/script/tsim/backup/arbitrator/offline_replica3_dropTable_online.sim index f2acb8b90a..c606d2a38f 100644 --- a/tests/script/tsim/backup/arbitrator/offline_replica3_dropTable_online.sim +++ b/tests/script/tsim/backup/arbitrator/offline_replica3_dropTable_online.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 @@ -175,7 +175,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_ready diff --git a/tests/script/tsim/backup/arbitrator/replica_changeWithArbitrator.sim b/tests/script/tsim/backup/arbitrator/replica_changeWithArbitrator.sim index 9d0e967f4e..df82f7d7d2 100644 --- a/tests/script/tsim/backup/arbitrator/replica_changeWithArbitrator.sim +++ b/tests/script/tsim/backup/arbitrator/replica_changeWithArbitrator.sim @@ -114,7 +114,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode2_ready @@ -160,7 +160,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 3 then sleep 2000 goto wait_dnode_ready diff --git a/tests/script/tsim/backup/arbitrator/sync_replica2_alterTable_add.sim b/tests/script/tsim/backup/arbitrator/sync_replica2_alterTable_add.sim index a8c0e83cc1..23d22e4f7f 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica2_alterTable_add.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica2_alterTable_add.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/sync_replica2_alterTable_drop.sim b/tests/script/tsim/backup/arbitrator/sync_replica2_alterTable_drop.sim index 951d26635b..3fc28f4d81 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica2_alterTable_drop.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica2_alterTable_drop.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/sync_replica2_dropDb.sim b/tests/script/tsim/backup/arbitrator/sync_replica2_dropDb.sim index 511c796506..808bc1109e 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica2_dropDb.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica2_dropDb.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/sync_replica2_dropTable.sim b/tests/script/tsim/backup/arbitrator/sync_replica2_dropTable.sim index 0049dc6fba..710c72fbd3 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica2_dropTable.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica2_dropTable.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/sync_replica3_alterTable_add.sim b/tests/script/tsim/backup/arbitrator/sync_replica3_alterTable_add.sim index 4990899601..024d38da06 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica3_alterTable_add.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica3_alterTable_add.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/sync_replica3_alterTable_drop.sim b/tests/script/tsim/backup/arbitrator/sync_replica3_alterTable_drop.sim index 10bd4fc8bd..5dd716ce97 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica3_alterTable_drop.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica3_alterTable_drop.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 20 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/sync_replica3_createTable.sim b/tests/script/tsim/backup/arbitrator/sync_replica3_createTable.sim index a0b391dd76..f085ab4340 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica3_createTable.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica3_createTable.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim b/tests/script/tsim/backup/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim index 68c6ecbd6e..ed2dc120af 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim @@ -105,7 +105,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_offline_0 @@ -173,7 +173,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_ready @@ -280,7 +280,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_ready_2 @@ -403,7 +403,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 4 then sleep 2000 goto wait_dnode4_ready_3 diff --git a/tests/script/tsim/backup/arbitrator/sync_replica3_dropDb.sim b/tests/script/tsim/backup/arbitrator/sync_replica3_dropDb.sim index 4f258a0245..a3d0d84f71 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica3_dropDb.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica3_dropDb.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/arbitrator/sync_replica3_dropTable.sim b/tests/script/tsim/backup/arbitrator/sync_replica3_dropTable.sim index 7496541b76..a214fdeb22 100644 --- a/tests/script/tsim/backup/arbitrator/sync_replica3_dropTable.sim +++ b/tests/script/tsim/backup/arbitrator/sync_replica3_dropTable.sim @@ -106,7 +106,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 5 then sleep 2000 goto wait_dnode4_offline_0 diff --git a/tests/script/tsim/backup/clusterSimCase/cluster_main.sim b/tests/script/tsim/backup/clusterSimCase/cluster_main.sim index 274ce85974..dba09f94e6 100644 --- a/tests/script/tsim/backup/clusterSimCase/cluster_main.sim +++ b/tests/script/tsim/backup/clusterSimCase/cluster_main.sim @@ -1,6 +1,6 @@ # scp -r root@114.116.252.220:/home/ubuntu/clusterSimCase unique/. -#taos> show dnodes; +#taos> select * from information_schema.ins_dnodes; # id | end_point | vnodes | cores | status | role | create_time | #================================================================================================================== # 1 | ubuntu-OptiPlex-7060:7100 | 0 | 12 | ready | mnode | 2020-07-22 06:25:31.677 | diff --git a/tests/script/tsim/bnode/basic1.sim b/tests/script/tsim/bnode/basic1.sim index c1b1a7ea9a..3dc732ffd4 100644 --- a/tests/script/tsim/bnode/basic1.sim +++ b/tests/script/tsim/bnode/basic1.sim @@ -5,8 +5,8 @@ system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode2 -s start sql connect -print =============== show dnodes -sql show dnodes; +print =============== select * from information_schema.ins_dnodes +sql select * from information_schema.ins_dnodes; if $rows != 1 then return -1 endi @@ -32,7 +32,7 @@ print =============== create dnodes sql create dnode $hostname port 7200 sleep 2000 -sql show dnodes; +sql select * from information_schema.ins_dnodes; if $rows != 2 then return -1 endi diff --git a/tests/script/tsim/db/alter_option.sim b/tests/script/tsim/db/alter_option.sim index a7f80c6784..fd14e025a5 100644 --- a/tests/script/tsim/db/alter_option.sim +++ b/tests/script/tsim/db/alter_option.sim @@ -18,7 +18,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/db/alter_replica_13.sim b/tests/script/tsim/db/alter_replica_13.sim index 76e3be60a5..d232c9bcd3 100644 --- a/tests/script/tsim/db/alter_replica_13.sim +++ b/tests/script/tsim/db/alter_replica_13.sim @@ -20,7 +20,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -43,13 +43,13 @@ if $data(db)[4] != 1 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $data(2)[2] != 1 then return -1 endi # vnodes -sql show dnodes +sql select * from information_schema.ins_dnodes if $data(2)[2] != 1 then return -1 endi @@ -81,7 +81,7 @@ step3: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> rows: $rows print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 diff --git a/tests/script/tsim/db/alter_replica_31.sim b/tests/script/tsim/db/alter_replica_31.sim index 021aa68534..17ab040520 100644 --- a/tests/script/tsim/db/alter_replica_31.sim +++ b/tests/script/tsim/db/alter_replica_31.sim @@ -22,7 +22,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> rows: $rows print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 @@ -54,7 +54,7 @@ if $data(db)[4] != 3 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $data(2)[2] != 1 then return -1 endi @@ -66,7 +66,7 @@ if $data(4)[2] != 1 then endi # vnodes -sql show dnodes +sql select * from information_schema.ins_dnodes if $data(2)[2] != 1 then return -1 endi diff --git a/tests/script/tsim/db/basic1.sim b/tests/script/tsim/db/basic1.sim index 6a11549b1d..679440590f 100644 --- a/tests/script/tsim/db/basic1.sim +++ b/tests/script/tsim/db/basic1.sim @@ -136,8 +136,8 @@ if $rows != 4 then return -1 endi -print =============== show dnodes -sql show dnodes +print =============== select * from information_schema.ins_dnodes +sql select * from information_schema.ins_dnodes if $data00 != 1 then return -1 diff --git a/tests/script/tsim/db/commit.sim b/tests/script/tsim/db/commit.sim index 191f618adb..731f2aa256 100644 --- a/tests/script/tsim/db/commit.sim +++ b/tests/script/tsim/db/commit.sim @@ -18,7 +18,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/db/create_all_options.sim b/tests/script/tsim/db/create_all_options.sim index 79ee4c606f..5ac2ee6c4e 100644 --- a/tests/script/tsim/db/create_all_options.sim +++ b/tests/script/tsim/db/create_all_options.sim @@ -17,7 +17,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/db/error1.sim b/tests/script/tsim/db/error1.sim index e99af1580d..32dbe826cc 100644 --- a/tests/script/tsim/db/error1.sim +++ b/tests/script/tsim/db/error1.sim @@ -16,7 +16,7 @@ create1: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $data4_2 != ready then goto create1 endi diff --git a/tests/script/tsim/dnode/balance1.sim b/tests/script/tsim/dnode/balance1.sim index 6471529a1e..d91f514645 100644 --- a/tests/script/tsim/dnode/balance1.sim +++ b/tests/script/tsim/dnode/balance1.sim @@ -20,7 +20,7 @@ sql insert into d1.t1 values(now+3s, 13) sql insert into d1.t1 values(now+4s, 12) sql insert into d1.t1 values(now+5s, 11) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] if $data(1)[2] != 1 then return -1 @@ -38,7 +38,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -52,7 +52,7 @@ if $data(2)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] if $data(1)[2] != 0 then @@ -71,7 +71,7 @@ sql insert into d2.t2 values(now+3s, 23) sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] if $data(1)[2] != 0 then @@ -83,7 +83,7 @@ endi print ========== step4 sql drop dnode 2 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] if $data(1)[2] != 2 then @@ -107,7 +107,7 @@ step5: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -121,7 +121,7 @@ if $data(3)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(3)[2] if $data(1)[2] != 1 then @@ -140,7 +140,7 @@ sql insert into d3.t3 values(now+3s, 33) sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(3)[2] if $data(1)[2] != 1 then @@ -162,7 +162,7 @@ step7: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -188,7 +188,7 @@ sql insert into d4.t4 values(now+3s, 43) sql insert into d4.t4 values(now+4s, 42) sql insert into d4.t4 values(now+5s, 41) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(3)[2] print dnode2 openVnodes $data(4)[2] @@ -204,7 +204,7 @@ endi print ========== step9 sql drop dnode 3 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(4)[2] if $data(1)[2] != 2 then diff --git a/tests/script/tsim/dnode/balance2.sim b/tests/script/tsim/dnode/balance2.sim index 5da9a659f3..f677d3925c 100644 --- a/tests/script/tsim/dnode/balance2.sim +++ b/tests/script/tsim/dnode/balance2.sim @@ -27,7 +27,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -78,7 +78,7 @@ sql insert into d4.t4 values(now+4s, 42) sql insert into d4.t4 values(now+5s, 41) print ========== step2.1 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] print dnode3 openVnodes $data(3)[2] @@ -106,7 +106,7 @@ step3: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -132,7 +132,7 @@ if $data(5)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode3 openVnodes $data(2)[2] print dnode3 openVnodes $data(3)[2] @@ -156,7 +156,7 @@ endi print ========== step4 sql drop dnode 2 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode3 openVnodes $data(3)[2] print dnode4 openVnodes $data(4)[2] @@ -178,7 +178,7 @@ system sh/exec.sh -n dnode2 -s stop -x SIGINT print ========== step5 sql drop dnode 3 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode3 openVnodes $data(3)[2] print dnode4 openVnodes $data(4)[2] diff --git a/tests/script/tsim/dnode/balance3.sim b/tests/script/tsim/dnode/balance3.sim index f26c0eaa21..ce328f10bd 100644 --- a/tests/script/tsim/dnode/balance3.sim +++ b/tests/script/tsim/dnode/balance3.sim @@ -31,7 +31,7 @@ step10: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -122,7 +122,7 @@ sql insert into d2.t2 values(now+3s, 23) sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] print dnode3 openVnodes $data(3)[2] @@ -142,7 +142,7 @@ endi print ========== step2 sql drop dnode 2 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] print dnode3 openVnodes $data(3)[2] @@ -174,7 +174,7 @@ step3: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -196,7 +196,7 @@ if $data(5)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode3 openVnodes $data(3)[2] print dnode4 openVnodes $data(4)[2] @@ -223,7 +223,7 @@ sql insert into d3.t3 values(now+3s, 33) sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode3 openVnodes $data(3)[2] print dnode4 openVnodes $data(4)[2] @@ -253,7 +253,7 @@ step5: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -279,7 +279,7 @@ if $data(6)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode3 openVnodes $data(3)[2] print dnode4 openVnodes $data(4)[2] @@ -303,7 +303,7 @@ endi print ========== step6 sql drop dnode 3 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode3 openVnodes $data(3)[2] print dnode4 openVnodes $data(4)[2] diff --git a/tests/script/tsim/dnode/balance_replica1.sim b/tests/script/tsim/dnode/balance_replica1.sim index 998d0654ab..580b53f9f9 100644 --- a/tests/script/tsim/dnode/balance_replica1.sim +++ b/tests/script/tsim/dnode/balance_replica1.sim @@ -22,7 +22,7 @@ step1: print ---> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 print ---> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then @@ -78,7 +78,7 @@ step3: print ---> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 print ---> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then diff --git a/tests/script/tsim/dnode/balance_replica3.sim b/tests/script/tsim/dnode/balance_replica3.sim index 276621cfcc..afd7603b16 100644 --- a/tests/script/tsim/dnode/balance_replica3.sim +++ b/tests/script/tsim/dnode/balance_replica3.sim @@ -30,7 +30,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -199,7 +199,7 @@ step4: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/dnode/balancex.sim b/tests/script/tsim/dnode/balancex.sim index 124ccbebba..6b16e8b569 100644 --- a/tests/script/tsim/dnode/balancex.sim +++ b/tests/script/tsim/dnode/balancex.sim @@ -28,7 +28,7 @@ sql insert into d2.t2 values(now+3s, 23) sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] if $data(1)[2] != 2 then return -1 @@ -48,7 +48,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -66,7 +66,7 @@ if $data(3)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] print dnode2 openVnodes $data(3)[2] @@ -89,7 +89,7 @@ sql insert into d3.t3 values(now+3s, 33) sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] print dnode2 openVnodes $data(3)[2] @@ -115,7 +115,7 @@ step3: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -137,7 +137,7 @@ if $data(4)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] print dnode2 openVnodes $data(3)[2] @@ -157,7 +157,7 @@ endi print ========== step5 sql drop dnode 2 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] print dnode2 openVnodes $data(3)[2] diff --git a/tests/script/tsim/dnode/create_dnode.sim b/tests/script/tsim/dnode/create_dnode.sim index 12c85cc480..b307ad0341 100644 --- a/tests/script/tsim/dnode/create_dnode.sim +++ b/tests/script/tsim/dnode/create_dnode.sim @@ -5,8 +5,8 @@ system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode2 -s start sql connect -print =============== show dnodes -sql show dnodes; +print =============== select * from information_schema.ins_dnodes +sql select * from information_schema.ins_dnodes; print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] if $rows != 1 then return -1 @@ -35,7 +35,7 @@ print =============== create dnodes sql create dnode $hostname port 7200 sleep 2000 -sql show dnodes; +sql select * from information_schema.ins_dnodes; if $rows != 2 then return -1 endi diff --git a/tests/script/tsim/dnode/drop_dnode_has_mnode.sim b/tests/script/tsim/dnode/drop_dnode_has_mnode.sim index 16cd2bb3b0..b1959ad8a6 100644 --- a/tests/script/tsim/dnode/drop_dnode_has_mnode.sim +++ b/tests/script/tsim/dnode/drop_dnode_has_mnode.sim @@ -17,7 +17,7 @@ step1: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then @@ -37,7 +37,7 @@ print =============== step2 drop dnode 3 sql_error drop dnode 1 sql drop dnode 3 -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -73,8 +73,8 @@ print =============== step4: drop dnode 2 sql_error drop dnode 1 sql drop dnode 2 -print show dnodes; -sql show dnodes; +print select * from information_schema.ins_dnodes; +sql select * from information_schema.ins_dnodes; print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] if $rows != 1 then diff --git a/tests/script/tsim/dnode/drop_dnode_has_multi_vnode_replica1.sim b/tests/script/tsim/dnode/drop_dnode_has_multi_vnode_replica1.sim index 20eac3836c..a5f7e0ad02 100644 --- a/tests/script/tsim/dnode/drop_dnode_has_multi_vnode_replica1.sim +++ b/tests/script/tsim/dnode/drop_dnode_has_multi_vnode_replica1.sim @@ -19,7 +19,7 @@ step1: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then @@ -76,7 +76,7 @@ step4: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then @@ -95,8 +95,8 @@ endi print =============== step3: drop dnode2 sql drop dnode 2 -print show dnodes; -sql show dnodes; +print select * from information_schema.ins_dnodes; +sql select * from information_schema.ins_dnodes; print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] if $rows != 2 then diff --git a/tests/script/tsim/dnode/drop_dnode_has_multi_vnode_replica3.sim b/tests/script/tsim/dnode/drop_dnode_has_multi_vnode_replica3.sim index e1b7c4a3a4..0fa7320ff6 100644 --- a/tests/script/tsim/dnode/drop_dnode_has_multi_vnode_replica3.sim +++ b/tests/script/tsim/dnode/drop_dnode_has_multi_vnode_replica3.sim @@ -25,7 +25,7 @@ step1: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 5 then @@ -189,7 +189,7 @@ step4: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 5 then @@ -214,8 +214,8 @@ endi print =============== step5: drop dnode2 sql drop dnode 2 -print show dnodes; -sql show dnodes; +print select * from information_schema.ins_dnodes; +sql select * from information_schema.ins_dnodes; print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] if $rows != 4 then diff --git a/tests/script/tsim/dnode/drop_dnode_has_qnode_snode.sim b/tests/script/tsim/dnode/drop_dnode_has_qnode_snode.sim index 6641ce053c..c50cf0f56e 100644 --- a/tests/script/tsim/dnode/drop_dnode_has_qnode_snode.sim +++ b/tests/script/tsim/dnode/drop_dnode_has_qnode_snode.sim @@ -16,7 +16,7 @@ step1: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -46,8 +46,8 @@ endi print =============== step3: drop dnode 2 sql drop dnode 2 -print show dnodes; -sql show dnodes; +print select * from information_schema.ins_dnodes; +sql select * from information_schema.ins_dnodes; print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] if $rows != 1 then diff --git a/tests/script/tsim/dnode/drop_dnode_has_vnode_replica1.sim b/tests/script/tsim/dnode/drop_dnode_has_vnode_replica1.sim index 63639877ee..066e989df2 100644 --- a/tests/script/tsim/dnode/drop_dnode_has_vnode_replica1.sim +++ b/tests/script/tsim/dnode/drop_dnode_has_vnode_replica1.sim @@ -19,7 +19,7 @@ step1: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then @@ -72,7 +72,7 @@ step4: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then @@ -102,7 +102,7 @@ step5: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then @@ -121,8 +121,8 @@ endi print =============== step6: drop dnode2 sql drop dnode 2 -print show dnodes; -sql show dnodes; +print select * from information_schema.ins_dnodes; +sql select * from information_schema.ins_dnodes; print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] if $rows != 2 then diff --git a/tests/script/tsim/dnode/drop_dnode_has_vnode_replica3.sim b/tests/script/tsim/dnode/drop_dnode_has_vnode_replica3.sim index 4855f4dccf..2510692846 100644 --- a/tests/script/tsim/dnode/drop_dnode_has_vnode_replica3.sim +++ b/tests/script/tsim/dnode/drop_dnode_has_vnode_replica3.sim @@ -25,7 +25,7 @@ step1: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 5 then @@ -126,7 +126,7 @@ step4: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 5 then @@ -151,8 +151,8 @@ endi print =============== step5: drop dnode2 sql drop dnode 2 -print show dnodes; -sql show dnodes; +print select * from information_schema.ins_dnodes; +sql select * from information_schema.ins_dnodes; print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/dnode/offline_reason.sim b/tests/script/tsim/dnode/offline_reason.sim index 3608dd4a3a..6b1686dbb4 100644 --- a/tests/script/tsim/dnode/offline_reason.sim +++ b/tests/script/tsim/dnode/offline_reason.sim @@ -7,7 +7,7 @@ system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname port 7200 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 off: $data(1)[6] print dnode2 off: $data(2)[6] @@ -26,7 +26,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -49,7 +49,7 @@ step3: if $x == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 off: $data(1)[6] print dnode2 off: $data(2)[6] if $data(2)[6] != @status msg timeout@ then @@ -58,7 +58,7 @@ endi print ========== step4 sql drop dnode 2 -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 1 then return -1 endi @@ -76,7 +76,7 @@ step5: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 off: $data(1)[6] print dnode2 off: $data(3)[6] if $data(3)[6] != @dnodeId not match@ then @@ -97,7 +97,7 @@ step6: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 off: $data(1)[6] print dnode2 off: $data(3)[6] print dnode3 off: $data(4)[6] @@ -119,7 +119,7 @@ step7: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 off: $data(1)[6] print dnode3 off: $data(3)[6] print dnode4 off: $data(4)[6] @@ -142,7 +142,7 @@ step8: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 off: $data(1)[6] print dnode3 off: $data(3)[6] print dnode4 off: $data(4)[6] diff --git a/tests/script/tsim/dnode/redistribute_vgroup_replica1.sim b/tests/script/tsim/dnode/redistribute_vgroup_replica1.sim index d3b5a02a23..09da0ee6aa 100644 --- a/tests/script/tsim/dnode/redistribute_vgroup_replica1.sim +++ b/tests/script/tsim/dnode/redistribute_vgroup_replica1.sim @@ -26,7 +26,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -54,7 +54,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim index 00c6e8a98d..a576969697 100644 --- a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim +++ b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim @@ -32,7 +32,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -87,7 +87,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim index 947482b3d4..739e3f2984 100644 --- a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim +++ b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim @@ -32,7 +32,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -66,7 +66,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v2.sim b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v2.sim index 6614009497..652f0c14b4 100644 --- a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v2.sim +++ b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v2.sim @@ -34,7 +34,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -69,7 +69,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v3.sim b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v3.sim index c78d90e352..30e644f170 100644 --- a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v3.sim +++ b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v3.sim @@ -40,7 +40,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -77,7 +77,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/dnode/use_dropped_dnode.sim b/tests/script/tsim/dnode/use_dropped_dnode.sim index 9c546e295f..21bf02f61a 100644 --- a/tests/script/tsim/dnode/use_dropped_dnode.sim +++ b/tests/script/tsim/dnode/use_dropped_dnode.sim @@ -19,7 +19,7 @@ step1: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -48,7 +48,7 @@ step2: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -83,7 +83,7 @@ step3: print ====> dnode not online! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/dnode/vnode_clean.sim b/tests/script/tsim/dnode/vnode_clean.sim index 9fcf9451c1..112e5f28a4 100644 --- a/tests/script/tsim/dnode/vnode_clean.sim +++ b/tests/script/tsim/dnode/vnode_clean.sim @@ -16,7 +16,7 @@ sql insert into d1.t1 values(now+3s, 13) sql insert into d1.t1 values(now+4s, 12) sql insert into d1.t1 values(now+5s, 11) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] if $data(1)[2] != 1 then return -1 @@ -34,7 +34,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -48,7 +48,7 @@ if $data(2)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] if $data(1)[2] != 0 then @@ -68,7 +68,7 @@ sql insert into d2.t2 values(now+3s, 23) sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] if $data(1)[2] != 0 then @@ -80,7 +80,7 @@ endi print ========== step4 sql drop dnode 2 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] if $data(1)[2] != 2 then @@ -104,7 +104,7 @@ step5: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -118,7 +118,7 @@ if $data(3)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(3)[2] if $data(1)[2] != 1 then @@ -137,7 +137,7 @@ sql insert into d3.t3 values(now+3s, 33) sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(3)[2] if $data(1)[2] != 1 then @@ -159,7 +159,7 @@ step7: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -177,7 +177,7 @@ if $data(4)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(3)[2] print dnode2 openVnodes $data(4)[2] @@ -200,7 +200,7 @@ sql insert into d4.t4 values(now+3s, 43) sql insert into d4.t4 values(now+4s, 42) sql insert into d4.t4 values(now+5s, 41) -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(3)[2] print dnode2 openVnodes $data(4)[2] @@ -216,7 +216,7 @@ endi print ========== step9 sql drop dnode 3 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(3)[2] print dnode2 openVnodes $data(4)[2] diff --git a/tests/script/tsim/mnode/basic1.sim b/tests/script/tsim/mnode/basic1.sim index d93d4ca53f..05515dac59 100644 --- a/tests/script/tsim/mnode/basic1.sim +++ b/tests/script/tsim/mnode/basic1.sim @@ -5,7 +5,7 @@ system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode2 -s start sql connect -print =============== show dnodes +print =============== select * from information_schema.ins_dnodes sql show mnodes; if $rows != 1 then return -1 @@ -28,7 +28,7 @@ step1: if $x == 20 then return -1 endi -sql show dnodes -x step1 +sql select * from information_schema.ins_dnodes -x step1 if $data(1)[4] != ready then goto step1 endi diff --git a/tests/script/tsim/mnode/basic2.sim b/tests/script/tsim/mnode/basic2.sim index e4188c6815..217d823d61 100644 --- a/tests/script/tsim/mnode/basic2.sim +++ b/tests/script/tsim/mnode/basic2.sim @@ -5,7 +5,7 @@ system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode2 -s start sql connect -print =============== show dnodes +print =============== select * from information_schema.ins_dnodes sql show mnodes; if $rows != 1 then return -1 @@ -28,7 +28,7 @@ step1: if $x == 20 then return -1 endi -sql show dnodes -x step1 +sql select * from information_schema.ins_dnodes -x step1 if $data(1)[4] != ready then goto step1 endi @@ -68,7 +68,7 @@ endi print =============== create user sql create user user1 PASS 'user1' -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi @@ -95,7 +95,7 @@ endi print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi @@ -112,7 +112,7 @@ step3: if $x == 20 then return -1 endi -sql show dnodes -x step3 +sql select * from information_schema.ins_dnodes -x step3 print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $data(1)[4] != ready then diff --git a/tests/script/tsim/mnode/basic3.sim b/tests/script/tsim/mnode/basic3.sim index 695e23f3ac..d1b7587db1 100644 --- a/tests/script/tsim/mnode/basic3.sim +++ b/tests/script/tsim/mnode/basic3.sim @@ -25,7 +25,7 @@ step1: if $x == 10 then return -1 endi -sql show dnodes -x step1 +sql select * from information_schema.ins_dnodes -x step1 if $data(1)[4] != ready then goto step1 endi @@ -69,7 +69,7 @@ endi print =============== step3: create user sql create user user1 PASS 'user1' -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi @@ -92,7 +92,7 @@ print $data(1)[0] $data(1)[1] $data(1)[2] print $data(2)[0] $data(2)[1] $data(2)[2] print $data(3)[0] $data(3)[1] $data(3)[2] -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi @@ -104,7 +104,7 @@ step41: if $x == 10 then return -1 endi -sql show dnodes -x step41 +sql select * from information_schema.ins_dnodes -x step41 print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -131,7 +131,7 @@ print $data(1)[0] $data(1)[1] $data(1)[2] print $data(2)[0] $data(2)[1] $data(2)[2] print $data(3)[0] $data(3)[1] $data(3)[2] -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi @@ -143,7 +143,7 @@ step51: if $x == 10 then return -1 endi -sql show dnodes -x step51 +sql select * from information_schema.ins_dnodes -x step51 print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -170,7 +170,7 @@ print $data(1)[0] $data(1)[1] $data(1)[2] print $data(2)[0] $data(2)[1] $data(2)[2] print $data(3)[0] $data(3)[1] $data(3)[2] -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi @@ -182,7 +182,7 @@ step61: if $x == 10 then return -1 endi -sql show dnodes -x step61 +sql select * from information_schema.ins_dnodes -x step61 print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/mnode/basic4.sim b/tests/script/tsim/mnode/basic4.sim index 0ffcdd8c00..8ad054746a 100644 --- a/tests/script/tsim/mnode/basic4.sim +++ b/tests/script/tsim/mnode/basic4.sim @@ -17,7 +17,7 @@ step1: if $x == 5 then return -1 endi -sql show dnodes -x step1 +sql select * from information_schema.ins_dnodes -x step1 if $data(1)[4] != ready then goto step1 endi @@ -38,7 +38,7 @@ step2: if $x == 5 then return -1 endi -sql show dnodes -x step2 +sql select * from information_schema.ins_dnodes -x step2 if $data(1)[4] != ready then goto step2 endi diff --git a/tests/script/tsim/mnode/basic5.sim b/tests/script/tsim/mnode/basic5.sim index f23be019f7..73faf5abe2 100644 --- a/tests/script/tsim/mnode/basic5.sim +++ b/tests/script/tsim/mnode/basic5.sim @@ -22,7 +22,7 @@ step1: if $x == 5 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $data(1)[4] != ready then goto step1 endi @@ -46,7 +46,7 @@ step3: if $x == 5 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes if $data(2)[4] != ready then goto step3 endi @@ -104,7 +104,7 @@ step5: if $x == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -132,7 +132,7 @@ step51: if $x == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -186,7 +186,7 @@ step71: if $x == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -246,7 +246,7 @@ step91: if $x == 10 then return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -330,7 +330,7 @@ stepb: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/parser/fourArithmetic-basic.sim b/tests/script/tsim/parser/fourArithmetic-basic.sim index df1afe6554..55ffde14d9 100644 --- a/tests/script/tsim/parser/fourArithmetic-basic.sim +++ b/tests/script/tsim/parser/fourArithmetic-basic.sim @@ -105,7 +105,7 @@ if $loop_test == 0 then print ====> dnode not ready! return -1 endi - sql show dnodes + sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/qnode/basic1.sim b/tests/script/tsim/qnode/basic1.sim index 81d95c704d..27a3aa9e2a 100644 --- a/tests/script/tsim/qnode/basic1.sim +++ b/tests/script/tsim/qnode/basic1.sim @@ -5,7 +5,7 @@ system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode2 -s start sql connect -print =============== show dnodes +print =============== select * from information_schema.ins_dnodes sql create dnode $hostname port 7200 $x = 0 @@ -16,7 +16,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -31,8 +31,8 @@ if $data(2)[4] != ready then goto step1 endi -print =============== show dnodes -sql show dnodes; +print =============== select * from information_schema.ins_dnodes +sql select * from information_schema.ins_dnodes; if $rows != 2 then return -1 endi diff --git a/tests/script/tsim/query/charScalarFunction.sim b/tests/script/tsim/query/charScalarFunction.sim index 0adb296079..320f086fa5 100644 --- a/tests/script/tsim/query/charScalarFunction.sim +++ b/tests/script/tsim/query/charScalarFunction.sim @@ -693,7 +693,7 @@ if $loop_test == 0 then print ====> dnode not ready! return -1 endi - sql show dnodes + sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/complex_group.sim b/tests/script/tsim/query/complex_group.sim index 98a20f3b22..3dad8059cd 100644 --- a/tests/script/tsim/query/complex_group.sim +++ b/tests/script/tsim/query/complex_group.sim @@ -267,7 +267,7 @@ check_dnode_ready_0: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/complex_having.sim b/tests/script/tsim/query/complex_having.sim index 3b6b33bf44..9e28c3803e 100644 --- a/tests/script/tsim/query/complex_having.sim +++ b/tests/script/tsim/query/complex_having.sim @@ -214,7 +214,7 @@ check_dnode_ready_0: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/complex_limit.sim b/tests/script/tsim/query/complex_limit.sim index edcf5734aa..2a90e7ff1d 100644 --- a/tests/script/tsim/query/complex_limit.sim +++ b/tests/script/tsim/query/complex_limit.sim @@ -290,7 +290,7 @@ check_dnode_ready_0: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/complex_select.sim b/tests/script/tsim/query/complex_select.sim index ed6c40f616..f4c9877bfd 100644 --- a/tests/script/tsim/query/complex_select.sim +++ b/tests/script/tsim/query/complex_select.sim @@ -540,7 +540,7 @@ check_dnode_ready_0: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/complex_where.sim b/tests/script/tsim/query/complex_where.sim index c061bf9277..bda1c036f0 100644 --- a/tests/script/tsim/query/complex_where.sim +++ b/tests/script/tsim/query/complex_where.sim @@ -373,7 +373,7 @@ check_dnode_ready_0: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/interval-offset.sim b/tests/script/tsim/query/interval-offset.sim index b7d367ad90..f4d95df083 100644 --- a/tests/script/tsim/query/interval-offset.sim +++ b/tests/script/tsim/query/interval-offset.sim @@ -235,7 +235,7 @@ check_dnode_ready: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/scalarFunction.sim b/tests/script/tsim/query/scalarFunction.sim index 0b1bee19c8..103e66e54e 100644 --- a/tests/script/tsim/query/scalarFunction.sim +++ b/tests/script/tsim/query/scalarFunction.sim @@ -453,7 +453,7 @@ if $loop_test == 0 then print ====> dnode not ready! return -1 endi - sql show dnodes + sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/session.sim b/tests/script/tsim/query/session.sim index be814c2bd2..158448d765 100644 --- a/tests/script/tsim/query/session.sim +++ b/tests/script/tsim/query/session.sim @@ -308,7 +308,7 @@ if $loop_test == 0 then print ====> dnode not ready! return -1 endi - sql show dnodes + sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/stddev.sim b/tests/script/tsim/query/stddev.sim index cc424f6ad4..d61c7273e1 100644 --- a/tests/script/tsim/query/stddev.sim +++ b/tests/script/tsim/query/stddev.sim @@ -238,7 +238,7 @@ check_dnode_ready_0: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/query/time_process.sim b/tests/script/tsim/query/time_process.sim index 8d5c12a2ba..b3c0e9561f 100644 --- a/tests/script/tsim/query/time_process.sim +++ b/tests/script/tsim/query/time_process.sim @@ -92,7 +92,7 @@ check_dnode_ready_0: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 diff --git a/tests/script/tsim/show/basic.sim b/tests/script/tsim/show/basic.sim index bfe674def7..af9b74665a 100644 --- a/tests/script/tsim/show/basic.sim +++ b/tests/script/tsim/show/basic.sim @@ -13,7 +13,7 @@ sql connect # print ====> dnode not ready! # return -1 # endi -#sql show dnodes +#sql select * from information_schema.ins_dnodes #print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 #if $data00 != 1 then # return -1 @@ -39,7 +39,7 @@ sql create table t0 using stb tags (0) sql create table tba (ts timestamp, c1 binary(10), c2 nchar(10)); print =============== run show xxxx -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 2 then return -1 endi @@ -67,7 +67,7 @@ if $rows != 2 then return -1 endi #sql show user_table_distributed -sql show users +sql select * from information_schema.ins_users if $rows != 1 then return -1 endi @@ -126,7 +126,7 @@ check_dnode_ready: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05 if $data00 != 1 then return -1 @@ -137,7 +137,7 @@ endi print ==== again run show / select of above print =============== run show xxxx -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 2 then return -1 endi @@ -165,7 +165,7 @@ if $rows != 2 then return -1 endi #sql show user_table_distributed -sql show users +sql select * from information_schema.ins_users if $rows != 1 then return -1 endi diff --git a/tests/script/tsim/sma/drop_sma.sim b/tests/script/tsim/sma/drop_sma.sim index 2b4c292284..0d2712f8db 100644 --- a/tests/script/tsim/sma/drop_sma.sim +++ b/tests/script/tsim/sma/drop_sma.sim @@ -24,7 +24,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then diff --git a/tests/script/tsim/snode/basic1.sim b/tests/script/tsim/snode/basic1.sim index 93bf04ef41..d20f312e34 100644 --- a/tests/script/tsim/snode/basic1.sim +++ b/tests/script/tsim/snode/basic1.sim @@ -5,7 +5,7 @@ system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode2 -s start sql connect -print =============== show dnodes +print =============== select * from information_schema.ins_dnodes sql create dnode $hostname port 7200 $x = 0 @@ -16,7 +16,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -31,8 +31,8 @@ if $data(2)[4] != ready then goto step1 endi -print =============== show dnodes -sql show dnodes; +print =============== select * from information_schema.ins_dnodes +sql select * from information_schema.ins_dnodes; if $rows != 2 then return -1 endi diff --git a/tests/script/tsim/stable/dnode3.sim b/tests/script/tsim/stable/dnode3.sim index 656e72f32a..b4b7d2ab9c 100644 --- a/tests/script/tsim/stable/dnode3.sim +++ b/tests/script/tsim/stable/dnode3.sim @@ -18,7 +18,7 @@ createDnode: if $x == 20 then return -1 endi -sql show dnodes; +sql select * from information_schema.ins_dnodes; if $data4_2 == offline then goto createDnode endi diff --git a/tests/script/tsim/stream/distributeInterval0.sim b/tests/script/tsim/stream/distributeInterval0.sim index 1ee72527e9..b6b427343e 100644 --- a/tests/script/tsim/stream/distributeInterval0.sim +++ b/tests/script/tsim/stream/distributeInterval0.sim @@ -19,7 +19,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/stream/distributeIntervalRetrive0.sim b/tests/script/tsim/stream/distributeIntervalRetrive0.sim index 927301c3c8..79edea2a3c 100644 --- a/tests/script/tsim/stream/distributeIntervalRetrive0.sim +++ b/tests/script/tsim/stream/distributeIntervalRetrive0.sim @@ -19,7 +19,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/stream/distributeSession0.sim b/tests/script/tsim/stream/distributeSession0.sim index 190304ff19..d752f5c29c 100644 --- a/tests/script/tsim/stream/distributeSession0.sim +++ b/tests/script/tsim/stream/distributeSession0.sim @@ -19,7 +19,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/stream/drop_stream.sim b/tests/script/tsim/stream/drop_stream.sim index 747f59fe85..b25e002140 100644 --- a/tests/script/tsim/stream/drop_stream.sim +++ b/tests/script/tsim/stream/drop_stream.sim @@ -22,7 +22,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/stream/ignoreExpiredData.sim b/tests/script/tsim/stream/ignoreExpiredData.sim index 8cdebe599c..a789416f5b 100644 --- a/tests/script/tsim/stream/ignoreExpiredData.sim +++ b/tests/script/tsim/stream/ignoreExpiredData.sim @@ -19,7 +19,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/sync/3Replica1VgElect.sim b/tests/script/tsim/sync/3Replica1VgElect.sim index 5e077566d3..f069ff40e5 100644 --- a/tests/script/tsim/sync/3Replica1VgElect.sim +++ b/tests/script/tsim/sync/3Replica1VgElect.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -296,7 +296,7 @@ check_dnode_ready3: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] @@ -338,7 +338,7 @@ check_dnode_ready_2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] diff --git a/tests/script/tsim/sync/3Replica5VgElect.sim b/tests/script/tsim/sync/3Replica5VgElect.sim index 0996ac94a1..37e4199e23 100644 --- a/tests/script/tsim/sync/3Replica5VgElect.sim +++ b/tests/script/tsim/sync/3Replica5VgElect.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -464,7 +464,7 @@ check_dnode_ready3: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] @@ -506,7 +506,7 @@ check_dnode_ready_2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] diff --git a/tests/script/tsim/sync/3Replica5VgElect3mnode.sim b/tests/script/tsim/sync/3Replica5VgElect3mnode.sim index 420df6e418..96a895303d 100644 --- a/tests/script/tsim/sync/3Replica5VgElect3mnode.sim +++ b/tests/script/tsim/sync/3Replica5VgElect3mnode.sim @@ -22,7 +22,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -545,7 +545,7 @@ check_dnode_ready3: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] @@ -626,7 +626,7 @@ check_dnode_ready_2: print ====> restart and dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] diff --git a/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim b/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim index bee574960e..72ecd8ed50 100644 --- a/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim +++ b/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -477,7 +477,7 @@ check_dnode_ready3: return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] @@ -504,7 +504,7 @@ if $loop_cnt == 300 then return -1 endi -sql show users +sql select * from information_schema.ins_users print ===> rows: $rows print ===> $rows $data[0][0] $data[0][1] $data[0][2] print ===> $rows $data[1][0] $data[1][1] $data[1][2] @@ -585,7 +585,7 @@ print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] -sql show users +sql select * from information_schema.ins_users print ===> rows: $rows print ===> $rows $data[0][0] $data[0][1] $data[0][2] print ===> $rows $data[1][0] $data[1][1] $data[1][2] diff --git a/tests/script/tsim/sync/electTest.sim b/tests/script/tsim/sync/electTest.sim index 3203c3333a..af0029b539 100644 --- a/tests/script/tsim/sync/electTest.sim +++ b/tests/script/tsim/sync/electTest.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/mnodeLeaderTransfer.sim b/tests/script/tsim/sync/mnodeLeaderTransfer.sim index 00329ced76..6780fb413c 100644 --- a/tests/script/tsim/sync/mnodeLeaderTransfer.sim +++ b/tests/script/tsim/sync/mnodeLeaderTransfer.sim @@ -7,7 +7,7 @@ system sh/exec.sh -n dnode2 -s start system sh/exec.sh -n dnode3 -s start sql connect -print =============== show dnodes +print =============== select * from information_schema.ins_dnodes sql show mnodes; if $rows != 1 then return -1 @@ -34,7 +34,7 @@ sleep 3000 print =============== create user sql create user user1 PASS 'user1' -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi diff --git a/tests/script/tsim/sync/oneReplica1VgElect.sim b/tests/script/tsim/sync/oneReplica1VgElect.sim index fe0def8d92..733a624f7c 100644 --- a/tests/script/tsim/sync/oneReplica1VgElect.sim +++ b/tests/script/tsim/sync/oneReplica1VgElect.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim b/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim index ecd69fd9f0..69e970b70f 100644 --- a/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim +++ b/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/oneReplica5VgElect.sim b/tests/script/tsim/sync/oneReplica5VgElect.sim index d4e58f871e..e42ef5fb82 100644 --- a/tests/script/tsim/sync/oneReplica5VgElect.sim +++ b/tests/script/tsim/sync/oneReplica5VgElect.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -360,7 +360,7 @@ check_dnode_ready_2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6] print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6] diff --git a/tests/script/tsim/sync/threeReplica1VgElect.sim b/tests/script/tsim/sync/threeReplica1VgElect.sim index feea99ff6e..3f30d3d506 100644 --- a/tests/script/tsim/sync/threeReplica1VgElect.sim +++ b/tests/script/tsim/sync/threeReplica1VgElect.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim index 9c6cce0c86..3e747dc61a 100644 --- a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim +++ b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/vnode-insert.sim b/tests/script/tsim/sync/vnode-insert.sim index d995f5f098..c05f08bfa6 100644 --- a/tests/script/tsim/sync/vnode-insert.sim +++ b/tests/script/tsim/sync/vnode-insert.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/vnodeLeaderTransfer.sim b/tests/script/tsim/sync/vnodeLeaderTransfer.sim index 86f81fd550..20cf879325 100644 --- a/tests/script/tsim/sync/vnodeLeaderTransfer.sim +++ b/tests/script/tsim/sync/vnodeLeaderTransfer.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/vnodeLogAnalyzeTest.sim b/tests/script/tsim/sync/vnodeLogAnalyzeTest.sim index 869cb5fd59..ee5f1129eb 100644 --- a/tests/script/tsim/sync/vnodeLogAnalyzeTest.sim +++ b/tests/script/tsim/sync/vnodeLogAnalyzeTest.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/vnodesnapshot-rsma-test.sim b/tests/script/tsim/sync/vnodesnapshot-rsma-test.sim index 454ad792d2..6f8c095162 100644 --- a/tests/script/tsim/sync/vnodesnapshot-rsma-test.sim +++ b/tests/script/tsim/sync/vnodesnapshot-rsma-test.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/vnodesnapshot-test.sim b/tests/script/tsim/sync/vnodesnapshot-test.sim index 402c03f67c..018df43ba2 100644 --- a/tests/script/tsim/sync/vnodesnapshot-test.sim +++ b/tests/script/tsim/sync/vnodesnapshot-test.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/sync/vnodesnapshot.sim b/tests/script/tsim/sync/vnodesnapshot.sim index 21a3a707e6..8b69ea6ea4 100644 --- a/tests/script/tsim/sync/vnodesnapshot.sim +++ b/tests/script/tsim/sync/vnodesnapshot.sim @@ -24,7 +24,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/trans/create_db.sim b/tests/script/tsim/trans/create_db.sim index bda1fe9f18..8543bec144 100644 --- a/tests/script/tsim/trans/create_db.sim +++ b/tests/script/tsim/trans/create_db.sim @@ -18,7 +18,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -73,7 +73,7 @@ step2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -156,7 +156,7 @@ step3: print ====> dnode not ready! return -1 endi - sql show dnodes + sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/trans/lossdata1.sim b/tests/script/tsim/trans/lossdata1.sim index 44785934e5..82e5923468 100644 --- a/tests/script/tsim/trans/lossdata1.sim +++ b/tests/script/tsim/trans/lossdata1.sim @@ -13,7 +13,7 @@ sql connect print =============== create user1 sql create user user1 PASS 'user1' sql create user user2 PASS 'user2' -sql show users +sql select * from information_schema.ins_users if $rows != 3 then return -1 endi @@ -25,7 +25,7 @@ system cp ../../../../sim/dnode1/data/mnode/data/sdb.data.bak1 ../../../../sim/ system sh/exec.sh -n dnode1 -s start sql connect -sql show users +sql select * from information_schema.ins_users if $rows != 3 then return -1 endi diff --git a/tests/script/tsim/user/basic.sim b/tests/script/tsim/user/basic.sim index 298e0cf6e3..8b91efd5df 100644 --- a/tests/script/tsim/user/basic.sim +++ b/tests/script/tsim/user/basic.sim @@ -4,7 +4,7 @@ system sh/exec.sh -n dnode1 -s start sql connect print =============== step0 -sql show users +sql select * from information_schema.ins_users if $data(root)[1] != 1 then return -1 endi @@ -40,7 +40,7 @@ sql_error REVOKE read,write ON *.* from root; print =============== step1: sysinfo create sql CREATE USER u1 PASS 'taosdata' SYSINFO 0; -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi @@ -55,7 +55,7 @@ if $data(u1)[3] != 0 then endi sql CREATE USER u2 PASS 'taosdata' SYSINFO 1; -sql show users +sql select * from information_schema.ins_users if $rows != 3 then return -1 endi @@ -71,7 +71,7 @@ endi print =============== step2: sysinfo alter sql ALTER USER u1 SYSINFO 1 -sql show users +sql select * from information_schema.ins_users if $data(u1)[1] != 0 then return -1 endi @@ -83,7 +83,7 @@ if $data(u1)[3] != 1 then endi sql ALTER USER u1 SYSINFO 0 -sql show users +sql select * from information_schema.ins_users if $data(u1)[1] != 0 then return -1 endi @@ -98,14 +98,14 @@ sql ALTER USER u1 SYSINFO 0 sql ALTER USER u1 SYSINFO 0 sql drop user u1 -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi print =============== step3: enable alter sql ALTER USER u2 enable 0 -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi @@ -120,7 +120,7 @@ if $data(u2)[3] != 1 then endi sql ALTER USER u2 enable 1 -sql show users +sql select * from information_schema.ins_users if $data(u2)[1] != 0 then return -1 endi @@ -139,7 +139,7 @@ system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode1 -s start print =============== step4: enable privilege -sql show users +sql select * from information_schema.ins_users if $rows != 2 then return -1 endi diff --git a/tests/script/tsim/user/password.sim b/tests/script/tsim/user/password.sim index d26b9dbc2e..19eb3a4423 100644 --- a/tests/script/tsim/user/password.sim +++ b/tests/script/tsim/user/password.sim @@ -10,7 +10,7 @@ sql create user u_write pass 'taosdata1' sql alter user u_read pass 'taosdata' sql alter user u_write pass 'taosdata' -sql show users +sql select * from information_schema.ins_users if $rows != 3 then return -1 endi @@ -26,7 +26,7 @@ sql_error alter user u_write pass 'taosdata1' sql_error create user read1 pass 'taosdata1' sql_error create user write1 pass 'taosdata1' -sql show users +sql select * from information_schema.ins_users if $rows != 3 then return -1 endi @@ -41,7 +41,7 @@ sql_error create user write2 pass 'taosdata1' sql alter user u_write pass 'taosdata' sql_error alter user u_read pass 'taosdata' -sql show users +sql select * from information_schema.ins_users if $rows != 3 then return -1 endi @@ -56,7 +56,7 @@ sql_error create userabcd012345678901234567891234567890abcd012345678901234567891 sql_error create user abcd0123456789012345678901234567890111 PASS '123' sql create user abc01234567890123456789 PASS '123' -sql show users +sql select * from information_schema.ins_users if $rows != 5 then return -1 endi diff --git a/tests/script/tsim/user/privilege_db.sim b/tests/script/tsim/user/privilege_db.sim index f5d25266dc..83933e0e47 100644 --- a/tests/script/tsim/user/privilege_db.sim +++ b/tests/script/tsim/user/privilege_db.sim @@ -15,7 +15,7 @@ endi print =============== create users sql create user user1 PASS 'user1' sql create user user2 PASS 'user2' -sql show users +sql select * from information_schema.ins_users if $rows != 3 then return -1 endi @@ -71,7 +71,7 @@ sql REVOKE read,write ON *.* from user1; print =============== create users sql create user u1 PASS 'taosdata' -sql show users +sql select * from information_schema.ins_users if $rows != 4 then return -1 endi diff --git a/tests/script/tsim/user/privilege_sysinfo.sim b/tests/script/tsim/user/privilege_sysinfo.sim index 10c31dc288..f98eae13c3 100644 --- a/tests/script/tsim/user/privilege_sysinfo.sim +++ b/tests/script/tsim/user/privilege_sysinfo.sim @@ -49,9 +49,9 @@ sql_error show db.stables sql_error show db.tables print =============== check show -sql_error show users +sql_error select * from information_schema.ins_users sql_error show cluster -sql_error show dnodes +sql_error select * from information_schema.ins_dnodes sql_error show mnodes sql_error show snodes sql_error show qnodes diff --git a/tests/script/tsim/valgrind/basic1.sim b/tests/script/tsim/valgrind/basic1.sim index 2d70284c8b..1934584c0c 100644 --- a/tests/script/tsim/valgrind/basic1.sim +++ b/tests/script/tsim/valgrind/basic1.sim @@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -v sql connect -print =============== step1: create drop show dnodes +print =============== step1: create drop select * from information_schema.ins_dnodes $x = 0 step1: $x = $x + 1 @@ -12,7 +12,7 @@ step1: print ---> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 if $rows != 1 then return -1 diff --git a/tests/script/tsim/valgrind/basic2.sim b/tests/script/tsim/valgrind/basic2.sim index 522070f487..b6fdac84e6 100644 --- a/tests/script/tsim/valgrind/basic2.sim +++ b/tests/script/tsim/valgrind/basic2.sim @@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -v sql connect -print =============== step1: create drop show dnodes +print =============== step1: create drop select * from information_schema.ins_dnodes $x = 0 step1: $x = $x + 1 @@ -12,7 +12,7 @@ step1: print ---> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 if $rows != 1 then return -1 diff --git a/tests/script/tsim/valgrind/basic3.sim b/tests/script/tsim/valgrind/basic3.sim index 8ef1ff2a41..fe812da39f 100644 --- a/tests/script/tsim/valgrind/basic3.sim +++ b/tests/script/tsim/valgrind/basic3.sim @@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c debugflag -v 131 system sh/exec.sh -n dnode1 -s start -v sql connect -print =============== step1: create drop show dnodes +print =============== step1: create drop select * from information_schema.ins_dnodes $x = 0 step1: $x = $x + 1 @@ -13,7 +13,7 @@ step1: print ---> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 if $rows != 1 then return -1 diff --git a/tests/script/tsim/valgrind/basic4.sim b/tests/script/tsim/valgrind/basic4.sim index 98c4f8f2a8..6646aaf2ca 100644 --- a/tests/script/tsim/valgrind/basic4.sim +++ b/tests/script/tsim/valgrind/basic4.sim @@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c debugflag -v 131 system sh/exec.sh -n dnode1 -s start -v sql connect -print =============== step1: create drop show dnodes +print =============== step1: create drop select * from information_schema.ins_dnodes $x = 0 step1: $x = $x + 1 @@ -13,7 +13,7 @@ step1: print ---> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 if $rows != 1 then return -1 diff --git a/tests/script/tsim/valgrind/checkError1.sim b/tests/script/tsim/valgrind/checkError1.sim index 529b2d325f..d5fdaf1430 100644 --- a/tests/script/tsim/valgrind/checkError1.sim +++ b/tests/script/tsim/valgrind/checkError1.sim @@ -10,7 +10,7 @@ sql connect print =============== step1: create alter drop show user sql create user u1 pass 'taosdata' -sql show users +sql select * from information_schema.ins_users sql alter user u1 sysinfo 1 sql alter user u1 enable 1 sql alter user u1 pass 'taosdata' @@ -23,7 +23,7 @@ sql create dnode $hostname port 7300 sql drop dnode 3 sql alter dnode 1 'debugflag 131' -print =============== step3: show dnodes +print =============== step3: select * from information_schema.ins_dnodes $x = 0 step3: $x = $x + 1 @@ -32,7 +32,7 @@ step3: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -53,7 +53,7 @@ sql create table t0 using stb tags (0) sql create table tba (ts timestamp, c1 binary(10), c2 nchar(10)); print =============== run show xxxx -sql show dnodes +sql select * from information_schema.ins_dnodes if $rows != 2 then return -1 endi @@ -78,7 +78,7 @@ if $rows != 2 then return -1 endi -sql show users +sql select * from information_schema.ins_users if $rows != 1 then return -1 endi diff --git a/tests/script/tsim/valgrind/checkError2.sim b/tests/script/tsim/valgrind/checkError2.sim index d9e96d14dc..7a3b765e39 100644 --- a/tests/script/tsim/valgrind/checkError2.sim +++ b/tests/script/tsim/valgrind/checkError2.sim @@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c debugflag -v 131 system sh/exec.sh -n dnode1 -s start -v sql connect -print =============== step1: create drop show dnodes +print =============== step1: create drop select * from information_schema.ins_dnodes $x = 0 step1: $x = $x + 1 @@ -13,7 +13,7 @@ step1: print ---> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 if $rows != 1 then return -1 diff --git a/tests/script/tsim/valgrind/checkError3.sim b/tests/script/tsim/valgrind/checkError3.sim index 66d41ca6ea..6fa7e39335 100644 --- a/tests/script/tsim/valgrind/checkError3.sim +++ b/tests/script/tsim/valgrind/checkError3.sim @@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c debugflag -v 131 system sh/exec.sh -n dnode1 -s start sql connect -print =============== step1: create drop show dnodes +print =============== step1: create drop select * from information_schema.ins_dnodes $x = 0 step1: $x = $x + 1 @@ -13,7 +13,7 @@ step1: print ---> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 if $rows != 1 then return -1 diff --git a/tests/script/tsim/valgrind/checkError4.sim b/tests/script/tsim/valgrind/checkError4.sim index 37472d487b..49da99dd37 100644 --- a/tests/script/tsim/valgrind/checkError4.sim +++ b/tests/script/tsim/valgrind/checkError4.sim @@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c debugflag -v 131 system sh/exec.sh -n dnode1 -s start -v sql connect -print =============== step1: create drop show dnodes +print =============== step1: create drop select * from information_schema.ins_dnodes $x = 0 step1: $x = $x + 1 @@ -13,7 +13,7 @@ step1: print ---> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 if $rows != 1 then return -1 diff --git a/tests/script/tsim/valgrind/checkError5.sim b/tests/script/tsim/valgrind/checkError5.sim index bf3f9a1b0b..ef37951e77 100644 --- a/tests/script/tsim/valgrind/checkError5.sim +++ b/tests/script/tsim/valgrind/checkError5.sim @@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c debugflag -v 131 system sh/exec.sh -n dnode1 -s start -v sql connect -print =============== step1: create drop show dnodes +print =============== step1: create drop select * from information_schema.ins_dnodes $x = 0 step1: $x = $x + 1 @@ -13,7 +13,7 @@ step1: print ---> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 if $rows != 1 then return -1 diff --git a/tests/script/tsim/valgrind/checkError6.sim b/tests/script/tsim/valgrind/checkError6.sim index cd8b94e1d0..00de00f71d 100644 --- a/tests/script/tsim/valgrind/checkError6.sim +++ b/tests/script/tsim/valgrind/checkError6.sim @@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c debugflag -v 131 system sh/exec.sh -n dnode1 -s start -v sql connect -print =============== step1: create drop show dnodes +print =============== step1: create drop select * from information_schema.ins_dnodes $x = 0 step1: $x = $x + 1 @@ -13,7 +13,7 @@ step1: print ---> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ---> $data00 $data01 $data02 $data03 $data04 $data05 if $rows != 1 then return -1 diff --git a/tests/script/tsim/vnode/replica3_basic.sim b/tests/script/tsim/vnode/replica3_basic.sim index f7dd5dd136..c0e9d0cc6d 100644 --- a/tests/script/tsim/vnode/replica3_basic.sim +++ b/tests/script/tsim/vnode/replica3_basic.sim @@ -20,7 +20,7 @@ step01: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/vnode/replica3_import.sim b/tests/script/tsim/vnode/replica3_import.sim index d1e73b9f27..99608c72e2 100644 --- a/tests/script/tsim/vnode/replica3_import.sim +++ b/tests/script/tsim/vnode/replica3_import.sim @@ -31,7 +31,7 @@ stepa: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/vnode/replica3_many.sim b/tests/script/tsim/vnode/replica3_many.sim index 4fd3e39fdf..00bce3017a 100644 --- a/tests/script/tsim/vnode/replica3_many.sim +++ b/tests/script/tsim/vnode/replica3_many.sim @@ -23,7 +23,7 @@ step0: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/vnode/replica3_repeat.sim b/tests/script/tsim/vnode/replica3_repeat.sim index 7419139277..83b0ccedb7 100644 --- a/tests/script/tsim/vnode/replica3_repeat.sim +++ b/tests/script/tsim/vnode/replica3_repeat.sim @@ -23,7 +23,7 @@ step0: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/vnode/replica3_vgroup.sim b/tests/script/tsim/vnode/replica3_vgroup.sim index 746a9d67ae..6643966344 100644 --- a/tests/script/tsim/vnode/replica3_vgroup.sim +++ b/tests/script/tsim/vnode/replica3_vgroup.sim @@ -23,7 +23,7 @@ step0: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/script/tsim/vnode/stable_balance_replica1.sim b/tests/script/tsim/vnode/stable_balance_replica1.sim index dfc8de5160..f124979397 100644 --- a/tests/script/tsim/vnode/stable_balance_replica1.sim +++ b/tests/script/tsim/vnode/stable_balance_replica1.sim @@ -50,7 +50,7 @@ endw sleep 100 print =============== step2 -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] if $data(1)[2] != 4 then return -1 @@ -68,7 +68,7 @@ step3: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -82,7 +82,7 @@ if $data(2)[4] != ready then endi sql balance vgroup -sql show dnodes +sql select * from information_schema.ins_dnodes print dnode1 openVnodes $data(1)[2] print dnode2 openVnodes $data(2)[2] if $data(1)[2] != 2 then diff --git a/tests/script/tsim/vnode/stable_dnode2.sim b/tests/script/tsim/vnode/stable_dnode2.sim index 58d8974abc..2c82f5d856 100644 --- a/tests/script/tsim/vnode/stable_dnode2.sim +++ b/tests/script/tsim/vnode/stable_dnode2.sim @@ -23,7 +23,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/vnode/stable_dnode2_stop.sim b/tests/script/tsim/vnode/stable_dnode2_stop.sim index 55d9f4a02f..2fd1b78e56 100644 --- a/tests/script/tsim/vnode/stable_dnode2_stop.sim +++ b/tests/script/tsim/vnode/stable_dnode2_stop.sim @@ -23,7 +23,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then @@ -45,7 +45,7 @@ $tbNum = 10 $rowNum = 20 $totalNum = 200 -sql show dnodes; +sql select * from information_schema.ins_dnodes; print dnodes ==> $rows if $rows != 2 then return -1 @@ -105,7 +105,7 @@ dnode2: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/vnode/stable_dnode3.sim b/tests/script/tsim/vnode/stable_dnode3.sim index 41abf00bd0..a39dae644c 100644 --- a/tests/script/tsim/vnode/stable_dnode3.sim +++ b/tests/script/tsim/vnode/stable_dnode3.sim @@ -25,7 +25,7 @@ step1: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 3 then diff --git a/tests/script/tsim/vnode/stable_replica3_dnode6.sim b/tests/script/tsim/vnode/stable_replica3_dnode6.sim index e5c677ccbc..6e886b8a18 100644 --- a/tests/script/tsim/vnode/stable_replica3_dnode6.sim +++ b/tests/script/tsim/vnode/stable_replica3_dnode6.sim @@ -35,7 +35,7 @@ step10: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -70,7 +70,7 @@ $tbNum = 10 $rowNum = 20 $totalNum = 200 -sql show dnodes; +sql select * from information_schema.ins_dnodes; print dnodes ==> $rows if $rows != 6 then return -1 diff --git a/tests/script/tsim/vnode/stable_replica3_vnode3.sim b/tests/script/tsim/vnode/stable_replica3_vnode3.sim index ca26b2fd10..ff16941577 100644 --- a/tests/script/tsim/vnode/stable_replica3_vnode3.sim +++ b/tests/script/tsim/vnode/stable_replica3_vnode3.sim @@ -31,7 +31,7 @@ step10: print ====> dnode not ready! return -1 endi -sql show dnodes +sql select * from information_schema.ins_dnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 diff --git a/tests/system-test/0-others/user_control.py b/tests/system-test/0-others/user_control.py index 3be59f0adf..b020dbae2b 100644 --- a/tests/system-test/0-others/user_control.py +++ b/tests/system-test/0-others/user_control.py @@ -196,7 +196,7 @@ class TDTestCase: for i in range(self.users_count): tdSql.execute(f"create user {users[i]} pass '{passwds[i]}' ") - tdSql.query("show users") + tdSql.query("select * from information_schema.ins_users") tdSql.checkRows(self.users_count + 1) def create_user_err(self): @@ -586,7 +586,7 @@ class TDTestCase: # 默认只有 root 用户 tdLog.printNoPrefix("==========step0: init, user list only has root account") - tdSql.query("show users") + tdSql.query("select * from information_schema.ins_users") tdSql.checkData(0, 0, "root") tdSql.checkData(0, 1, "1") @@ -597,7 +597,7 @@ class TDTestCase: # 查看用户 tdLog.printNoPrefix("==========step2: show user test") - tdSql.query("show users") + tdSql.query("select * from information_schema.ins_users") tdSql.checkRows(self.users_count + 1) # 密码登录认证 @@ -619,7 +619,7 @@ class TDTestCase: tdDnodes.stop(1) tdDnodes.start(1) - tdSql.query("show users") + tdSql.query("select * from information_schema.ins_users") tdSql.checkRows(self.users_count + 1) # 普通用户权限 @@ -632,7 +632,7 @@ class TDTestCase: user.error("create use utest1 pass 'utest1pass'") # 可以查看用户 tdLog.printNoPrefix("==========step4.2: normal user can show user") - user.query("show users") + user.query("select * from information_schema.ins_users") assert user.queryRows == self.users_count + 1 # 不可以修改其他用户的密码 tdLog.printNoPrefix("==========step4.3: normal user can not alter other user pass") @@ -705,7 +705,7 @@ class TDTestCase: tdLog.printNoPrefix("==========step7: super user drop normal user") self.test_drop_user() - tdSql.query("show users") + tdSql.query("select * from information_schema.ins_users") tdSql.checkRows(1) tdSql.checkData(0, 0, "root") tdSql.checkData(0, 1, "1") @@ -719,7 +719,7 @@ class TDTestCase: self.login_err(self.__user_list[1], self.__passwd_list[1]) self.login_err(self.__user_list[1], f"new{self.__passwd_list[1]}") - tdSql.query("show users") + tdSql.query("select * from information_schema.ins_users") tdSql.checkRows(1) tdSql.checkData(0, 0, "root") tdSql.checkData(0, 1, "1") diff --git a/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py b/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py index 65d525cfd1..8e8a4d957c 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py +++ b/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py @@ -158,7 +158,7 @@ class TDTestCase: # check status of clusters clusterComCheck.checkMnodeStatus(3) tdSql.execute("create user %s pass '%s' ;"%(username,passwd)) - tdSql.query("show users") + tdSql.query("select * from information_schema.ins_users") for i in range(tdSql.queryRows): if tdSql.queryResult[i][0] == "%s"%username : tdLog.info("create user:%s successfully"%username) -- GitLab