diff --git a/tests/pytest/account/account_create.py b/tests/pytest/account/account_create.py index c008acccd8d8d33af0ca77bd161d4ab020c1543e..48b6bcde3462a4de310cfb8eb779e8dcb0b56384 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 adce1dd37c71bb9d93b4df5faedb74392c113f66..6b7ab815290f122b581059255ff1f4698827430d 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 ec728fe733e21a8ad28557092a652873bd3b3662..8eb787e95035a106e0c1141a9f8d0de6584c26c3 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 a51bf80b3d20b15063f9033b1a75918cc4a24fd6..42f7498d6954324e8d11d320822e8257783b0501 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 7bf2c2ac42a95d1ab6da3ecf50a287eea2ce46bb..8ac75c3995a44c57e8b00a605cd553db2b67575c 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 dbd0e2bd87c099dca54aa33d609696cb2dc89381..cc8130217aed0eaa9343d13439b625647d06eda6 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 e15edb3f3d444b7407244b8cf3fa781ba36357d6..9395beb0efcd1e6ffbb20f3fae2b1720332726f0 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 2af7cf56b7b547a707abc18f26a18fe74bd8f95e..a2c1bf9883108a417cb07364922e9692f7a13ec4 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 96fde9061a0648d69386cb7f5c23450dea6aad7e..560aef5c17de336fc9065a21e9a45b39d2a5baa5 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 da76cc467b7813586c98761319a01eb1f2ed6bb6..d8a410283e31d9322834a379e226385c4b0efc06 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 c924fee1ae673f4e5696d361be331527d41ff21d..ab144212e47ee5f494fbf911ecb1d530efa906cf 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 b9008e4c42b4f4a34b99bb48d4e38c780e747bb4..7ebba544185902d07ac58afbcec9bebddf8cb329 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 73702835f4f41c74ae4161019808d26fd8a7c7a7..31040ef0a15041f4e715c0a20df39daf23707e2f 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 27b308411aea5022641ae920a3a4e8848fb1dc04..b9e92563fff6de18433f2b3a0540b4a949d4f0cb 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 6d81effab63bb52801ab51e53ee1147326b3e851..5477ef358039d33da2ad403d9fd2ca2e3faa495e 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 d22aca07cbd3d3c6a902076103c9759209c6a966..07475adad6a05a6ef3c2c46c2b302896d8a554e8 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 884a43bce12d1bc2c137bab17b0e780c521e327c..e3dfccf700e5328fdf32174af259fe648a2f63b0 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 3c74de49166067624335937d0e0486924b9fdb4f..677e9bbacb0c7f1452d6ad3de8462f48a9d3d3a9 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 d0399222f14cc8b8d7ac12ebca8b91549c34942d..0ac8f56d9134d401231193609d6b7f45265a452a 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 19b29bf342d7c8d045b16111fdc5d2ef9b2039f1..6448cc02b8d3f23291cf88f213a1d74e8668fbb4 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 b9ee508f78602cee7d6c9f17dbc3e250e7014f72..f8ca114437e2674064f1a6ca9c612fdf0263e6ff 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 4af47ca336c188c3194b9fc64925073f8fb406c2..1e439f160578d65f2030586e36cf0321a896cd61 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 0adb6b475938c1aa37f56c20c5d6327c9f89d574..f93332a21a89dd5afebe529fb6f28466db3b2c21 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 a0877ad89c20697e3b9a46f4512766fbd11439d8..873005daf5b76ea7c2ffd139b2d8d6dd9a175789 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 376484a0661d89fcd38f6be790437e10c6ef2761..02625ba49016e4c03e3133fa07d4bfedeff2c292 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 b923a713353f5f4edf4ffe39b4063486260167a0..3b8dbeb637775189c861cb26e88413d38b5805d5 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 cb3bbb3a73f5213c346fc675049827730a6e3a01..a6d84da45a37be8dc5a8ed32e82d36011da4bdf8 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 8a9995f89162883c6529a3cd8e63bc764884147b..42be85bf4b490221ad09723678ac13fcbb3f65a7 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 6eed563bbc7c79ac35a782fbd9f2ccaa79f277d6..212c9130df6d97d6dcf44c06a60077d1d0d04d77 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 2633d822c91d87ad6e5cc70370ac880fd397b889..ae26952b6bc60729b7c274785953b0045b5f238b 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 0dfc937408253a18cf38e9a7553680e025f23c3e..a8143b2c75c32ba515b0d200acc062d60fd2b804 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 f2acb8b90a35186395ab559ee428a182a2cba0d4..c606d2a38f8beaf3f9d5f66787695bd3bc3a930e 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 9d0e967f4e1575195e126cd975540067038409c5..df82f7d7d2608854fb69f217109332b8a3830ae8 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 a8c0e83cc1e5da61a473fa5b9753e90450e57bec..23d22e4f7f60a802c4b57c79553b930c64bfb879 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 951d26635b257d1c1d3ab81889b66bb909b8038b..3fc28f4d8127ff9af76d8093627de949a6c625c6 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 511c79650684e74c82b209985686eba20e11a638..808bc1109ebaf8b4533aaafb58c36e95812d9000 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 0049dc6fba9bd33cd9c2e4f5b56510769dd0c60e..710c72fbd3e506faa34a972a312d0bf098ac0e8e 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 499089960100f0be445552112e2b2000164c1ca0..024d38da06489fec65a573cd6c94629f5c9d79f7 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 10bd4fc8bd3946871605f66493e15cdde28ec257..5dd716ce971bee71a696e29946cf411123e01101 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 a0b391dd763f96fa6d340fad213943045b45ed69..f085ab4340c99271d47af5177c37c157fc1ef353 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 68c6ecbd6ecf7c06b5ae595c16e5b7d4b89435bd..ed2dc120afeeedef2a4ea1f6f21c9d02e4de0813 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 4f258a02458b253f0b35bc54767dfa938dfd8931..a3d0d84f71248ca201850ff070ed75625c881af9 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 7496541b76da3245f034924e95fd468b61135aef..a214fdeb22e6e0e2afe28d6f0fd23f9bae5aa8d8 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 274ce85974bb2238bae60e6ffa9723760ae1c394..dba09f94e60c29c26c988a285b59f7d2f5d89d14 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 c1b1a7ea9ae24e5aafadfdeda2b55fe1ec2c7f26..3dc732ffd4d0154fad3734e96b90ec1fb59523fc 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 a7f80c6784b3931e5a0d16a2a88d58dbb719f4f3..fd14e025a50eb31debb45787b331776bcf2da50b 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 76e3be60a57bf822635e5eb22131dae326082dad..d232c9bcd3eee5422a4ae74ac3b401d0ba3420a6 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 021aa6853442dac05f1c8c821708f4abb5acd5b7..17ab04052043be36f22e10d56ae06ddf717b758a 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 6a11549b1db36c17db9d1fad685d82d9f4767588..679440590fe99648ee2907adbc027c3daa7aa526 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 191f618adb0668ca3c0d313cd153c79c7e7ad188..731f2aa256f219f37aed66c8a08098f9b322706c 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 79ee4c606fa06de5e1fb4e58288a5bcbc3a9c8dd..5ac2ee6c4ea7ce37ee3421c5e453ab7e9f801d5c 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 e99af1580d7231c9062e840253b41bc93d6191d6..32dbe826cca48f64c1825a75a72d7fd7f8b12906 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 6471529a1e708838bcd047da63435ae04683ece5..d91f5146458e07b97b5ff565b9049fb527435276 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 5da9a659f3ca57c4dd195d0fcbd0f8557974dfb0..f677d3925cc50a7143c1296e01a37f19b2dfbef3 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 f26c0eaa21c5126c93187688ab6f12176f19fd78..ce328f10bd6561fb4277decdb804ef235f51cb09 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 998d0654ab7743f4de5e231355161a476c70c112..580b53f9f998d76a7ea750d94cf3399a2285b872 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 276621cfcc5a3ba228100d937583dbe5079f6d49..afd7603b161968ed2d632b4cbfb13692035aa563 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 124ccbebba75c06d1320e51dbcd8b81a890c55a9..6b16e8b5696e8279337605bea44c04e001bce531 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 12c85cc48021980c830f968b6f70321c90dfeaa2..b307ad0341635e8af6bdcdcab5ddc1b8b024f6f8 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 16cd2bb3b0a6eb5537c9461611feefa3c2a51b00..b1959ad8a6f0c6236d5847d061201261b9b5cf51 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 20eac3836c73a94459ecede82b49231aceda5c63..a5f7e0ad02f415636a739cd90e1231cc63022f20 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 e1b7c4a3a4a88bb06629187dc638952a53889770..0fa7320ff6cd515452748c6c81e82011eb4f8dcb 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 6641ce053ccbf5bdd10984793acd699050207fcd..c50cf0f56e9c89ba538901323cc658ff1dcd90d4 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 63639877ee6108f1a6f9a337a4eb3b560b70c479..066e989df2c1860ca800852e82e34055a7669120 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 4855f4dccf9d2b5c8ebbf84995429b624b46529e..25106928460155ec80c45916ffbb49b14e43cff7 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 3608dd4a3ab04a3a9cad11f4294fca55f97bffc0..6b1686dbb4c2a16920c0c71ccc8b5e84371d5b72 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 d3b5a02a23b9683c96e9e4f9188786c655f11465..09da0ee6aaa9eb1046856dcd3d767e70878c6a6e 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 00c6e8a98d1d876fd1966ae71cb4c4b3c46e074d..a576969697ef3789d49582c2b99494116e867f23 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 947482b3d444db54bbdafa1c05c28302437b68f7..739e3f2984c2cba5c17ad704fbee999adad02e98 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 6614009497220299a3e2719e43ce878bc8263aff..652f0c14b444fc6178237df377846524d5ae2d30 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 c78d90e3521c70ed1596d3307a2dc4a6ba637677..30e644f170d5ceaba5f4f27b6fb603bdf45fc2bd 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 9c546e295fae5d1701d95cb70a5b15d085cc79b9..21bf02f61a607073e077639d73220c059a98472e 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 9fcf9451c1fe9b6bda313a25391740feedb441ae..112e5f28a45c367dc3df301df01efc356185fc9c 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 d93d4ca53fc2b6c56e0a8eccf7d3ac3ea74ec0ee..05515dac593947565398486f16b04ce8826a5312 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 e4188c6815cf8238589d89aac96877df4bce4df2..217d823d61084c41c7919546c98547da353342b3 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 695e23f3ac1a48f627f924763f0fa0f0dddfa29f..d1b7587db1ae342f94d179747f96516bfef9d70d 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 0ffcdd8c000dd8ec12c3db52d4d2eb76ba5d9a9b..8ad054746a8b9e6d27e97cdde167080b4aad2070 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 f23be019f7651cfb8abcd2ce058fbef5c1b2de93..73faf5abe24994dd7d9d97ee933271af8942c60c 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 df1afe65545166b1619aef0f7d013da425e06e37..55ffde14d9818300502eae9074a0d1b83b9cb9dc 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 81d95c704df7d5dc3cb80e91096906f998e92069..27a3aa9e2ac17aef7ee3d4a0791d778b5c5ae3c0 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 0adb296079b218ca7dde44846bb10d6b3ef51165..320f086fa55462481feeaf7fa06011350b6163db 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 98a20f3b22f2ee3302e6fbc194d08b5ff4681db6..3dad8059cd148504118d56a63f60b25247dc0fb6 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 3b6b33bf44d24279b13f9096054f2de78cd8c516..9e28c3803e373e1d973b34c39573b4a7ec4f13f3 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 edcf5734aae7d5b0e1ebe699cbaa1cf6235a75e0..2a90e7ff1d1f1a4ba25f79a94339219f3d4f5683 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 ed6c40f616e521d6f46c23db128ecadf380a982b..f4c9877bfd4c32622238cf21eafac8c35aaafa19 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 c061bf92771c84c123dc8ef201e78cdb4a9dd41c..bda1c036f02ded7953f8049a46318479b5feb106 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 b7d367ad90148a4e8200d84c44e95a4208aceb75..f4d95df083ca9f80ad5ed68d71992689aa7f66be 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 0b1bee19c8d8fddd7a4b393db7e530432613e124..103e66e54e674c10e3fbe3bd88e044ffe7d0041d 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 be814c2bd2449eb3818dc8c187221108ad30d8d7..158448d76537947d1f6a0fb8d9569becc33fcdd8 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 cc424f6ad4d67c28419f8ba1ca19690cec30e0b1..d61c7273e19ebee84cd0117a9faf163c3a854005 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 8d5c12a2ba5b7ec8a6c2261f803ef5ffa2e8bf1b..b3c0e9561f149445a7ae75036736bbf6f8eaf4a4 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 bfe674def7051fabd476bc983ce60c09eff0512a..af9b74665afc66f73ad5a89f764f2a608e23064f 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 2b4c292284e1642425171120570ed0331f419e70..0d2712f8db9f65ae051466d00f5f39ab9d27093f 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 93bf04ef41475650ebca00e962612e6f252bf236..d20f312e344ff603de77afe729eba6e930e4a21a 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 656e72f32a8fd8760394299b2865887f120d2cd6..b4b7d2ab9c44d291c5e1b0b2ee5ddb472798207f 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 1ee72527e91fedc144f4328651bb755bd0073044..b6b427343ed8c5c03367aef6b7edc2cd5495d469 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 927301c3c84027e3aed64660de34887683ccc6a2..79edea2a3c5941b1b9a7172dc528f0602c33c1bb 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 190304ff196d9af0705074d88dee4f86df394def..d752f5c29ce774b07286f44076fbcd415faa9acd 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 747f59fe85084ba08a7b0679b8dc0363cb7c8db4..b25e0021407e2cb86d051352ac930d8972006462 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 8cdebe599cb0774276764503b0e615fb3cd0661d..a789416f5b2b85e8801d678c515b3e879b4ea9ae 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 5e077566d30864e74bcaae636ac69ce827e7cbe6..f069ff40e597df927d7162d5d628a7d8a50a23ca 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 0996ac94a1cea04ed6c1aca8bcdde1321da01c3c..37e4199e236ebe93559824bfa79cf826af322657 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 420df6e41860eb40aa4f75e9455d2345b62c9b98..96a895303d19f2c9e62a175c3075c0cbc3566c82 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 bee574960e3995d693e07ccebb1170a4d2b6cf02..72ecd8ed50eb7c9553d3fef35d6d5c757cbe6140 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 3203c3333a06f9ceac25a335eb8ffc18494e4262..af0029b5390d1b9167b6061cd6d6bba88e0f71f2 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 00329ced76b583f7cd26f8d76e6e06213d20209c..6780fb413c05b4d65e992fd78f2dbe71d57c239f 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 fe0def8d92afbd74c8d353e39e5d3ae98752367a..733a624f7cf6f6427f342695509bff905b70fa4e 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 ecd69fd9f078d805af3710c6d2615d5554089ea6..69e970b70ff80b656c7333bcc87d89a087f332d3 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 d4e58f871e0fc94b0351c8a930515622f9e829a1..e42ef5fb821c8de4b91be71ed8a0d95a13d09b7d 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 feea99ff6e1dfa2bbfdb2789ff5a0dd9a0227619..3f30d3d5068eaa37e82caae0e7430db4be812d15 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 9c6cce0c8659636805b438bcd97c1dbb43b629f8..3e747dc61aad5d37dc93582e44cb59ee082070e8 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 d995f5f09894194e9d4a7d36f3abca4829504d82..c05f08bfa6fb609634fb1f9375f369b523d260c1 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 86f81fd550401ed7136a86ce44e512b4b7951a85..20cf879325fc1ce297b142033f315c43824abc88 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 869cb5fd5915381d957626ae14698f9030be6426..ee5f1129ebc08812a0591528698ebdc416b0ca45 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 454ad792d2a11e25e365c83b90219acf95366ecb..6f8c095162eeb00aa04a13e8326fd9e7ee38597d 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 402c03f67c717793d14ab76ef023f3aa89255de5..018df43ba2f39107d6d310c494d3943c2e111549 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 21a3a707e6be66ce5ad4e9bd305fde6990622f89..8b69ea6ea4a4a38894e03702c4915fa87f785635 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 bda1fe9f18afbc5468a1d949d28f55ed9bc820d1..8543bec144aac5b3e0c230cced7af3dc2e466a75 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 44785934e54e9fadbaa1b65bab7ef37808b18a69..82e592346858ace27baeadfb8d527d04bed62e78 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 298e0cf6e394fca8a529058fd1c4eb5c9451cca6..8b91efd5df93189e3b31245225e9dcddbcb6cf9b 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 d26b9dbc2e5d30d75b97ea2e9c6b668e5097e49e..19eb3a4423b0adea05087e1b851ad08246819643 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 f5d25266dce380ca1aec61ab28792738d8132163..83933e0e47f0e99ea5f9074db9bc463277ce578c 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 10c31dc288997b27b6d8fca52c6182f11760cdaa..f98eae13c3b1d85f50987aef8d5bde713e02dcd5 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 2d70284c8bb67975296c9dbccd18c354051b11a4..1934584c0c5c43170eeff492970140618ddbc6e4 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 522070f48711964ce21d870b574f14f12306668b..b6fdac84e681ff4fe3cffd276c5407f056929684 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 8ef1ff2a415ec9cf5618ee6051c39fe364b79cba..fe812da39f94fb227913b63b3be20e8259791232 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 98c4f8f2a889dbd4f89a2a6f3ca0707a63255dd0..6646aaf2caae9c796dfebb69342bf13a9b9ef28e 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 529b2d325faba62ba599bdc2b265ee7c35d0f455..d5fdaf1430f6750a6ed7d049c36d8429358133a7 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 d9e96d14dc8a37735accb3e60029dc758a682899..7a3b765e39b7621358506c105c802259dfd6c130 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 66d41ca6ea5a9cd84473e33c96fe64e663318e00..6fa7e393351b9378427e27f9695704ec8ad72006 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 37472d487bdbd516bbd4d63a1d15ab7d06acccdf..49da99dd37150edfb5fe04add57ef87343cc220f 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 bf3f9a1b0b0bcca98644323cfd796c9c4d50ae15..ef37951e7721dd7126cdc1a46779c480c5647c8b 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 cd8b94e1d0d3154cfec8cc30c4e60a988861ee08..00de00f71d06810e9d2a72f2b8d06bad5aa42266 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 f7dd5dd13633fb080cb46e2731695b8c2c649eec..c0e9d0cc6d874c6840d4d5650d96b0afbf296d19 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 d1e73b9f27e58d3cb9068af43fdd73ed9ac1562e..99608c72e26fbc6fbbd0794b680ccf7d8f1ad9b7 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 4fd3e39fdf718c0f77a70d48f6da9742a3be8795..00bce3017a6622fe4482233f0a3f8fda04c607f6 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 741913927757532909ca7597f1f11b3d93f8f196..83b0ccedb7dafe5e616092dd883a696e9fe80164 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 746a9d67ae2199cf72b6876ef014b707b31b1ce7..664396634402e27e3cb70fe3e7d55c6a1ed0978d 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 dfc8de516040ee5835de2874d209d2f830e3b9e4..f1249793975e8fc82692549c259a6289f3091ede 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 58d8974abced83a987de74ebb271d3c243780ba2..2c82f5d85603e76d73d3bb383c308d7ba245fe30 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 55d9f4a02fd2943690b7b087f2e7bcf422dd08d8..2fd1b78e56c28068f3cff30b100e292c2fbcba78 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 41abf00bd0fb87b99eb8547bb00e19f9767ba0f7..a39dae644c7449f5399432e0a360fc8af628277d 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 e5c677ccbc89d84d2725fa445f69fe337d48e857..6e886b8a18bb98f7886fc21120fd050873399299 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 ca26b2fd102a15720aa3140c7f98d495835006af..ff16941577bd6f6ae3ab76cc731cf9fdd454d9b5 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 3be59f0adf691f9479cce2c927c9161741bc8130..b020dbae2bf9ef77098fc9f0eee721f99e912085 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 65d525cfd18825f02993c33063d6eec3d23ffbcc..8e8a4d957c668a6cc6f75d90e434acb71db45a07 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)