From c657c19427b37e46fbbd78a4b7d71728634cdbca Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Tue, 23 Apr 2024 19:38:44 +0800 Subject: [PATCH 1/7] fix: uncomment tcompare crash --- tests/army/enterprise/s3/s3Basic.py | 4 ++++ tests/army/frame/caseBase.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/army/enterprise/s3/s3Basic.py b/tests/army/enterprise/s3/s3Basic.py index b4b18e355e..a358e2c3f9 100644 --- a/tests/army/enterprise/s3/s3Basic.py +++ b/tests/army/enterprise/s3/s3Basic.py @@ -38,6 +38,10 @@ s3EndPoint http://192.168.1.52:9000 s3AccessKey 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX' s3BucketName ci-bucket s3UploadDelaySec 60 + +for test: +"s3AccessKey" : "fGPPyYjzytw05nw44ViA:vK1VcwxgSOykicx6hk8fL1x15uEtyDSFU3w4hTaZ" +"s3BucketName": "test-bucket" ''' diff --git a/tests/army/frame/caseBase.py b/tests/army/frame/caseBase.py index 21265d2fea..491e432df7 100644 --- a/tests/army/frame/caseBase.py +++ b/tests/army/frame/caseBase.py @@ -140,7 +140,7 @@ class TBase: # check step sql = f"select count(*) from (select diff(ts) as dif from {self.stb} partition by tbname order by ts desc) where dif != {self.timestamp_step}" - #tdSql.checkAgg(sql, difCnt) + tdSql.checkAgg(sql, difCnt) # save agg result def snapshotAgg(self): From a74495a1637b76d8b739d489187326c51b23f4ec Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Wed, 24 Apr 2024 12:51:00 +0800 Subject: [PATCH 2/7] fix: create table from 10 reduct to 6 --- tests/army/enterprise/s3/s3Basic.json | 2 +- tests/army/enterprise/s3/s3Basic.py | 6 +++--- tests/army/enterprise/s3/s3Basic1.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/army/enterprise/s3/s3Basic.json b/tests/army/enterprise/s3/s3Basic.json index 4a2f4496f9..ef1585d2ba 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": 10, + "childtable_count": 6, "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 a358e2c3f9..bd301e48a7 100644 --- a/tests/army/enterprise/s3/s3Basic.py +++ b/tests/army/enterprise/s3/s3Basic.py @@ -67,7 +67,7 @@ class TDTestCase(TBase): tdSql.execute(f"use {self.db}") # come from s3_basic.json - self.childtable_count = 10 + self.childtable_count = 6 self.insert_rows = 2000000 self.timestamp_step = 1000 @@ -89,7 +89,7 @@ class TDTestCase(TBase): fileName = cols[8] #print(f" filesize={fileSize} fileName={fileName} line={line}") if fileSize > maxFileSize: - tdLog.info(f"error, {fileSize} over max size({maxFileSize})\n") + tdLog.info(f"error, {fileSize} over max size({maxFileSize}) {fileName}\n") overCnt += 1 else: tdLog.info(f"{fileName}({fileSize}) check size passed.") @@ -103,7 +103,7 @@ class TDTestCase(TBase): loop = 0 rets = [] overCnt = 0 - while loop < 180: + while loop < 100: time.sleep(3) # check upload to s3 diff --git a/tests/army/enterprise/s3/s3Basic1.json b/tests/army/enterprise/s3/s3Basic1.json index ef7a169f77..fb95c14e98 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": 10, + "childtable_count": 6, "insert_rows": 1000000, "childtable_prefix": "d", "insert_mode": "taosc", From 348015590229a4a1c7d79cf6531d90a751574d19 Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Wed, 24 Apr 2024 13:47:00 +0800 Subject: [PATCH 3/7] fix: remove def list --- tests/army/community/storage/compressBasic.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/army/community/storage/compressBasic.py b/tests/army/community/storage/compressBasic.py index c0975c6d75..db52c9baf8 100644 --- a/tests/army/community/storage/compressBasic.py +++ b/tests/army/community/storage/compressBasic.py @@ -118,18 +118,10 @@ class TDTestCase(TBase): sql = f"describe {self.db}.{self.stb}" tdSql.query(sql) - ''' # see AutoGen.types defEncodes = [ "delta-i","delta-i","simple8b","simple8b","simple8b","simple8b","simple8b","simple8b", "simple8b","simple8b","delta-d","delta-d","bit-packing", - "disabled","disabled","disabled","disabled","disabled"] - ''' - - # pass-ci have error - defEncodes = [ "delta-i","delta-i","simple8b","simple8b","simple8b","simple8b","simple8b","simple8b", - "simple8b","simple8b","delta-d","delta-d","bit-packing", - "disabled","disabled","disabled","disabled","simple8b"] - + "disabled","disabled","disabled","disabled"] count = tdSql.getRows() for i in range(count): From 20b09bc8628818a180f82a8449d6798ed308491e Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Wed, 24 Apr 2024 16:40:01 +0800 Subject: [PATCH 4/7] fix: check diff correct --- 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 bd301e48a7..8045a3f308 100644 --- a/tests/army/enterprise/s3/s3Basic.py +++ b/tests/army/enterprise/s3/s3Basic.py @@ -339,7 +339,7 @@ class TDTestCase(TBase): self.snapshotAgg() self.doAction() self.checkAggCorrect() - self.checkInsertCorrect(difCnt=self.childtable_count*999999) + self.checkInsertCorrect(difCnt=self.childtable_count*1499999) self.checkDelete() self.doAction() From 1804c12ee8fc7893f04e66a168e18c62e8eaf6e1 Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Thu, 25 Apr 2024 15:42:30 +0800 Subject: [PATCH 5/7] fix:solve snapshot.py failed --- tests/army/community/cluster/snapshot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/army/community/cluster/snapshot.py b/tests/army/community/cluster/snapshot.py index eef650cc77..35bae9c7d0 100644 --- a/tests/army/community/cluster/snapshot.py +++ b/tests/army/community/cluster/snapshot.py @@ -30,7 +30,7 @@ from frame.srvCtl import * class TDTestCase(TBase): updatecfgDict = { - "countAlwaysReturnValue" : "0", + "countAlwaysReturnValue" : "1", "lossyColumns" : "float,double", "fPrecision" : "0.000000001", "dPrecision" : "0.00000000000000001", From 1fca5edb0e73b5c82e6cb5f898bfed01f4ced849 Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Thu, 25 Apr 2024 16:48:26 +0800 Subject: [PATCH 6/7] fix: snapshot.py passed --- tests/army/community/cluster/snapshot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/army/community/cluster/snapshot.py b/tests/army/community/cluster/snapshot.py index 35bae9c7d0..e5f3673d48 100644 --- a/tests/army/community/cluster/snapshot.py +++ b/tests/army/community/cluster/snapshot.py @@ -30,7 +30,7 @@ from frame.srvCtl import * class TDTestCase(TBase): updatecfgDict = { - "countAlwaysReturnValue" : "1", + "countAlwaysReturnValue" : "0", "lossyColumns" : "float,double", "fPrecision" : "0.000000001", "dPrecision" : "0.00000000000000001", @@ -106,7 +106,7 @@ class TDTestCase(TBase): # check count always return value sql = f"select count(*) from {self.db}.ta" tdSql.query(sql) - tdSql.checkRows(0) # countAlwaysReturnValue is false + tdSql.checkRows(1) # countAlwaysReturnValue is false # run def run(self): From cb97979fe4d3d6e487f5650aeb46648eed9dc8ff Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Thu, 25 Apr 2024 16:58:04 +0800 Subject: [PATCH 7/7] fix: snapshot.py passed1 --- tests/army/community/cluster/snapshot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/army/community/cluster/snapshot.py b/tests/army/community/cluster/snapshot.py index e5f3673d48..d18dbf2796 100644 --- a/tests/army/community/cluster/snapshot.py +++ b/tests/army/community/cluster/snapshot.py @@ -30,7 +30,7 @@ from frame.srvCtl import * class TDTestCase(TBase): updatecfgDict = { - "countAlwaysReturnValue" : "0", + "countAlwaysReturnValue" : "1", "lossyColumns" : "float,double", "fPrecision" : "0.000000001", "dPrecision" : "0.00000000000000001",