fix: result error
This commit is contained in:
parent
a29ddccb5a
commit
01518aae39
|
@ -2113,8 +2113,6 @@ static int32_t setSelectValueColumnInfo(SqlFunctionCtx* pCtx, int32_t numOfOutpu
|
||||||
}
|
}
|
||||||
pSubsidiary->num = 0;
|
pSubsidiary->num = 0;
|
||||||
taosArraySet(pValCtxArray, funcIdx - 1, &pSubsidiary);
|
taosArraySet(pValCtxArray, funcIdx - 1, &pSubsidiary);
|
||||||
} else {
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3860,7 +3860,10 @@ static EDealRes doCheckExprForGroupBy(SNode** pNode, void* pContext) {
|
||||||
SNode* pGroupNode = NULL;
|
SNode* pGroupNode = NULL;
|
||||||
FOREACH(pGroupNode, getGroupByList(pCxt)) {
|
FOREACH(pGroupNode, getGroupByList(pCxt)) {
|
||||||
SNode* pActualNode = getGroupByNode(pGroupNode);
|
SNode* pActualNode = getGroupByNode(pGroupNode);
|
||||||
if (nodesEqualNode(pActualNode, *pNode) || IsEqualTbNameFuncNode(pSelect, pActualNode, *pNode)) {
|
if (nodesEqualNode(pActualNode, *pNode)) {
|
||||||
|
return DEAL_RES_IGNORE_CHILD;
|
||||||
|
}
|
||||||
|
if (IsEqualTbNameFuncNode(pSelect, pActualNode, *pNode)) {
|
||||||
return rewriteExprToGroupKeyFunc(pCxt, pNode);
|
return rewriteExprToGroupKeyFunc(pCxt, pNode);
|
||||||
}
|
}
|
||||||
if (isTbnameFuction(pActualNode) && QUERY_NODE_COLUMN == nodeType(*pNode) &&
|
if (isTbnameFuction(pActualNode) && QUERY_NODE_COLUMN == nodeType(*pNode) &&
|
||||||
|
|
Loading…
Reference in New Issue