Merge remote-tracking branch 'origin/feat/TS-6100-3.0' into feat/TS-6100-3.0.pw7

This commit is contained in:
dapan1121 2025-05-19 09:55:47 +08:00
commit 12f67cd00a
2 changed files with 5 additions and 0 deletions

View file

@ -269,6 +269,7 @@ static SKeyword keywordTable[] = {
{"START", TK_START},
{"STATE", TK_STATE},
{"STATE_WINDOW", TK_STATE_WINDOW},
{"STOP", TK_STOP},
{"STORAGE", TK_STORAGE},
{"STREAM", TK_STREAM},
{"STREAMS", TK_STREAMS},

View file

@ -13640,6 +13640,10 @@ static int32_t createStreamReqBuildCalcPlan(STranslateContext* pCxt, SCreateStre
PAR_ERR_JRET(generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_STREAM_QUERY, "_twstart/_twend/_twduration/_twrownum can only be used in event window"));
}
}
if (BIT_FLAG_TEST_MASK(pReq->placeHolderBitmap, PLACE_HOLDER_PARTITION_TBNAME)) {
// TODO(smj): partition must have tbname
}
pVgArray = taosArrayInit(1, sizeof(SStreamCalcScan));
pDbs = taosHashInit(1, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_ENTRY_LOCK);