fix: scan columns duplicated issue

This commit is contained in:
dapan1121 2023-11-14 08:51:23 +08:00
parent dbba1385b3
commit 537e56c904
1 changed files with 6 additions and 5 deletions

View File

@ -2792,12 +2792,13 @@ static int32_t splitCacheLastFuncOptCreateAggLogicNode(SAggLogicNode** pNewAgg,
TSWAP(pScan->pScanCols, pOldScanCols); TSWAP(pScan->pScanCols, pOldScanCols);
nodesDestroyList(pScan->pScanPseudoCols); nodesDestroyList(pScan->pScanPseudoCols);
nodesDestroyList(pScan->node.pTargets); nodesDestroyList(pScan->node.pTargets);
FOREACH(pNode, pFunc) { SNodeListNode* list = (SNodeListNode*)nodesMakeNode(QUERY_NODE_NODE_LIST);
code = nodesCollectColumnsFromNode(pNode, NULL, COLLECT_COL_TYPE_COL, &pScan->pScanCols); list->pNodeList = pFunc;
code = nodesCollectColumnsFromNode((SNode*)list, NULL, COLLECT_COL_TYPE_COL, &pScan->pScanCols);
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS != code) {
return code; return code;
} }
} nodesFree(list);
bool found = false; bool found = false;
FOREACH(pNode, pScan->pScanCols) { FOREACH(pNode, pScan->pScanCols) {
if (PRIMARYKEY_TIMESTAMP_COL_ID == ((SColumnNode*)pNode)->colId) { if (PRIMARYKEY_TIMESTAMP_COL_ID == ((SColumnNode*)pNode)->colId) {