[td-255] fix bugs found by regression test.

7bbf7c59 · Haojun Liao · 7fd970d7 · 7bbf7c59 · 7bbf7c59
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

src/query/src/qAggMain.c src/query/src/qAggMain.c +1 -1

src/query/src/qExecutor.c src/query/src/qExecutor.c +2 -2

未找到文件。
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -5287,7 +5287,7 @@ SAggFunctionInfo aAggs[] = {{
                          },
                          {
                              // 17
-                              "ts_dummy",
+                              "ts",
                              TSDB_FUNC_TS_DUMMY,
                              TSDB_FUNC_TS_DUMMY,
                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,

--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -4573,7 +4573,7 @@ SOperatorInfo* createDataBlocksOptScanInfo(void* pTsdbQueryHandle, SQueryRuntime
 }

 SArray* getOrderCheckColumns(SQueryAttr* pQuery) {
-  int32_t numOfCols = pQuery->pGroupbyExpr->numOfGroupCols;
+  int32_t numOfCols = pQuery->pGroupbyExpr == NULL? 0: pQuery->pGroupbyExpr->numOfGroupCols;

  SArray* pOrderColumns = NULL;
  if (numOfCols > 0) {
@@ -4612,7 +4612,7 @@ SArray* getOrderCheckColumns(SQueryAttr* pQuery) {
 }

 SArray* getResultGroupCheckColumns(SQueryAttr* pQuery) {
-  int32_t numOfCols = pQuery->pGroupbyExpr->numOfGroupCols;
+  int32_t numOfCols = pQuery->pGroupbyExpr == NULL? 0 : pQuery->pGroupbyExpr->numOfGroupCols;

  SArray* pOrderColumns = NULL;
  if (numOfCols > 0) {