enhance: modify inside isEligibleAgg func

3a9dddd6 · shenglian zhou · cc78a635 · 3a9dddd6
显示空白变更内容
内联并排

Showing with 2 addition and 4 deletion

source/libs/planner/src/planOptimizer.c source/libs/planner/src/planOptimizer.c +2 -4

未找到文件。
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -2526,13 +2526,11 @@ static bool tbCntScanOptIsEligibleAggFuncs(SNodeList* pAggFuncs) {
      return false;
    }
  }
-  return true;
+  return LIST_LENGTH(pAggFuncs) > 0;
 }
 static bool tbCntScanOptIsEligibleAgg(SAggLogicNode* pAgg) {
-  return tbCntScanOptIsEligibleGroupKeys(pAgg->pGroupKeys) &&
+  return tbCntScanOptIsEligibleGroupKeys(pAgg->pGroupKeys) && tbCntScanOptIsEligibleAggFuncs(pAgg->pAggFuncs);
-         (NULL != pAgg->pAggFuncs) && 
-         tbCntScanOptIsEligibleAggFuncs(pAgg->pAggFuncs);
 }
 static bool tbCntScanOptGetColValFromCond(SOperatorNode* pOper, SColumnNode** pCol, SValueNode** pVal) {