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

ci(stream):adjust stream ci test

This commit is contained in:
54liuyao 2024-12-19 10:32:32 +08:00
parent 1cc8c6d6cc
commit ce69387a43
22 changed files with 70 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/tglobal.h
View File

@ -291,6 +291,7 @@ extern bool tsFilterScalarMode;
extern int32_t tsMaxStreamBackendCache;
extern int32_t tsPQSortMemThreshold;
extern int32_t tsResolveFQDNRetryTime;
extern bool tsStreamCoverage;
extern bool tsExperimental;
// #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)

10
source/common/src/tglobal.c
View File

@ -328,6 +328,7 @@ int64_t tsStreamBufferSize = 128 * 1024 * 1024;
bool tsFilterScalarMode = false;
int tsResolveFQDNRetryTime = 100; // seconds
int tsStreamAggCnt = 100000;
bool tsStreamCoverage = false;
bool tsUpdateCacheBatch = true;
@ -733,6 +734,9 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "tsmaDataDeleteMark", tsmaDataDeleteMark, 60 * 60 * 1000, INT64_MAX,
CFG_SCOPE_CLIENT, CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
TAOS_CHECK_RETURN(cfgAddBool(pCfg, "streamCoverage", tsStreamCoverage, CFG_SCOPE_SERVER, CFG_DYN_ENT_SERVER_LAZY,CFG_CATEGORY_GLOBAL));
TAOS_RETURN(TSDB_CODE_SUCCESS);
}
@ -1463,6 +1467,9 @@ static int32_t taosSetClientCfg(SConfig *pCfg) {
TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "bypassFlag");
tsBypassFlag = pItem->i32;
TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "streamCoverage");
tsStreamCoverage = pItem->bval;
TAOS_RETURN(TSDB_CODE_SUCCESS);
}
@ -2735,7 +2742,8 @@ static int32_t taosCfgDynamicOptionsForClient(SConfig *pCfg, const char *name) {
{"maxTsmaCalcDelay", &tsMaxTsmaCalcDelay},
{"tsmaDataDeleteMark", &tsmaDataDeleteMark},
{"numOfRpcSessions", &tsNumOfRpcSessions},
{"bypassFlag", &tsBypassFlag}};
{"bypassFlag", &tsBypassFlag},
{"streamCoverage", &tsStreamCoverage}};
if ((code = taosCfgSetOption(debugOptions, tListLen(debugOptions), pItem, true)) != TSDB_CODE_SUCCESS) {
code = taosCfgSetOption(options, tListLen(options), pItem, false);

2
source/libs/parser/src/parTranslater.c
View File

@ -11411,7 +11411,7 @@ static int32_t checkStreamQuery(STranslateContext* pCxt, SCreateStreamStmt* pStm
if (pSelect->hasInterpFunc) {
// Temporary code
if (pStmt->pOptions->triggerType != STREAM_TRIGGER_FORCE_WINDOW_CLOSE) {
if (tsStreamCoverage == false && pStmt->pOptions->triggerType != STREAM_TRIGGER_FORCE_WINDOW_CLOSE) {
return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_STREAM_QUERY,
"Stream interp function only support force window close");
}

44
tests/parallel_test/cases.task
View File

@ -1419,34 +1419,36 @@
,,y,script,./test.sh -f tsim/stream/sliding.sim
,,y,script,./test.sh -f tsim/stream/state0.sim
,,y,script,./test.sh -f tsim/stream/state1.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpDelete0.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpDelete1.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpDelete2.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpError.sim
,,y,script,./test.sh -f tsim/stream/streamInterpDelete0.sim
,,y,script,./test.sh -f tsim/stream/streamInterpDelete1.sim
,,y,script,./test.sh -f tsim/stream/streamInterpDelete2.sim
,,y,script,./test.sh -f tsim/stream/streamInterpError.sim
,,y,script,./test.sh -f tsim/stream/streamInterpForceWindowClose.sim
,,y,script,./test.sh -f tsim/stream/streamInterpForceWindowClose1.sim
,,y,script,./test.sh -f tsim/stream/streamInterpFwcError.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpHistory.sim
,,y,script,./test.sh -f tsim/stream/streamInterpHistory.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpHistory1.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpLarge.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpLinear0.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpNext0.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpOther.sim
,,y,script,./test.sh -f tsim/stream/streamInterpLarge.sim
,,y,script,./test.sh -f tsim/stream/streamInterpLinear0.sim
,,y,script,./test.sh -f tsim/stream/streamInterpNext0.sim
,,y,script,./test.sh -f tsim/stream/streamInterpOther.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpOther1.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpPartitionBy0.sim
,,y,script,./test.sh -f tsim/stream/streamInterpPartitionBy0.sim
,,y,script,./test.sh -f tsim/stream/streamInterpPartitionBy1.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpPrev0.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpPrev1.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpPrimaryKey0.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpPrimaryKey1.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpPrimaryKey2.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpPrimaryKey3.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpUpdate.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpUpdate1.sim
#,,y,script,./test.sh -f tsim/stream/streamInterpValue0.sim
#,,y,script,./test.sh -f tsim/stream/streamPrimaryKey0.sim
#,,y,script,./test.sh -f tsim/stream/streamPrimaryKey1.sim
#,,y,script,./test.sh -f tsim/stream/streamPrimaryKey2.sim
#,,y,script,./test.sh -f tsim/stream/streamPrimaryKey3.sim
,,y,script,./test.sh -f tsim/stream/streamInterpPrimaryKey0.sim
,,y,script,./test.sh -f tsim/stream/streamInterpPrimaryKey1.sim
,,y,script,./test.sh -f tsim/stream/streamInterpPrimaryKey2.sim
,,y,script,./test.sh -f tsim/stream/streamInterpPrimaryKey3.sim
,,y,script,./test.sh -f tsim/stream/streamInterpUpdate.sim
,,y,script,./test.sh -f tsim/stream/streamInterpUpdate1.sim
,,y,script,./test.sh -f tsim/stream/streamInterpUpdate2.sim
,,y,script,./test.sh -f tsim/stream/streamInterpValue0.sim
,,y,script,./test.sh -f tsim/stream/streamPrimaryKey0.sim
,,y,script,./test.sh -f tsim/stream/streamPrimaryKey1.sim
,,y,script,./test.sh -f tsim/stream/streamPrimaryKey2.sim
,,y,script,./test.sh -f tsim/stream/streamPrimaryKey3.sim
,,y,script,./test.sh -f tsim/stream/streamTwaError.sim
,,y,script,./test.sh -f tsim/stream/streamTwaFwcFill.sim
,,y,script,./test.sh -f tsim/stream/streamTwaFwcFillPrimaryKey.sim

2
tests/script/tsim/stream/streamInterpDelete0.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpDelete1.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpDelete2.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpError.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step2
sql create database test2 vgroups 1;

2
tests/script/tsim/stream/streamInterpHistory.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpLarge.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpLinear0.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpNext0.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpOther.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 4;

2
tests/script/tsim/stream/streamInterpPartitionBy0.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step prev
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpPartitionBy1.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step NULL
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpPrimaryKey0.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpPrimaryKey1.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpPrimaryKey3.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpUpdate.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpUpdate1.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpUpdate2.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;

2
tests/script/tsim/stream/streamInterpValue0.sim
View File

@ -4,6 +4,8 @@ system sh/exec.sh -n dnode1 -s start
sleep 50
sql connect
sql alter local 'streamCoverage' '1';
print step1
print =============== create database
sql create database test vgroups 1;