From e8eb77b85632171b552a3718772fb62a8e01eae0 Mon Sep 17 00:00:00 2001
From: dapan1121 <89396746@qq.com>
Date: Fri, 5 Mar 2021 19:00:27 +0800
Subject: [PATCH] support having

---
 src/client/src/tscLocalMerge.c |  2 +-
 src/client/src/tscSQLParser.c  | 90 ++++++++++++++++++----------------
 2 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
index 2b7a70de04..9d69e53566 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
@@ -1291,7 +1291,7 @@ int32_t doHavingFilter(SQueryInfo* pQueryInfo, tFilePage* pOutput, bool* notSkip
     char* pInput = pOutput->data + pOutput->num* pExpr->offset;
     
     doFilterFieldData(pQueryInfo, pInput, pOutput, pFieldFilters, type, notSkipped);
-    if (!notSkipped) {
+    if (*notSkipped == false) {
       return TSDB_CODE_SUCCESS;
     }
   } 
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index df811721d9..57399a0590 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -6912,27 +6912,29 @@ int32_t getHavingExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr* pExpr, in
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  if (pLeft->pParam == NULL || pLeft->pParam->nExpr < 1) {
-    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
-  }
+  //if (pLeft->pParam == NULL || pLeft->pParam->nExpr < 1) {
+  //  return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+  //}
 
-  for (int32_t i = 0; i < pLeft->pParam->nExpr; i++) {
-    tSqlExprItem* pParamElem = &(pLeft->pParam->a[i]);
-    if (pParamElem->pNode->nSQLOptr != TK_ALL && pParamElem->pNode->nSQLOptr != TK_ID) {
-      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
-    }
-    
-    SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-    if ((getColumnIndexByName(pCmd, &pParamElem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS)) {
-      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
-    }
-    
-    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
-    STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
-    
-    if (index.columnIndex <= 0 || 
-      index.columnIndex >= tscGetNumOfColumns(pTableMeta)) {
-      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+  if (pLeft->pParam) {
+    for (int32_t i = 0; i < pLeft->pParam->nExpr; i++) {
+      tSqlExprItem* pParamElem = &(pLeft->pParam->a[i]);
+      if (pParamElem->pNode->nSQLOptr != TK_ALL && pParamElem->pNode->nSQLOptr != TK_ID) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+      }
+      
+      SColumnIndex index = COLUMN_INDEX_INITIALIZER;
+      if ((getColumnIndexByName(pCmd, &pParamElem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+      }
+      
+      STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+      STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
+      
+      if (index.columnIndex <= 0 || 
+        index.columnIndex >= tscGetNumOfColumns(pTableMeta)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+      }
     }
   }
 
@@ -6941,23 +6943,10 @@ int32_t getHavingExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr* pExpr, in
 
 
 
-int32_t parseHavingClause(SQueryInfo* pQueryInfo, tSQLExpr* pExpr, SSqlCmd* pCmd) {
+int32_t parseHavingClause(SQueryInfo* pQueryInfo, tSQLExpr* pExpr, SSqlCmd* pCmd, bool isSTable, int32_t joinQuery, int32_t intervalQuery) {
   const char* msg1 = "having only works with group by";
-  //const char* msg2 = "invalid column name in having clause";
-  //const char* msg3 = "columns from one table allowed as having columns";
-  //const char* msg4 = "no tag allowed in having clause";
-  const char* msg5 = "invalid expression in having clause";
-
-/*  
-  const char* msg1 = "too many columns in group by clause";
-  const char* msg4 = "join query does not support group by";
-  const char* msg7 = "not support group by expression";
-  const char* msg8 = "not allowed column type for group by";
-  const char* msg9 = "tags not allowed for table query";
-*/
-
-  // todo : handle two tables situation
-  //STableMetaInfo* pTableMetaInfo = NULL;
+  const char* msg2 = "functions can not be mixed up";
+  const char* msg3 = "invalid expression in having clause";
 
   if (pExpr == NULL) {
     return TSDB_CODE_SUCCESS;
@@ -6968,7 +6957,7 @@ int32_t parseHavingClause(SQueryInfo* pQueryInfo, tSQLExpr* pExpr, SSqlCmd* pCmd
   }
 
   if (pExpr->pLeft == NULL || pExpr->pRight == NULL) {
-    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
   }
 
   if (pQueryInfo->colList == NULL) {
@@ -6981,6 +6970,23 @@ int32_t parseHavingClause(SQueryInfo* pQueryInfo, tSQLExpr* pExpr, SSqlCmd* pCmd
     return ret;
   }
 
+  //REDO function check
+  if (!functionCompatibleCheck(pQueryInfo, joinQuery, intervalQuery)) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+  }
+
+  /*
+   * transfer sql functions that need secondary merge into another format
+   * in dealing with super table queries such as: count/first/last
+   */
+  if (isSTable) {
+    tscTansformFuncForSTableQuery(pQueryInfo);
+
+    if (hasUnsupportFunctionsForSTableQuery(pCmd, pQueryInfo)) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+  }
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -7114,11 +7120,6 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
     return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  // parse the having clause in the first place
-  if (parseHavingClause(pQueryInfo, pQuerySql->pHaving, pCmd) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_TSC_INVALID_SQL;
-  }
-
   // set where info
   STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
 
@@ -7161,6 +7162,11 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
     }
   }
 
+  // parse the having clause in the first place
+  if (parseHavingClause(pQueryInfo, pQuerySql->pHaving, pCmd, isSTable, joinQuery, intervalQuery) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
+  }
+
   // no result due to invalid query time range
   if (pQueryInfo->window.skey > pQueryInfo->window.ekey) {
     pQueryInfo->command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
-- 
GitLab