From 1e1951e86d0bebf4f6807b4e00c1e9126a8821f8 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Fri, 19 Jan 2024 17:51:55 +0800
Subject: [PATCH] fix: add distributed total information

---
 tests/army/community/query/query_basic.py | 14 ++++++++++++
 tests/army/frame/caseBase.py              | 27 +++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/tests/army/community/query/query_basic.py b/tests/army/community/query/query_basic.py
index 90916a1c6c..13b37ef253 100644
--- a/tests/army/community/query/query_basic.py
+++ b/tests/army/community/query/query_basic.py
@@ -76,12 +76,26 @@ class TDTestCase(TBase):
         sql2 = "select bi from stb where bi is not null order by bi desc limit 10;"
         self.checkSameResult(sql1, sql2)
 
+        # distributed expect values
+        expects = {
+            "Block_Rows"     : 6*100000,
+            "Total_Tables"   : 6,
+            "Total_Vgroups"  : 3
+        }
+        self.waitTransactionZero()
+        reals = self.getDistributed(self.stb)
+        for k in expects.keys():
+            v = expects[k]
+            if int(reals[k]) != v:
+                tdLog.exit(f"distribute {k} expect: {v} real: {reals[k]}")
+
     # run
     def run(self):
         tdLog.debug(f"start to excute {__file__}")
 
         # insert data
         self.insertData()
+        self.flushDb()
 
         # check insert data correct
         self.checkInsertCorrect()
diff --git a/tests/army/frame/caseBase.py b/tests/army/frame/caseBase.py
index b1500b69e1..5715867faf 100644
--- a/tests/army/frame/caseBase.py
+++ b/tests/army/frame/caseBase.py
@@ -229,9 +229,9 @@ class TBase:
 #
 
     # get vgroups
-    def getVGroup(self, db_name):
+    def getVGroup(self, dbName):
         vgidList = []
-        sql = f"select vgroup_id from information_schema.ins_vgroups where db_name='{db_name}'"
+        sql = f"select vgroup_id from information_schema.ins_vgroups where db_name='{dbName}'"
         res = tdSql.getResult(sql)
         rows = len(res)
         for i in range(rows):
@@ -239,6 +239,29 @@ class TBase:
 
         return vgidList
     
+    # get distributed rows
+    def getDistributed(self, tbName):
+        sql = f"show table distributed {tbName}"
+        tdSql.query(sql)
+        dics = {}
+        i = 0
+        for i in range(tdSql.getRows()):
+            row = tdSql.getData(i, 0)
+            #print(row)
+            row = row.replace('[', '').replace(']', '')
+            #print(row)
+            items = row.split(' ')
+            #print(items)
+            for item in items:
+                #print(item)
+                v = item.split('=')
+                #print(v)
+                if len(v) == 2:
+                    dics[v[0]] = v[1]
+            if i > 5:
+                break
+        print(dics)
+        return dics
 
 
 #