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

chore: compare funcNode without aliasName

This commit is contained in:
kailixu 2023-06-12 16:47:03 +08:00
parent f5d28cdcd1
commit 4cd039c38e
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/libs/nodes/src/nodesUtilFuncs.c
View File

@ -1953,9 +1953,9 @@ static uint32_t funcNodeHash(const char* pKey, uint32_t len) {
} }
static int32_t funcNodeEqual(const void* pLeft, const void* pRight, size_t len) { static int32_t funcNodeEqual(const void* pLeft, const void* pRight, size_t len) {
if (0 != strcmp((*(const SExprNode**)pLeft)->aliasName, (*(const SExprNode**)pRight)->aliasName)) { // if (0 != strcmp((*(const SExprNode**)pLeft)->aliasName, (*(const SExprNode**)pRight)->aliasName)) {
return 1; // return 1;
} // }
return nodesEqualNode(*(const SNode**)pLeft, *(const SNode**)pRight) ? 0 : 1; return nodesEqualNode(*(const SNode**)pLeft, *(const SNode**)pRight) ? 0 : 1;
} }

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

@ -3108,12 +3108,6 @@ static int32_t rewriteProjectAlias(SNodeList* pProjectionList) {
if ('\0' == pExpr->userAlias[0]) { if ('\0' == pExpr->userAlias[0]) {
strcpy(pExpr->userAlias, pExpr->aliasName); strcpy(pExpr->userAlias, pExpr->aliasName);
} }
if (QUERY_NODE_FUNCTION == nodeType(pProject) && fmIsWindowPseudoColumnFunc(((SFunctionNode*)pProject)->funcId) &&
((0 == strcasecmp("_wstart", pExpr->userAlias) || 0 == strcasecmp("_wend", pExpr->userAlias) ||
0 == strcasecmp("_wduration", pExpr->userAlias)) &&
'\0' != pExpr->aliasName[0])) {
continue;
}
sprintf(pExpr->aliasName, "#expr_%d", no++); sprintf(pExpr->aliasName, "#expr_%d", no++);
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;