From 9071ff39736daa9ec3d61c76cddbffa189955246 Mon Sep 17 00:00:00 2001
From: root <you@example.com>
Date: Mon, 25 Dec 2023 21:20:59 +0800
Subject: [PATCH] fix: add compactDb flushDb

---
 .../enterprise/multi-level/mlevel_basic.json  |  4 ++--
 .../enterprise/multi-level/mlevel_basic.py    | 19 +++++++------------
 tests/army/frame/caseBase.py                  |  2 ++
 tests/army/frame/eos.py                       |  3 ++-
 tests/army/frame/etool.py                     |  6 +++++-
 tests/army/frame/server/dnodes.py             |  8 +++++++-
 tests/army/test.py                            |  2 ++
 7 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/tests/army/enterprise/multi-level/mlevel_basic.json b/tests/army/enterprise/multi-level/mlevel_basic.json
index 7df5b1caa8..1c2b9274d2 100644
--- a/tests/army/enterprise/multi-level/mlevel_basic.json
+++ b/tests/army/enterprise/multi-level/mlevel_basic.json
@@ -24,12 +24,12 @@
                 {
                     "name": "stb",
                     "child_table_exists": "no",
-                    "childtable_count": 2,
+                    "childtable_count": 4,
                     "insert_rows": 1000000,
                     "childtable_prefix": "d",
                     "insert_mode": "taosc",
                     "timestamp_step": 1000,
-                    "start_timestamp":"now-10d",
+                    "start_timestamp":"now-12d",
                     "columns": [
                         { "type": "bool",        "name": "bc"},
                         { "type": "float",       "name": "fc" },
diff --git a/tests/army/enterprise/multi-level/mlevel_basic.py b/tests/army/enterprise/multi-level/mlevel_basic.py
index 70bfb9b66e..3bec2bfb72 100644
--- a/tests/army/enterprise/multi-level/mlevel_basic.py
+++ b/tests/army/enterprise/multi-level/mlevel_basic.py
@@ -36,23 +36,15 @@ class TDTestCase(TBase):
 
         tdSql.execute(f"use {self.db}")
         # set insert data information
-        self.childtable_count = 2
+        self.childtable_count = 4
         self.insert_rows = 1000000
         self.timestamp_step = 1000
 
     def doAction(self):
-        tdLog.info(f"trim database.")
+        tdLog.info(f"do action.")
+        self.flushDb()
         self.trimDb()
-
-    def saveData(self):
-        tdLog.info(f"check correct.")
-
-    def checkSaveCorrent(self):
-        tdLog.info(f"check correct.")
-
-    def checkCorrect(self):
-        tdLog.info(f"check correct.")
-
+        self.compactDb()
 
     # run
     def run(self):
@@ -73,6 +65,9 @@ class TDTestCase(TBase):
         # check save agg result correct
         self.checkAggCorrect()
 
+        # check insert correct again
+        self.checkInsertCorrect()
+
         tdLog.success(f"{__file__} successfully executed")
 
         
diff --git a/tests/army/frame/caseBase.py b/tests/army/frame/caseBase.py
index 11c44b28e9..441196f050 100644
--- a/tests/army/frame/caseBase.py
+++ b/tests/army/frame/caseBase.py
@@ -69,6 +69,8 @@ class TBase:
     def compactDb(self):
         tdSql.execute(f"compact database {self.db}")
 
+    def flushDb(self):
+        tdSql.execute(f"flush database {self.db}")
 
 #
 #  check db correct
diff --git a/tests/army/frame/eos.py b/tests/army/frame/eos.py
index ab4d2c1bd0..dcb63ff3aa 100644
--- a/tests/army/frame/eos.py
+++ b/tests/army/frame/eos.py
@@ -19,10 +19,11 @@ import sys
 import os
 import time
 import datetime
+import platform
 
 # if windows platform return True
 def isWin():
-    return sys.platform.lower() == 'windows'
+    return platform.system().lower() == 'windows'
 
 # wait util execute file finished 
 def exe(file):
diff --git a/tests/army/frame/etool.py b/tests/army/frame/etool.py
index f24871b3dd..35c390dc1a 100644
--- a/tests/army/frame/etool.py
+++ b/tests/army/frame/etool.py
@@ -21,6 +21,7 @@ import time
 import datetime
 import frame.epath
 import frame.eos
+from frame.log import *
 
 # run taosBenchmark with command or json file mode
 def runBenchmark(command = "", json = "") :
@@ -35,7 +36,10 @@ def runBenchmark(command = "", json = "") :
     if json != "":
         cmd = f"{bmFile} -f {json}"
         print(cmd)
-        frame.eos.exe(cmd)
+        status = frame.eos.exe(cmd)
+        if status !=0:
+          tdLog.exit(f"run failed {cmd} status={status}")
+       
 
 # get current directory file name
 def curFile(fullPath, filename):
diff --git a/tests/army/frame/server/dnodes.py b/tests/army/frame/server/dnodes.py
index 1e51fbc3be..0d40b665dd 100644
--- a/tests/army/frame/server/dnodes.py
+++ b/tests/army/frame/server/dnodes.py
@@ -911,4 +911,10 @@ class TDDnodes:
     def getAsan(self):
         return self.asan
 
-tdDnodes = TDDnodes()
\ No newline at end of file
+    def setLevelDisk(self, level, disk):
+        for i in range(len(self.dnodes)):
+            self.dnodes[i].level = int(level)
+            self.dnodes[i].disk  = int(disk)
+
+
+tdDnodes = TDDnodes()
diff --git a/tests/army/test.py b/tests/army/test.py
index 83d065b24b..a3e28b772d 100644
--- a/tests/army/test.py
+++ b/tests/army/test.py
@@ -373,6 +373,7 @@ if __name__ == "__main__":
         tAdapter.stop(force_kill=True)
 
         if dnodeNums == 1 :
+            tdDnodes.setLevelDisk(level, disk)
             tdDnodes.deploy(1,updateCfgDict)
             tdDnodes.start(1)
             tdCases.logSql(logSql)
@@ -542,6 +543,7 @@ if __name__ == "__main__":
 
         if dnodeNums == 1 :
             # dnode is one
+            tdDnodes.setLevelDisk(level, disk)
             tdDnodes.deploy(1,updateCfgDict)
             tdDnodes.start(1)
             tdCases.logSql(logSql)