From 7ddbf619800c5515cc126b363c40a083f252a5b1 Mon Sep 17 00:00:00 2001
From: hjxilinx <hjxilinx@163.com>
Date: Fri, 24 Apr 2020 18:47:21 +0800
Subject: [PATCH] [td-187] support group by on normal columns.

---
 src/client/src/tscSQLParser.c |  6 +++++-
 src/query/src/queryExecutor.c | 38 ++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index df47afd0dc..588e45c0b1 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -2477,6 +2477,10 @@ int32_t parseGroupbyClause(SQueryInfo* pQueryInfo, tVariantList* pList, SSqlCmd*
     return TSDB_CODE_SUCCESS;
   }
 
+  if (pQueryInfo->colList == NULL) {
+    pQueryInfo->colList = taosArrayInit(4, POINTER_BYTES);
+  }
+  
   pQueryInfo->groupbyExpr.numOfGroupCols = pList->nExpr;
   if (pList->nExpr > TSDB_MAX_TAGS) {
     return invalidSqlErrMsg(pQueryInfo->msg, msg1);
@@ -4915,7 +4919,7 @@ void doAddGroupColumnForSubquery(SQueryInfo* pQueryInfo, int32_t tagIndex) {
   list.num = 1;
   list.ids[0] = colIndex;
 
-  insertResultField(pQueryInfo, size - 1, &list, pSchema->bytes, pSchema->type, pSchema->name, pExpr);
+  insertResultField(pQueryInfo, size, &list, pSchema->bytes, pSchema->type, pSchema->name, pExpr);
   SFieldSupInfo* pInfo = tscFieldInfoGetSupp(&pQueryInfo->fieldsInfo, size - 1);
   pInfo->visible = false;
 }
diff --git a/src/query/src/queryExecutor.c b/src/query/src/queryExecutor.c
index e2f3b2f655..1cb7918ed5 100644
--- a/src/query/src/queryExecutor.c
+++ b/src/query/src/queryExecutor.c
@@ -990,9 +990,7 @@ static int32_t setGroupResultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, char *pDat
   return TSDB_CODE_SUCCESS;
 }
 
-static UNUSED_FUNC char *getGroupbyColumnData(SQuery *pQuery, SData **data, int16_t *type, int16_t *bytes) {
-  char *groupbyColumnData = NULL;
-
+static char *getGroupbyColumnData(SQuery *pQuery, int16_t *type, int16_t *bytes, SArray* pDataBlock) {
   SSqlGroupbyExpr *pGroupbyExpr = pQuery->pGroupbyExpr;
 
   for (int32_t k = 0; k < pGroupbyExpr->numOfGroupCols; ++k) {
@@ -1015,12 +1013,22 @@ static UNUSED_FUNC char *getGroupbyColumnData(SQuery *pQuery, SData **data, int1
 
     *type = pQuery->colList[colIndex].type;
     *bytes = pQuery->colList[colIndex].bytes;
-
-    //    groupbyColumnData = doGetDataBlocks(pQuery, data, pQuery->colList[colIndex].inf);
-    break;
+    /*
+     *  the colIndex is acquired from the first meter of all qualified meters in this vnode during query prepare
+     * stage, the remain meter may not have the required column in cache actually. So, the validation of required
+     * column in cache with the corresponding meter schema is reinforced.
+     */
+    int32_t numOfCols = taosArrayGetSize(pDataBlock);
+  
+    for (int32_t i = 0; i < numOfCols; ++i) {
+      SColumnInfoData *p = taosArrayGet(pDataBlock, i);
+      if (pColIndex->colId == p->info.colId) {
+        return p->pData;
+      }
+    }
   }
-
-  return groupbyColumnData;
+  
+  return NULL;
 }
 
 static int32_t doTSJoinFilter(SQueryRuntimeEnv *pRuntimeEnv, int32_t offset) {
@@ -1091,8 +1099,7 @@ static void rowwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *pS
 
   char *groupbyColumnData = NULL;
   if (groupbyStateValue) {
-    assert(0);
-    //    groupbyColumnData = getGroupbyColumnData(pQuery, data, &type, &bytes);
+    groupbyColumnData = getGroupbyColumnData(pQuery, &type, &bytes, pDataBlock);
   }
 
   for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
@@ -6088,9 +6095,16 @@ int32_t qCreateQueryInfo(void *tsdb, SQueryTableMsg *pQueryMsg, qinfo_t *pQInfo)
 
     STableId *id = taosArrayGet(pTableIdList, 0);
     id->uid = -1;  // todo fix me
-
+    
+    // group by normal column, do not pass the group by condition to tsdb to group table into different group
+    int32_t numOfGroupByCols = pQueryMsg->numOfGroupCols;
+    if (pQueryMsg->numOfGroupCols == 1 && !TSDB_COL_IS_TAG(pGroupColIndex->flag)) {
+      numOfGroupByCols = 0;
+    }
+    
+    // todo handle the error
     /*int32_t ret =*/tsdbQueryByTagsCond(tsdb, id->uid, tagCond, pQueryMsg->tagCondLen, &groupInfo, pGroupColIndex,
-                                         pQueryMsg->numOfGroupCols);
+                                         numOfGroupByCols);
     if (groupInfo.numOfTables == 0) {  // no qualified tables no need to do query
       code = TSDB_CODE_SUCCESS;
       goto _query_over;
-- 
GitLab