From de207fa3fede94d2826c3ce13ed601ca0b177c98 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Mon, 22 Apr 2024 20:19:01 +0800
Subject: [PATCH 1/3] fix: add vgroups num to 1000

---
 tests/army/enterprise/s3/s3Basic.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/army/enterprise/s3/s3Basic.py b/tests/army/enterprise/s3/s3Basic.py
index 0933295e81..45bd636a2a 100644
--- a/tests/army/enterprise/s3/s3Basic.py
+++ b/tests/army/enterprise/s3/s3Basic.py
@@ -43,6 +43,7 @@ s3UploadDelaySec 60
 
 class TDTestCase(TBase):
     updatecfgDict = {
+        "supportVnodes":"1000",
         's3EndPoint': 'http://192.168.1.52:9000', 
         's3AccessKey': 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX', 
         's3BucketName': 'ci-bucket',
@@ -236,7 +237,7 @@ class TDTestCase(TBase):
 
     #
     def preDb(self, vgroups):
-        vg = int(time.time()*1000)%10 + 1
+        vg = int(time.time()*1000)%990 + 1
         sql = f"create database predb vgroups {vg}"
         tdSql.execute(sql, show=True)
 

From dd3c553413ce0ca301e7ea5a019bbac5a95487ad Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Mon, 22 Apr 2024 20:47:38 +0800
Subject: [PATCH 2/3] fix: add drop database predb

---
 tests/army/enterprise/s3/s3Basic.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/army/enterprise/s3/s3Basic.py b/tests/army/enterprise/s3/s3Basic.py
index 45bd636a2a..eb562d4bdf 100644
--- a/tests/army/enterprise/s3/s3Basic.py
+++ b/tests/army/enterprise/s3/s3Basic.py
@@ -237,9 +237,14 @@ class TDTestCase(TBase):
 
     #
     def preDb(self, vgroups):
-        vg = int(time.time()*1000)%990 + 1
-        sql = f"create database predb vgroups {vg}"
-        tdSql.execute(sql, show=True)
+
+        cnt = int(time.time())%10 + 1
+        for i in range(cnt):
+             vg = int(time.time()*1000)%10 + 1
+             sql = f"create database predb vgroups {vg}"
+             tdSql.execute(sql, show=True)
+             sql = "drop database predb"
+             tdSql.execute(sql, show=True)
 
     # history
     def insertHistory(self):

From de7c53d9c95dd87c9040fc15684808915c102c27 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Mon, 22 Apr 2024 20:50:01 +0800
Subject: [PATCH 3/3] fix: add drop database predb

---
 tests/army/enterprise/s3/s3Basic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/army/enterprise/s3/s3Basic.py b/tests/army/enterprise/s3/s3Basic.py
index eb562d4bdf..3f95ddab3e 100644
--- a/tests/army/enterprise/s3/s3Basic.py
+++ b/tests/army/enterprise/s3/s3Basic.py
@@ -238,7 +238,7 @@ class TDTestCase(TBase):
     #
     def preDb(self, vgroups):
 
-        cnt = int(time.time())%10 + 1
+        cnt = int(time.time())%3 + 1
         for i in range(cnt):
              vg = int(time.time()*1000)%10 + 1
              sql = f"create database predb vgroups {vg}"