xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #25461 from taosdata/feat/TD-28945-3.0 

fix: uncomment tcompare crash
This commit is contained in:
Alex Duan 2024-04-25 19:08:09 +08:00 committed by GitHub
parent 6b44f9b3ac cb97979fe4
commit 88ade6f4e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/army/community/cluster/snapshot.py
View File

@ -30,7 +30,7 @@ from frame.srvCtl import *
class TDTestCase(TBase): class TDTestCase(TBase):
updatecfgDict = { updatecfgDict = {
"countAlwaysReturnValue" : "0", "countAlwaysReturnValue" : "1",
"lossyColumns" : "float,double", "lossyColumns" : "float,double",
"fPrecision" : "0.000000001", "fPrecision" : "0.000000001",
"dPrecision" : "0.00000000000000001", "dPrecision" : "0.00000000000000001",
@ -106,7 +106,7 @@ class TDTestCase(TBase):
# check count always return value # check count always return value
sql = f"select count(*) from {self.db}.ta" sql = f"select count(*) from {self.db}.ta"
tdSql.query(sql) tdSql.query(sql)
tdSql.checkRows(0) # countAlwaysReturnValue is false tdSql.checkRows(1) # countAlwaysReturnValue is false
# run # run
def run(self): def run(self):

10
tests/army/community/storage/compressBasic.py
View File

@ -118,18 +118,10 @@ class TDTestCase(TBase):
sql = f"describe {self.db}.{self.stb}" sql = f"describe {self.db}.{self.stb}"
tdSql.query(sql) tdSql.query(sql)
'''
# see AutoGen.types # see AutoGen.types
defEncodes = [ "delta-i","delta-i","simple8b","simple8b","simple8b","simple8b","simple8b","simple8b", defEncodes = [ "delta-i","delta-i","simple8b","simple8b","simple8b","simple8b","simple8b","simple8b",
"simple8b","simple8b","delta-d","delta-d","bit-packing", "simple8b","simple8b","delta-d","delta-d","bit-packing",
"disabled","disabled","disabled","disabled","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"]
count = tdSql.getRows() count = tdSql.getRows()
for i in range(count): for i in range(count):

2
tests/army/enterprise/s3/s3Basic.json
View File

@ -32,7 +32,7 @@
{ {
"name": "stb", "name": "stb",
"child_table_exists": "no", "child_table_exists": "no",
"childtable_count": 10, "childtable_count": 6,
"insert_rows": 2000000, "insert_rows": 2000000,
"childtable_prefix": "d", "childtable_prefix": "d",
"insert_mode": "taosc", "insert_mode": "taosc",

12
tests/army/enterprise/s3/s3Basic.py
View File

@ -38,6 +38,10 @@ s3EndPoint http://192.168.1.52:9000
s3AccessKey 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX' s3AccessKey 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX'
s3BucketName ci-bucket s3BucketName ci-bucket
s3UploadDelaySec 60 s3UploadDelaySec 60
for test:
"s3AccessKey" : "fGPPyYjzytw05nw44ViA:vK1VcwxgSOykicx6hk8fL1x15uEtyDSFU3w4hTaZ"
"s3BucketName": "test-bucket"
''' '''
@ -63,7 +67,7 @@ class TDTestCase(TBase):
tdSql.execute(f"use {self.db}") tdSql.execute(f"use {self.db}")
# come from s3_basic.json # come from s3_basic.json
self.childtable_count = 10 self.childtable_count = 6
self.insert_rows = 2000000 self.insert_rows = 2000000
self.timestamp_step = 1000 self.timestamp_step = 1000
@ -85,7 +89,7 @@ class TDTestCase(TBase):
fileName = cols[8] fileName = cols[8]
#print(f" filesize={fileSize} fileName={fileName} line={line}") #print(f" filesize={fileSize} fileName={fileName} line={line}")
if fileSize > maxFileSize: 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 overCnt += 1
else: else:
tdLog.info(f"{fileName}({fileSize}) check size passed.") tdLog.info(f"{fileName}({fileSize}) check size passed.")
@ -99,7 +103,7 @@ class TDTestCase(TBase):
loop = 0 loop = 0
rets = [] rets = []
overCnt = 0 overCnt = 0
while loop < 180: while loop < 100:
time.sleep(3) time.sleep(3)
# check upload to s3 # check upload to s3
@ -335,7 +339,7 @@ class TDTestCase(TBase):
self.snapshotAgg() self.snapshotAgg()
self.doAction() self.doAction()
self.checkAggCorrect() self.checkAggCorrect()
self.checkInsertCorrect(difCnt=self.childtable_count*999999) self.checkInsertCorrect(difCnt=self.childtable_count*1499999)
self.checkDelete() self.checkDelete()
self.doAction() self.doAction()

2
tests/army/enterprise/s3/s3Basic1.json
View File

@ -32,7 +32,7 @@
{ {
"name": "stb", "name": "stb",
"child_table_exists": "yes", "child_table_exists": "yes",
"childtable_count": 10, "childtable_count": 6,
"insert_rows": 1000000, "insert_rows": 1000000,
"childtable_prefix": "d", "childtable_prefix": "d",
"insert_mode": "taosc", "insert_mode": "taosc",

2
tests/army/frame/caseBase.py
View File

@ -140,7 +140,7 @@ class TBase:
# check step # 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}" 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 # save agg result
def snapshotAgg(self): def snapshotAgg(self):