Merge pull request #6705 from taosdata/feature/query

Feature/query

cmake/platform.inc

@@ -157,5 +157,5 @@ ELSEIF (${OSTYPE} MATCHES "Alpine")
   MESSAGE(STATUS "input osType: Alpine")
   SET(TD_APLHINE TRUE)
 ELSE ()
-  MESSAGE(STATUS "input osType unknown: " ${OSTYPE})
+  MESSAGE(STATUS "The user specified osType is unknown: " ${OSTYPE})
 ENDIF ()

src/client/src/tscSQLParser.c

@@ -73,7 +73,6 @@ static bool validateTableColumnInfo(SArray* pFieldList, SSqlCmd* pCmd);
 static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pCmd);
 
 static int32_t setObjFullName(char* fullName, const char* account, SStrToken* pDB, SStrToken* tableName, int32_t* len);
-
 static void getColumnName(tSqlExprItem* pItem, char* resultFieldName, char* rawName, int32_t nameLength);
 
 static int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t colIndex, tSqlExprItem* pItem, bool finalResult);
@@ -7916,6 +7915,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
       if (validateSessionNode(pCmd, pQueryInfo, pSqlNode) != TSDB_CODE_SUCCESS) {
         return TSDB_CODE_TSC_INVALID_OPERATION;
       }
+
       if (isTimeWindowQuery(pQueryInfo)) {
         // check if the first column of the nest query result is timestamp column
         SColumn* pCol = taosArrayGetP(pQueryInfo->colList, 0);
@@ -7929,6 +7929,13 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
       }
     }
 
+    // parse the having clause in the first place
+    int32_t joinQuery = (pSqlNode->from != NULL && taosArrayGetSize(pSqlNode->from->list) > 1);
+    if (validateHavingClause(pQueryInfo, pSqlNode->pHaving, pCmd, pSqlNode->pSelNodeList, joinQuery, timeWindowQuery) !=
+        TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_OPERATION;
+    }
+
     // set order by info
     if (validateOrderbyNode(pCmd, pQueryInfo, pSqlNode, tscGetTableSchema(pTableMeta)) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_OPERATION;

src/query/src/qExecutor.c

@@ -3847,14 +3847,17 @@ int32_t doFillTimeIntervalGapsInResults(SFillInfo* pFillInfo, SSDataBlock *pOutp
 }
 
 void publishOperatorProfEvent(SOperatorInfo* operatorInfo, EQueryProfEventType eventType) {
-  SQueryProfEvent event;
+  SQueryProfEvent event = {0};
-  event.eventType = eventType;
+
-  event.eventTime = taosGetTimestampUs();
+  event.eventType    = eventType;
+  event.eventTime    = taosGetTimestampUs();
   event.operatorType = operatorInfo->operatorType;
 
-  SQInfo* qInfo = operatorInfo->pRuntimeEnv->qinfo;
+  if (operatorInfo->pRuntimeEnv) {
-  if (qInfo->summary.queryProfEvents) {
+    SQInfo* pQInfo = operatorInfo->pRuntimeEnv->qinfo;
-    taosArrayPush(qInfo->summary.queryProfEvents, &event);
+    if (pQInfo->summary.queryProfEvents) {
+      taosArrayPush(pQInfo->summary.queryProfEvents, &event);
+    }
   }
 }
 

tests/script/general/parser/nestquery.sim

@@ -424,4 +424,6 @@ if $data01 != 1 then
   return -1
 endi
 
+sql_error select last_row(*) from (select * from nest_tb0) having c1 > 0
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/unique/http/admin.sim

@@ -34,6 +34,7 @@ print ===============  step1 - login
 system_content curl 127.0.0.1:7111/admin/
 print 1-> $system_content
 if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  print actual: $system_content
   return -1
 endi
 
@@ -149,6 +150,8 @@ endi
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' 127.0.0.1:7111/admin/all
 print curl 127.0.0.1:7111/admin/all -----> $system_content
 if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:51.022",11]],"rows":11}@ then
+  print actual: $system_content
+  print expect =======> {"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:51.022",11]],"rows":11}
   return -1
 endi