From 1068419daf415a604b6908945f0453e85231ec08 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 20 Apr 2024 15:48:52 +0800
Subject: [PATCH] fix: case is passed

---
 tests/army/enterprise/s3/s3Basic.json  |  2 +-
 tests/army/enterprise/s3/s3Basic.py    | 42 +++++++++++++++++++++++---
 tests/army/enterprise/s3/s3Basic1.json |  2 +-
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/tests/army/enterprise/s3/s3Basic.json b/tests/army/enterprise/s3/s3Basic.json
index e58ff857f8..dae0ec4d13 100644
--- a/tests/army/enterprise/s3/s3Basic.json
+++ b/tests/army/enterprise/s3/s3Basic.json
@@ -32,7 +32,7 @@
                 {
                     "name": "stb",
                     "child_table_exists": "no",
-                    "childtable_count": 20,
+                    "childtable_count": 10,
                     "insert_rows": 2000000,
                     "childtable_prefix": "d",
                     "insert_mode": "taosc",
diff --git a/tests/army/enterprise/s3/s3Basic.py b/tests/army/enterprise/s3/s3Basic.py
index fffa36e85d..18fc3b0252 100644
--- a/tests/army/enterprise/s3/s3Basic.py
+++ b/tests/army/enterprise/s3/s3Basic.py
@@ -62,7 +62,7 @@ class TDTestCase(TBase):
 
         tdSql.execute(f"use {self.db}")
         # come from s3_basic.json
-        self.childtable_count = 20
+        self.childtable_count = 10
         self.insert_rows = 2000000
         self.timestamp_step = 1000
 
@@ -243,10 +243,41 @@ class TDTestCase(TBase):
         etool.benchMark(json=json)
 
         # come from s3_basic.json
-        self.childtable_count = 20
-        self.insert_rows = 2000000 + 2000000/2
+        self.insert_rows += self.insert_rows/2
         self.timestamp_step = 500
 
+    # delete
+    def checkDelete(self):
+        # del 1000 rows
+        start = 1600000000000
+        drows = 1000
+        for i in range(1, drows, 2):
+            sql = f"from {self.db}.{self.stb} where ts = {start + i*500}"
+            tdSql.execute("delete " + sql, show=True)
+            tdSql.query("select * " + sql)
+            tdSql.checkRows(0)
+        
+        # delete all 500 step
+        self.flushDb()
+        self.compactDb()
+        self.insert_rows   -= drows/2
+        sql = f"select count(*) from {self.db}.{self.stb}"
+        tdSql.checkAgg(sql, self.insert_rows * self.childtable_count)
+
+        # delete 10W rows from 10000
+        drows = 100000
+        sdel = start + 1000000 * self.timestamp_step
+        edel = start + 1000000 * self.timestamp_step + drows * self.timestamp_step
+        sql = f"from {self.db}.{self.stb} where ts >= {sdel} and ts < {edel}"
+        tdSql.execute("delete " + sql, show=True)
+        tdSql.query("select * " + sql)
+        tdSql.checkRows(0)
+
+        self.insert_rows   -= drows
+        sql = f"select count(*) from {self.db}.{self.stb}"
+        tdSql.checkAgg(sql, self.insert_rows * self.childtable_count)
+        
+
     # run
     def run(self):
         tdLog.debug(f"start to excute {__file__}")
@@ -279,7 +310,7 @@ class TDTestCase(TBase):
             self.checkInsertCorrect()
 
             # checkBasic
-            #self.checkBasic()
+            self.checkBasic()
 
             # check stream correct and drop stream
             #self.checkStreamCorrect()
@@ -293,7 +324,8 @@ class TDTestCase(TBase):
             self.snapshotAgg()
             self.doAction()
             self.checkAggCorrect()
-            self.checkInsertCorrect(difCnt=20*999999)
+            self.checkInsertCorrect(difCnt=self.childtable_count*999999)
+            self.checkDelete()
 
             # drop database and free s3 file
             #self.dropDb()
diff --git a/tests/army/enterprise/s3/s3Basic1.json b/tests/army/enterprise/s3/s3Basic1.json
index 79f44e4dff..fece6a4dae 100644
--- a/tests/army/enterprise/s3/s3Basic1.json
+++ b/tests/army/enterprise/s3/s3Basic1.json
@@ -32,7 +32,7 @@
                 {
                     "name": "stb",
                     "child_table_exists": "yes",
-                    "childtable_count": 20,
+                    "childtable_count": 10,
                     "insert_rows": 2000000,
                     "childtable_prefix": "d",
                     "insert_mode": "taosc",