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

fix ci issue

This commit is contained in:
54liuyao 2024-10-09 16:03:09 +08:00
parent 58d8b9f84e
commit e6f11c180c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/executor/inc/streamexecutorInt.h
View File

@ -32,7 +32,7 @@ extern "C" {
typedef struct SSliceRowData { typedef struct SSliceRowData {
TSKEY key; TSKEY key;
SResultCellData pRowVal[]; struct SResultCellData pRowVal[];
} SSliceRowData; } SSliceRowData;
typedef struct SSlicePoint { typedef struct SSlicePoint {

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

@ -10245,8 +10245,8 @@ static void getSourceDatabase(SNode* pStmt, int32_t acctId, char* pDbFName) {
(void)tNameGetFullDbName(&name, pDbFName); (void)tNameGetFullDbName(&name, pDbFName);
} }
static void getStreamQueryFirstProjectAliasName(SHashObj* pUserAliasSet, char* aliasName, int32_t len, char* defaultName[], int32_t defaultNum) { static void getStreamQueryFirstProjectAliasName(SHashObj* pUserAliasSet, char* aliasName, int32_t len, char* defaultName[]) {
for (int32_t i = 0; i < defaultNum; i++) { for (int32_t i = 0; defaultName[i] != NULL; i++) {
if (NULL == taosHashGet(pUserAliasSet, defaultName[i], strlen(defaultName[i]))) { if (NULL == taosHashGet(pUserAliasSet, defaultName[i], strlen(defaultName[i]))) {
snprintf(aliasName, len, "%s", defaultName[i]); snprintf(aliasName, len, "%s", defaultName[i]);
return; return;
@ -10285,8 +10285,8 @@ static int32_t addIrowTsToCreateStreamQueryImpl(STranslateContext* pCxt, SSelect
} }
strcpy(pFunc->functionName, "_irowts"); strcpy(pFunc->functionName, "_irowts");
strcpy(pFunc->node.userAlias, "_irowts"); strcpy(pFunc->node.userAlias, "_irowts");
char* defaultName[] = {"_irowts"}; char* defaultName[] = {"_irowts", NULL};
getStreamQueryFirstProjectAliasName(pUserAliasSet, pFunc->node.aliasName, sizeof(pFunc->node.aliasName), defaultName, sizeof(defaultName)); getStreamQueryFirstProjectAliasName(pUserAliasSet, pFunc->node.aliasName, sizeof(pFunc->node.aliasName), defaultName);
code = getFuncInfo(pCxt, pFunc); code = getFuncInfo(pCxt, pFunc);
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
code = nodesListPushFront(pSelect->pProjectionList, (SNode*)pFunc); code = nodesListPushFront(pSelect->pProjectionList, (SNode*)pFunc);
@ -10324,8 +10324,8 @@ static int32_t addWstartTsToCreateStreamQueryImpl(STranslateContext* pCxt, SSele
} }
strcpy(pFunc->functionName, "_wstart"); strcpy(pFunc->functionName, "_wstart");
strcpy(pFunc->node.userAlias, "_irowts"); strcpy(pFunc->node.userAlias, "_irowts");
char* defaultName[] = {"_wstart", "ts"}; char* defaultName[] = {"_wstart", "ts", NULL};
getStreamQueryFirstProjectAliasName(pUserAliasSet, pFunc->node.aliasName, sizeof(pFunc->node.aliasName), defaultName, sizeof(defaultName)); getStreamQueryFirstProjectAliasName(pUserAliasSet, pFunc->node.aliasName, sizeof(pFunc->node.aliasName), defaultName);
code = getFuncInfo(pCxt, pFunc); code = getFuncInfo(pCxt, pFunc);
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
code = nodesListPushFront(pSelect->pProjectionList, (SNode*)pFunc); code = nodesListPushFront(pSelect->pProjectionList, (SNode*)pFunc);