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

fix:test case error for reset=latest

This commit is contained in:
wangmm0220 2023-10-08 15:29:02 +08:00
parent 450d079839
commit be27e13ed9
13 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/script/tsim/tmq/basic1.sim
View File

@ -62,7 +62,7 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

2
tests/script/tsim/tmq/basic1Of2Cons.sim
View File

@ -62,7 +62,7 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

2
tests/script/tsim/tmq/basic2.sim
View File

@ -62,7 +62,7 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

2
tests/script/tsim/tmq/basic2Of2Cons.sim
View File

@ -62,7 +62,7 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

2
tests/script/tsim/tmq/basic2Of2ConsOverlap.sim
View File

@ -62,7 +62,7 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

2
tests/script/tsim/tmq/basic3.sim
View File

@ -62,7 +62,7 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

2
tests/script/tsim/tmq/basic3Of2Cons.sim
View File

@ -62,7 +62,7 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

2
tests/script/tsim/tmq/basic4.sim
View File

@ -62,7 +62,7 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

2
tests/script/tsim/tmq/basic4Of2Cons.sim
View File

@ -62,7 +62,7 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

4
tests/script/tsim/tmq/snapshot.sim
View File

@ -62,8 +62,8 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
#$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

4
tests/script/tsim/tmq/snapshot1.sim
View File

@ -62,8 +62,8 @@ $keyList = $keyList . ,
$keyList = $keyList . enable.auto.commit:false $keyList = $keyList . enable.auto.commit:false
#$keyList = $keyList . , #$keyList = $keyList . ,
#$keyList = $keyList . auto.commit.interval.ms:6000 #$keyList = $keyList . auto.commit.interval.ms:6000
#$keyList = $keyList . , $keyList = $keyList . ,
#$keyList = $keyList . auto.offset.reset:earliest $keyList = $keyList . auto.offset.reset:earliest
$keyList = $keyList . ' $keyList = $keyList . '
print ========== key list: $keyList print ========== key list: $keyList

4
tests/system-test/7-tmq/tmqParamsTest.py
View File

@ -19,7 +19,7 @@ class TDTestCase:
self.wal_retention_period1 = 3600 self.wal_retention_period1 = 3600
self.wal_retention_period2 = 1 self.wal_retention_period2 = 1
self.commit_value_list = ["true", "false"] self.commit_value_list = ["true", "false"]
self.offset_value_list = ["", "earliest", "latest", "none"] self.offset_value_list = ["earliest", "latest", "none"]
self.tbname_value_list = ["true", "false"] self.tbname_value_list = ["true", "false"]
self.snapshot_value_list = ["false"] self.snapshot_value_list = ["false"]
@ -92,7 +92,7 @@ class TDTestCase:
} }
consumer_commit = 1 if consumer_dict["enable.auto.commit"] == "true" else 0 consumer_commit = 1 if consumer_dict["enable.auto.commit"] == "true" else 0
consumer_tbname = 1 if consumer_dict["msg.with.table.name"] == "true" else 0 consumer_tbname = 1 if consumer_dict["msg.with.table.name"] == "true" else 0
consumer_ret = "earliest" if offset_value == "" else offset_value consumer_ret = "latest" if offset_value == "" else offset_value
expected_parameters=f'tbname:{consumer_tbname},commit:{consumer_commit},interval:{paraDict["auto_commit_interval"]}ms,reset:{consumer_ret}' expected_parameters=f'tbname:{consumer_tbname},commit:{consumer_commit},interval:{paraDict["auto_commit_interval"]}ms,reset:{consumer_ret}'
if len(offset_value) == 0: if len(offset_value) == 0:
del consumer_dict["auto.offset.reset"] del consumer_dict["auto.offset.reset"]

1
utils/test/c/tmq_taosx_ci.c
View File

@ -547,6 +547,7 @@ tmq_t* build_consumer() {
tmq_conf_set(conf, "td.connect.pass", "taosdata"); tmq_conf_set(conf, "td.connect.pass", "taosdata");
tmq_conf_set(conf, "msg.with.table.name", "true"); tmq_conf_set(conf, "msg.with.table.name", "true");
tmq_conf_set(conf, "enable.auto.commit", "true"); tmq_conf_set(conf, "enable.auto.commit", "true");
tmq_conf_set(conf, "auto.offset.reset", "earliest");
if (g_conf.snapShot) { if (g_conf.snapShot) {
tmq_conf_set(conf, "experimental.snapshot.enable", "true"); tmq_conf_set(conf, "experimental.snapshot.enable", "true");