diff --git a/tests/pytest/client/client.py b/tests/pytest/client/client.py index 9a155a4df9..6cfb1252bd 100644 --- a/tests/pytest/client/client.py +++ b/tests/pytest/client/client.py @@ -47,7 +47,7 @@ class TDTestCase: time.sleep(1) - ret = tdSql.query('show mnodes') + ret = tdSql.query('select * from information_schema.ins_mnodes') tdSql.checkRows(1) tdSql.checkData(0, 2, "master") diff --git a/tests/script/tsim/backup/arbitrator/dn3_mn2_killDnode.sim b/tests/script/tsim/backup/arbitrator/dn3_mn2_killDnode.sim index d90853d2e4..92731c2202 100644 --- a/tests/script/tsim/backup/arbitrator/dn3_mn2_killDnode.sim +++ b/tests/script/tsim/backup/arbitrator/dn3_mn2_killDnode.sim @@ -94,7 +94,7 @@ print ============== step3: stop dnode2 system sh/exec.sh -n dnode2 -s stop sleep 2000 -sql show mnodes +sql select * from information_schema.ins_mnodes 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/replica_changeWithArbitrator.sim b/tests/script/tsim/backup/arbitrator/replica_changeWithArbitrator.sim index df82f7d7d2..b34f1c8304 100644 --- a/tests/script/tsim/backup/arbitrator/replica_changeWithArbitrator.sim +++ b/tests/script/tsim/backup/arbitrator/replica_changeWithArbitrator.sim @@ -203,7 +203,7 @@ $cnt = $cnt + 1 if $cnt == 10 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes if $rows != 2 then sleep 2000 goto wait_dnode2_master diff --git a/tests/script/tsim/backup/cluster/cluster_main.sim b/tests/script/tsim/backup/cluster/cluster_main.sim index c6da56e2f7..024d1922f5 100644 --- a/tests/script/tsim/backup/cluster/cluster_main.sim +++ b/tests/script/tsim/backup/cluster/cluster_main.sim @@ -121,8 +121,8 @@ sleep 10000 #system rm -rf ../../../sim/dnode1/data #sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -137,8 +137,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step6-1: restart dnode1 system sh/exec.sh -n dnode1 -s start sleep 10000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -154,8 +154,8 @@ print ============== step7: stop dnode2 system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -170,8 +170,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step8: restart dnode2, then wait sync end system sh/exec.sh -n dnode2 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -186,8 +186,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step9: stop dnode3, then wait sync end system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -202,8 +202,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step10: restart dnode3, then wait sync end system sh/exec.sh -n dnode3 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -222,8 +222,8 @@ sleep 20000 print ============== step12: restart dnode4, then wait sync end system sh/exec.sh -n dnode4 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 diff --git a/tests/script/tsim/backup/cluster/cluster_main0.sim b/tests/script/tsim/backup/cluster/cluster_main0.sim index d1a05eff32..70c14eaff7 100644 --- a/tests/script/tsim/backup/cluster/cluster_main0.sim +++ b/tests/script/tsim/backup/cluster/cluster_main0.sim @@ -124,8 +124,8 @@ print ============== step6-1: restart dnode1 system sh/exec.sh -n dnode1 -s start sleep 10000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -141,8 +141,8 @@ print ============== step7: stop dnode2 system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -157,8 +157,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step8: restart dnode2, then wait sync end system sh/exec.sh -n dnode2 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -173,8 +173,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step9: stop dnode3, then wait sync end system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -189,8 +189,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step10: restart dnode3, then wait sync end system sh/exec.sh -n dnode3 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -209,8 +209,8 @@ sleep 20000 print ============== step12: restart dnode4, then wait sync end system sh/exec.sh -n dnode4 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 diff --git a/tests/script/tsim/backup/cluster/cluster_main1.sim b/tests/script/tsim/backup/cluster/cluster_main1.sim index 958ce8531a..db7708bc24 100644 --- a/tests/script/tsim/backup/cluster/cluster_main1.sim +++ b/tests/script/tsim/backup/cluster/cluster_main1.sim @@ -123,8 +123,8 @@ print ============== step6-1: restart dnode1 system sh/exec.sh -n dnode1 -s start sleep 10000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -140,8 +140,8 @@ print ============== step7: stop dnode2 system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -156,8 +156,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step8: restart dnode2, then wait sync end system sh/exec.sh -n dnode2 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -172,8 +172,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step9: stop dnode3, then wait sync end system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -188,8 +188,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step10: restart dnode3, then wait sync end system sh/exec.sh -n dnode3 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -208,8 +208,8 @@ sleep 20000 #print ============== step12: restart dnode4, then wait sync end #system sh/exec.sh -n dnode4 -s start #sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 diff --git a/tests/script/tsim/backup/cluster/cluster_main2.sim b/tests/script/tsim/backup/cluster/cluster_main2.sim index ab043641b2..d4ef23d266 100644 --- a/tests/script/tsim/backup/cluster/cluster_main2.sim +++ b/tests/script/tsim/backup/cluster/cluster_main2.sim @@ -127,8 +127,8 @@ print ============== step6-1: restart dnode1 system sh/exec.sh -n dnode1 -s start sleep 10000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -144,8 +144,8 @@ print ============== step7: stop dnode2 system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -160,8 +160,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step8: restart dnode2, then wait sync end system sh/exec.sh -n dnode2 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -176,8 +176,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step9: stop dnode3, then wait sync end system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -192,8 +192,8 @@ print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 print ============== step10: restart dnode3, then wait sync end system sh/exec.sh -n dnode3 -s start sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 @@ -212,8 +212,8 @@ sleep 20000 #print ============== step12: restart dnode4, then wait sync end #system sh/exec.sh -n dnode4 -s start #sleep 20000 -sql show mnodes -print show mnodes +sql select * from information_schema.ins_mnodes +print select * from information_schema.ins_mnodes print rows: $rows print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 diff --git a/tests/script/tsim/backup/clusterSimCase/cluster_main.sim b/tests/script/tsim/backup/clusterSimCase/cluster_main.sim index dba09f94e6..8614164f8a 100644 --- a/tests/script/tsim/backup/clusterSimCase/cluster_main.sim +++ b/tests/script/tsim/backup/clusterSimCase/cluster_main.sim @@ -16,7 +16,7 @@ # 5 | 718 | ready | 2 | 3 | master | 2 | slave | #Query OK, 4 row(s) in set (0.002749s) # -#taos> show mnodes +#taos> select * from information_schema.ins_mnodes # -> ; # id | end_point | role | create_time | #===================================================================================== diff --git a/tests/script/tsim/bnode/basic1.sim b/tests/script/tsim/bnode/basic1.sim index 3dc732ffd4..003d0ceb3d 100644 --- a/tests/script/tsim/bnode/basic1.sim +++ b/tests/script/tsim/bnode/basic1.sim @@ -15,7 +15,7 @@ if $data00 != 1 then return -1 endi -sql show mnodes; +sql select * from information_schema.ins_mnodes; if $rows != 1 then return -1 endi @@ -62,7 +62,7 @@ if $data14 != ready then return -1 endi -sql show mnodes; +sql select * from information_schema.ins_mnodes; if $rows != 1 then return -1 endi diff --git a/tests/script/tsim/dnode/create_dnode.sim b/tests/script/tsim/dnode/create_dnode.sim index b307ad0341..42e2e21bdc 100644 --- a/tests/script/tsim/dnode/create_dnode.sim +++ b/tests/script/tsim/dnode/create_dnode.sim @@ -17,7 +17,7 @@ if $data00 != 1 then endi -sql show mnodes; +sql select * from information_schema.ins_mnodes; 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 @@ -65,7 +65,7 @@ if $data14 != ready then return -1 endi -sql show mnodes; +sql select * from information_schema.ins_mnodes; if $rows != 1 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 b1959ad8a6..054f978607 100644 --- a/tests/script/tsim/dnode/drop_dnode_has_mnode.sim +++ b/tests/script/tsim/dnode/drop_dnode_has_mnode.sim @@ -59,7 +59,7 @@ step3: if $x == 10 then return -1 endi -sql show mnodes -x step3 +sql select * from information_schema.ins_mnodes -x step3 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 $data(1)[2] != leader then @@ -84,8 +84,8 @@ if $data00 != 1 then return -1 endi -print show mnodes; -sql show mnodes +print select * from information_schema.ins_mnodes; +sql select * from information_schema.ins_mnodes 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/use_dropped_dnode.sim b/tests/script/tsim/dnode/use_dropped_dnode.sim index 21bf02f61a..3a5defc505 100644 --- a/tests/script/tsim/dnode/use_dropped_dnode.sim +++ b/tests/script/tsim/dnode/use_dropped_dnode.sim @@ -115,7 +115,7 @@ step4: print ====> dnode not online! return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 if $rows != 2 then diff --git a/tests/script/tsim/mnode/basic1.sim b/tests/script/tsim/mnode/basic1.sim index 05515dac59..59156080c8 100644 --- a/tests/script/tsim/mnode/basic1.sim +++ b/tests/script/tsim/mnode/basic1.sim @@ -6,7 +6,7 @@ system sh/exec.sh -n dnode2 -s start sql connect print =============== select * from information_schema.ins_dnodes -sql show mnodes; +sql select * from information_schema.ins_mnodes; if $rows != 1 then return -1 endi @@ -49,7 +49,7 @@ step2: if $x == 20 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes print $data(1)[0] $data(1)[1] $data(1)[2] print $data(2)[0] $data(2)[1] $data(2)[2] @@ -72,7 +72,7 @@ endi sleep 2000 print ============ drop mnode 2 sql drop mnode on dnode 2 -sql show mnodes +sql select * from information_schema.ins_mnodes if $rows != 1 then return -1 endi @@ -85,7 +85,7 @@ step2: if $x == 20 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes print $data(1)[0] $data(1)[1] $data(1)[2] print $data(2)[0] $data(2)[1] $data(2)[2] @@ -109,7 +109,7 @@ sleep 2000 print =============== create mnodes sql create mnode on dnode 2 -sql show mnodes +sql select * from information_schema.ins_mnodes if $rows != 2 then return -1 endi @@ -121,7 +121,7 @@ step3: if $x == 20 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes print $data(1)[0] $data(1)[1] $data(1)[2] print $data(2)[0] $data(2)[1] $data(2)[2] diff --git a/tests/script/tsim/mnode/basic2.sim b/tests/script/tsim/mnode/basic2.sim index 217d823d61..5be29e88a6 100644 --- a/tests/script/tsim/mnode/basic2.sim +++ b/tests/script/tsim/mnode/basic2.sim @@ -6,7 +6,7 @@ system sh/exec.sh -n dnode2 -s start sql connect print =============== select * from information_schema.ins_dnodes -sql show mnodes; +sql select * from information_schema.ins_mnodes; if $rows != 1 then return -1 endi @@ -46,7 +46,7 @@ step2: if $x == 20 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes print $data(1)[0] $data(1)[1] $data(1)[2] print $data(2)[0] $data(2)[1] $data(2)[2] @@ -88,7 +88,7 @@ system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode2 -s start sql connect -sql show mnodes +sql select * from information_schema.ins_mnodes if $rows != 2 then return -1 endi diff --git a/tests/script/tsim/mnode/basic3.sim b/tests/script/tsim/mnode/basic3.sim index d1b7587db1..02650ba10d 100644 --- a/tests/script/tsim/mnode/basic3.sim +++ b/tests/script/tsim/mnode/basic3.sim @@ -49,7 +49,7 @@ step2: if $x == 10 then return -1 endi -sql show mnodes -x step2 +sql select * from information_schema.ins_mnodes -x step2 print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 @@ -87,7 +87,7 @@ step4: if $x == 10 then return -1 endi -sql show mnodes -x step4 +sql select * from information_schema.ins_mnodes -x step4 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] @@ -126,7 +126,7 @@ step5: if $x == 10 then return -1 endi -sql show mnodes -x step5 +sql select * from information_schema.ins_mnodes -x step5 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] @@ -165,7 +165,7 @@ step6: if $x == 10 then return -1 endi -sql show mnodes -x step6 +sql select * from information_schema.ins_mnodes -x step6 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] diff --git a/tests/script/tsim/mnode/basic4.sim b/tests/script/tsim/mnode/basic4.sim index 8ad054746a..a2b8aa2f96 100644 --- a/tests/script/tsim/mnode/basic4.sim +++ b/tests/script/tsim/mnode/basic4.sim @@ -49,7 +49,7 @@ endi system sh/exec.sh -n dnode3 -s stop sql_error create mnode on dnode 3 -print =============== step3: show mnodes +print =============== step3: select * from information_schema.ins_mnodes $x = 0 step3: @@ -58,7 +58,7 @@ step3: if $x == 10 then return -1 endi -sql show mnodes -x step3 +sql select * from information_schema.ins_mnodes -x step3 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] print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] @@ -96,7 +96,7 @@ step4: if $x == 10 then return -1 endi -sql show mnodes -x step4 +sql select * from information_schema.ins_mnodes -x step4 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] print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] @@ -135,7 +135,7 @@ step5: if $x == 10 then return -1 endi -sql show mnodes -x step5 +sql select * from information_schema.ins_mnodes -x step5 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] print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] @@ -173,7 +173,7 @@ step6: if $x == 10 then return -1 endi -sql show mnodes -x step6 +sql select * from information_schema.ins_mnodes -x step6 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] print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] diff --git a/tests/script/tsim/mnode/basic5.sim b/tests/script/tsim/mnode/basic5.sim index 73faf5abe2..387f38a717 100644 --- a/tests/script/tsim/mnode/basic5.sim +++ b/tests/script/tsim/mnode/basic5.sim @@ -67,7 +67,7 @@ step31: if $x == 50 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes $leaderNum = 0 if $data(1)[2] == leader then $leaderNum = 1 @@ -161,7 +161,7 @@ step61: if $x == 10 then return -1 endi -sql show mnodes -x step61 +sql select * from information_schema.ins_mnodes -x step61 print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -215,7 +215,7 @@ step81: if $x == 10 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -271,7 +271,7 @@ step92: if $x == 20 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 @@ -301,7 +301,7 @@ stepa: if $x == 10 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes 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/qnode/basic1.sim b/tests/script/tsim/qnode/basic1.sim index 27a3aa9e2a..deaa457e1e 100644 --- a/tests/script/tsim/qnode/basic1.sim +++ b/tests/script/tsim/qnode/basic1.sim @@ -62,7 +62,7 @@ if $data14 != ready then return -1 endi -sql show mnodes; +sql select * from information_schema.ins_mnodes; if $rows != 1 then return -1 endi diff --git a/tests/script/tsim/show/basic.sim b/tests/script/tsim/show/basic.sim index af9b74665a..eb2c808dad 100644 --- a/tests/script/tsim/show/basic.sim +++ b/tests/script/tsim/show/basic.sim @@ -44,7 +44,7 @@ if $rows != 2 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes if $rows != 1 then return -1 endi @@ -142,7 +142,7 @@ if $rows != 2 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes if $rows != 1 then return -1 endi diff --git a/tests/script/tsim/snode/basic1.sim b/tests/script/tsim/snode/basic1.sim index d20f312e34..86072215f7 100644 --- a/tests/script/tsim/snode/basic1.sim +++ b/tests/script/tsim/snode/basic1.sim @@ -62,7 +62,7 @@ if $data14 != ready then return -1 endi -sql show mnodes; +sql select * from information_schema.ins_mnodes; if $rows != 1 then return -1 endi diff --git a/tests/script/tsim/sync/3Replica5VgElect3mnode.sim b/tests/script/tsim/sync/3Replica5VgElect3mnode.sim index 96a895303d..a431f5634d 100644 --- a/tests/script/tsim/sync/3Replica5VgElect3mnode.sim +++ b/tests/script/tsim/sync/3Replica5VgElect3mnode.sim @@ -276,7 +276,7 @@ check_mnode_ready_2: print ====> first create three mnode not ready! return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes 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] @@ -568,7 +568,7 @@ check_mnode_ready_3: print ====> second mnode not ready! return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes 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] @@ -847,7 +847,7 @@ check_mnode_ready_3: print ====> third: mnode not ready! return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes 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] diff --git a/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim b/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim index 72ecd8ed50..a0826d9708 100644 --- a/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim +++ b/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim @@ -278,7 +278,7 @@ check_mnode_ready_2: print ====> first create three mnode not ready! return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes 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] @@ -531,7 +531,7 @@ check_mnode_ready_3: print ====> second mnode not ready! return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes 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] @@ -580,7 +580,7 @@ if $loop_cnt == 300 then print ====> vgroups not ready! return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes 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] diff --git a/tests/script/tsim/sync/mnodeLeaderTransfer.sim b/tests/script/tsim/sync/mnodeLeaderTransfer.sim index 6780fb413c..ed21ac19c3 100644 --- a/tests/script/tsim/sync/mnodeLeaderTransfer.sim +++ b/tests/script/tsim/sync/mnodeLeaderTransfer.sim @@ -8,7 +8,7 @@ system sh/exec.sh -n dnode3 -s start sql connect print =============== select * from information_schema.ins_dnodes -sql show mnodes; +sql select * from information_schema.ins_mnodes; if $rows != 1 then return -1 endi diff --git a/tests/script/tsim/user/password.sim b/tests/script/tsim/user/password.sim index 19eb3a4423..d26b9dbc2e 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 select * from information_schema.ins_users +sql show 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 select * from information_schema.ins_users +sql show 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 select * from information_schema.ins_users +sql show 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 select * from information_schema.ins_users +sql show users if $rows != 5 then return -1 endi diff --git a/tests/script/tsim/user/privilege_sysinfo.sim b/tests/script/tsim/user/privilege_sysinfo.sim index f98eae13c3..cbf714ed73 100644 --- a/tests/script/tsim/user/privilege_sysinfo.sim +++ b/tests/script/tsim/user/privilege_sysinfo.sim @@ -52,7 +52,7 @@ print =============== check show sql_error select * from information_schema.ins_users sql_error show cluster sql_error select * from information_schema.ins_dnodes -sql_error show mnodes +sql_error select * from information_schema.ins_mnodes sql_error show snodes sql_error show qnodes sql_error show bnodes diff --git a/tests/script/tsim/valgrind/checkError1.sim b/tests/script/tsim/valgrind/checkError1.sim index d5fdaf1430..5f82d2d935 100644 --- a/tests/script/tsim/valgrind/checkError1.sim +++ b/tests/script/tsim/valgrind/checkError1.sim @@ -58,7 +58,7 @@ if $rows != 2 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes if $rows != 1 then return -1 endi diff --git a/tests/script/tsim/vnode/replica3_basic.sim b/tests/script/tsim/vnode/replica3_basic.sim index c0e9d0cc6d..473e53e84b 100644 --- a/tests/script/tsim/vnode/replica3_basic.sim +++ b/tests/script/tsim/vnode/replica3_basic.sim @@ -47,7 +47,7 @@ step02: if $x == 20 then return -1 endi -sql show mnodes +sql select * from information_schema.ins_mnodes 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] diff --git a/tests/system-test/0-others/user_control.py b/tests/system-test/0-others/user_control.py index b020dbae2b..5e0a2b4102 100644 --- a/tests/system-test/0-others/user_control.py +++ b/tests/system-test/0-others/user_control.py @@ -692,7 +692,7 @@ class TDTestCase: taos4_conn = taos.connect(user=self.__user_list[4], password=f"new{self.__passwd_list[4]}") taos4_except = True try: - taos4_conn.query(f"show mnodes") + taos4_conn.query(f"select * from information_schema.ins_mnodes") taos4_conn.query(f"show {DBNAME}.vgroups") except BaseException: taos4_except = False diff --git a/tests/system-test/6-cluster/5dnode1mnode.py b/tests/system-test/6-cluster/5dnode1mnode.py index 6a8f5a2efb..60b70433ed 100644 --- a/tests/system-test/6-cluster/5dnode1mnode.py +++ b/tests/system-test/6-cluster/5dnode1mnode.py @@ -94,7 +94,7 @@ class TDTestCase: tdSql.checkData(4,1,'%s:6430'%self.host) tdSql.checkData(0,4,'ready') tdSql.checkData(4,4,'ready') - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') tdSql.checkData(0,3,'ready') diff --git a/tests/system-test/6-cluster/5dnode2mnode.py b/tests/system-test/6-cluster/5dnode2mnode.py index 59d4f5f18f..f62483cfe2 100644 --- a/tests/system-test/6-cluster/5dnode2mnode.py +++ b/tests/system-test/6-cluster/5dnode2mnode.py @@ -48,7 +48,7 @@ class TDTestCase: tdSql.checkData(4,1,'%s:6430'%self.host) tdSql.checkData(0,4,'ready') tdSql.checkData(4,4,'ready') - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') tdSql.checkData(0,3,'ready') @@ -62,7 +62,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(2) if tdSql.queryResult[0][2]=='leader' : if tdSql.queryResult[1][2]=='follower': diff --git a/tests/system-test/6-cluster/5dnode3mnodeDrop.py b/tests/system-test/6-cluster/5dnode3mnodeDrop.py index 32f222dacb..d95124c445 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeDrop.py +++ b/tests/system-test/6-cluster/5dnode3mnodeDrop.py @@ -117,7 +117,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -141,7 +141,7 @@ class TDTestCase: tdLog.debug("three mnodes is not ready in 10s ") return -1 - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,3,'ready') @@ -154,7 +154,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='offline' : @@ -172,7 +172,7 @@ class TDTestCase: return -1 tdSql.error("drop mnode on dnode 1;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'offline') @@ -186,7 +186,7 @@ class TDTestCase: count=0 while count < 40: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -200,7 +200,7 @@ class TDTestCase: return -1 tdSql.error("drop mnode on dnode 2;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -216,7 +216,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -229,7 +229,7 @@ class TDTestCase: tdLog.debug("stop mnodes on dnode 3 failed in 10s") return -1 tdSql.error("drop mnode on dnode 3;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -249,7 +249,7 @@ class TDTestCase: tdSql.checkData(4,1,'%s:6430'%self.host) tdSql.checkData(0,4,'ready') tdSql.checkData(4,4,'ready') - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(1) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -276,11 +276,11 @@ class TDTestCase: for i in range(1,3): tdLog.debug("drop mnode on dnode %d"%(i+1)) tdSql.execute("drop mnode on dnode %d"%(i+1)) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") count=0 while count<10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(2): tdLog.debug("drop mnode %d successfully"%(i+1)) break @@ -290,7 +290,7 @@ class TDTestCase: count=0 while count<10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3): tdLog.debug("drop mnode %d successfully"%(i+1)) break diff --git a/tests/system-test/6-cluster/5dnode3mnodeDropInsert.py b/tests/system-test/6-cluster/5dnode3mnodeDropInsert.py index 106bb26264..6443a4a7f0 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeDropInsert.py +++ b/tests/system-test/6-cluster/5dnode3mnodeDropInsert.py @@ -209,7 +209,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : print("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -232,7 +232,7 @@ class TDTestCase: print("three mnodes is not ready in 10s ") return -1 - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,3,'ready') @@ -245,7 +245,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : print("mnode is three nodes") if tdSql.queryResult[0][2]=='offline' : @@ -263,7 +263,7 @@ class TDTestCase: return -1 tdSql.error("drop mnode on dnode 1;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'offline') @@ -277,7 +277,7 @@ class TDTestCase: count=0 while count < 40: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : print("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -291,7 +291,7 @@ class TDTestCase: return -1 tdSql.error("drop mnode on dnode 2;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -307,7 +307,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : print("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -320,7 +320,7 @@ class TDTestCase: print("stop mnodes on dnode 3 failed in 10s") return -1 tdSql.error("drop mnode on dnode 3;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -348,7 +348,7 @@ class TDTestCase: tdSql.checkData(4,1,'%s:6430'%self.host) tdSql.checkData(0,4,'ready') tdSql.checkData(4,4,'ready') - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(1) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -383,11 +383,11 @@ class TDTestCase: for i in range(1,3): tdLog.debug("drop mnode on dnode %d"%(i+1)) tdSql.execute("drop mnode on dnode %d"%(i+1)) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") count=0 while count<10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(2): print("drop mnode %d successfully"%(i+1)) break @@ -397,7 +397,7 @@ class TDTestCase: count=0 while count<10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3): print("drop mnode %d successfully"%(i+1)) break diff --git a/tests/system-test/6-cluster/5dnode3mnodeSeperate1VnodeStopInsert.py b/tests/system-test/6-cluster/5dnode3mnodeSeperate1VnodeStopInsert.py index bc1530bb8b..870596175e 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeSeperate1VnodeStopInsert.py +++ b/tests/system-test/6-cluster/5dnode3mnodeSeperate1VnodeStopInsert.py @@ -128,7 +128,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : print("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -151,7 +151,7 @@ class TDTestCase: print("three mnodes is not ready in 10s ") return -1 - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,3,'ready') @@ -164,7 +164,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : print("mnode is three nodes") if tdSql.queryResult[0][2]=='offline' : @@ -182,7 +182,7 @@ class TDTestCase: return -1 tdSql.error("drop mnode on dnode 1;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'offline') @@ -196,7 +196,7 @@ class TDTestCase: count=0 while count < 40: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : print("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -210,7 +210,7 @@ class TDTestCase: return -1 tdSql.error("drop mnode on dnode 2;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -226,7 +226,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : print("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -239,7 +239,7 @@ class TDTestCase: print("stop mnodes on dnode 3 failed in 10s") return -1 tdSql.error("drop mnode on dnode 3;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -265,7 +265,7 @@ class TDTestCase: tdSql.checkData(4,1,'%s:6430'%self.host) tdSql.checkData(0,4,'ready') tdSql.checkData(4,4,'ready') - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(1) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') diff --git a/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py b/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py index 0d7e453042..94796a8280 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py +++ b/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py @@ -167,7 +167,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -190,7 +190,7 @@ class TDTestCase: tdLog.debug("three mnodes is not ready in 10s ") return -1 - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,3,'ready') @@ -203,7 +203,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='offline' : @@ -221,7 +221,7 @@ class TDTestCase: return -1 tdSql.error("drop mnode on dnode 1;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'offline') @@ -235,7 +235,7 @@ class TDTestCase: count=0 while count < 40: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -249,7 +249,7 @@ class TDTestCase: return -1 tdSql.error("drop mnode on dnode 2;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -265,7 +265,7 @@ class TDTestCase: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(3) : tdLog.debug("mnode is three nodes") if tdSql.queryResult[0][2]=='leader' : @@ -278,7 +278,7 @@ class TDTestCase: tdLog.debug("stop mnodes on dnode 3 failed in 10s") return -1 tdSql.error("drop mnode on dnode 3;") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(3) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') @@ -296,7 +296,7 @@ class TDTestCase: tdSql.checkData(4,1,'%s:6430'%self.host) tdSql.checkData(0,4,'ready') tdSql.checkData(4,4,'ready') - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(1) tdSql.checkData(0,1,'%s:6030'%self.host) tdSql.checkData(0,2,'leader') diff --git a/tests/system-test/6-cluster/clusterCommonCheck.py b/tests/system-test/6-cluster/clusterCommonCheck.py index 196b362f45..b16956c497 100644 --- a/tests/system-test/6-cluster/clusterCommonCheck.py +++ b/tests/system-test/6-cluster/clusterCommonCheck.py @@ -117,7 +117,7 @@ class ClusterComCheck: while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(self.mnodeNums) : tdLog.success("cluster has %d mnodes" %self.mnodeNums ) @@ -164,7 +164,7 @@ class ClusterComCheck: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(mnodeNums) : tdLog.success("cluster has %d mnodes" %self.mnodeNums ) else: @@ -210,7 +210,7 @@ class ClusterComCheck: count=0 while count < 10: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(mnodeNums) : tdLog.success("cluster has %d mnodes" %self.mnodeNums ) else: diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py index e93b13278b..ed846f8f05 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py @@ -41,7 +41,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas.py index 7638d8227f..7f7543971c 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas.py @@ -47,7 +47,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas_querys.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas_querys.py index 02d944b08f..0a3c4544a0 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas_querys.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica1_insertdatas_querys.py @@ -48,7 +48,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas.py index 5d112f4352..588b815dce 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas.py @@ -47,7 +47,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_force_stop_all_dnodes.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_force_stop_all_dnodes.py index 3d01015af6..481ce93358 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_force_stop_all_dnodes.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_force_stop_all_dnodes.py @@ -57,7 +57,7 @@ class TDTestCase: def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys.py index 3649617c21..302914d775 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys.py @@ -48,7 +48,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_all_vnode.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_all_vnode.py index db05eca9ce..aea6d798fb 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_all_vnode.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_all_vnode.py @@ -50,7 +50,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_follower.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_follower.py index fdd5ec7d46..5d50ff0353 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_follower.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_follower.py @@ -50,7 +50,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_leader.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_leader.py index cbb007d961..fd54b28a82 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_leader.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_querys_loop_restart_leader.py @@ -50,7 +50,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_all_dnodes.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_all_dnodes.py index 63c4942c9e..210e5efcbf 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_all_dnodes.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_all_dnodes.py @@ -57,7 +57,7 @@ class TDTestCase: def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_sync.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_sync.py index c608c93f5e..802cd752ee 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_sync.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_sync.py @@ -56,7 +56,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync.py index 25c26c7288..545feaf5f1 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync.py @@ -56,7 +56,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync_force_stop.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync_force_stop.py index edff274793..dbdc590eae 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync_force_stop.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_follower_unsync_force_stop.py @@ -56,7 +56,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader.py index 1020139d63..00448cbae6 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader.py @@ -139,7 +139,7 @@ class TDTestCase: return check_status def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader_forece_stop.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader_forece_stop.py index 6abe700bd6..9bbb84281e 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader_forece_stop.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_leader_forece_stop.py @@ -139,7 +139,7 @@ class TDTestCase: return check_status def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_mnode3_insertdatas_querys.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_mnode3_insertdatas_querys.py index ed20a51595..5ec17ec0e0 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_mnode3_insertdatas_querys.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_mnode3_insertdatas_querys.py @@ -48,7 +48,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode @@ -190,7 +190,7 @@ class TDTestCase: # create mnode tdSql.execute("create mnode on dnode 2 ") tdSql.execute("create mnode on dnode 3 ") - os.system("taos -s 'show mnodes;'") + os.system("taos -s 'select * from information_schema.ins_mnodes;'") # start writing constantly writing = threading.Thread(target = self.create_db_replica_3_insertdatas, args=(self.db_name , self.replica , self.vgroups , self.tb_nums , self.row_nums)) writing.start() diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_follower.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_follower.py index d60817a2b4..33e0ae3058 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_follower.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_follower.py @@ -58,7 +58,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_follower_force_stop.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_follower_force_stop.py index da9dc115eb..7c67bde776 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_follower_force_stop.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_follower_force_stop.py @@ -58,7 +58,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader.py index 561159af89..ed1fcc026c 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader.py @@ -58,7 +58,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader_force_stop.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader_force_stop.py index fb0ddd5435..97ebf4292e 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader_force_stop.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader_force_stop.py @@ -58,7 +58,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py index ff7f84a29d..dc12c74a98 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py @@ -47,7 +47,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups_stopOne.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups_stopOne.py index 97a497dfe9..5f6ac9fcc7 100644 --- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups_stopOne.py +++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups_stopOne.py @@ -50,7 +50,7 @@ class TDTestCase: return buildPath def check_setup_cluster_status(self): - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") for mnode in tdSql.queryResult: name = mnode[1] info = mnode diff --git a/tests/system-test/7-tmq/tmq3mnodeSwitch.py b/tests/system-test/7-tmq/tmq3mnodeSwitch.py index 305a93128e..9a98c69aff 100644 --- a/tests/system-test/7-tmq/tmq3mnodeSwitch.py +++ b/tests/system-test/7-tmq/tmq3mnodeSwitch.py @@ -63,7 +63,7 @@ class TDTestCase: count=0 while count < self.mnodeCheckCnt: time.sleep(1) - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") if tdSql.checkRows(self.mnodes) : tdLog.debug("mnode is three nodes") else: @@ -87,7 +87,7 @@ class TDTestCase: else: tdLog.exit("three mnodes is not ready in 10s ") - tdSql.query("show mnodes;") + tdSql.query("select * from information_schema.ins_mnodes;") tdSql.checkRows(self.mnodes) tdSql.checkData(0,self.mnodeEpIndex,'%s:%d'%(self.host,self.startPort)) tdSql.checkData(0,self.mnodeStatusIndex,'ready') @@ -100,7 +100,7 @@ class TDTestCase: count=0 while count < self.mnodeCheckCnt: time.sleep(1) - tdSql.query("show mnodes") + tdSql.query("select * from information_schema.ins_mnodes") tdLog.debug(tdSql.queryResult) # if tdSql.checkRows(self.mnodes) : # tdLog.debug("mnode is three nodes")