Merge branch 'develop' into feature/query

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.1.1.0")
+  SET(TD_VER_NUMBER "2.1.3.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: tdengine
 base: core18
-version: '2.1.1.0'
+version: '2.1.3.0'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
@@ -72,7 +72,7 @@ parts:
       - usr/bin/taosd
       - usr/bin/taos
       - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.1.1.0
+      - usr/lib/libtaos.so.2.1.3.0
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so
 

src/client/src/tscSQLParser.c

@@ -2150,7 +2150,10 @@ void setResultColName(char* name, tSqlExprItem* pItem, int32_t functionId, SStrT
 }
 
 static void updateLastScanOrderIfNeeded(SQueryInfo* pQueryInfo) {
-  if (pQueryInfo->sessionWindow.gap > 0 || tscGroupbyColumn(pQueryInfo)) {
+  if (pQueryInfo->sessionWindow.gap > 0 ||
+      pQueryInfo->stateWindow ||
+      taosArrayGetSize(pQueryInfo->pUpstream) > 0 ||
+      tscGroupbyColumn(pQueryInfo)) {
     size_t numOfExpr = tscNumOfExprs(pQueryInfo);
     for (int32_t i = 0; i < numOfExpr; ++i) {
       SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
@@ -2418,7 +2421,9 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
 
       // NOTE: has time range condition or normal column filter condition, the last_row query will be transferred to last query
       SConvertFunc cvtFunc = {.originFuncId = functionId, .execFuncId = functionId};
-      if (functionId == TSDB_FUNC_LAST_ROW && ((!TSWINDOW_IS_EQUAL(pQueryInfo->window, TSWINDOW_INITIALIZER)) || (hasNormalColumnFilter(pQueryInfo)))) {
+      if (functionId == TSDB_FUNC_LAST_ROW && ((!TSWINDOW_IS_EQUAL(pQueryInfo->window, TSWINDOW_INITIALIZER)) ||
+                                               (hasNormalColumnFilter(pQueryInfo)) ||
+                                               taosArrayGetSize(pQueryInfo->pUpstream)>0)) {
         cvtFunc.execFuncId = TSDB_FUNC_LAST;
       }
 
@@ -7826,10 +7831,16 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
       }
     }
     
-    if (validateSelectNodeList(pCmd, pQueryInfo, pSqlNode->pSelNodeList, false, false, false) != TSDB_CODE_SUCCESS) {
+    int32_t timeWindowQuery =
+        (TPARSER_HAS_TOKEN(pSqlNode->interval.interval) || TPARSER_HAS_TOKEN(pSqlNode->sessionVal.gap));
+
+    if (validateSelectNodeList(pCmd, pQueryInfo, pSqlNode->pSelNodeList, false, false, timeWindowQuery) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_OPERATION;
+    }
+    // parse the window_state
+    if (validateStateWindowNode(pCmd, pQueryInfo, pSqlNode, false) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
-
     // todo NOT support yet
     for(int32_t i = 0; i < tscNumOfExprs(pQueryInfo); ++i) {
       SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
@@ -7837,6 +7848,12 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
       if (f == TSDB_FUNC_STDDEV || f == TSDB_FUNC_PERCT) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
       } 
+
+      if ((timeWindowQuery || pQueryInfo->stateWindow) && f == TSDB_FUNC_LAST) {
+        pExpr->base.numOfParams = 1;
+        pExpr->base.param[0].i64 = TSDB_ORDER_ASC;
+        pExpr->base.param[0].nType = TSDB_DATA_TYPE_INT;
+      }
     }
 
     // todo derivative function requires ts column exists in subquery
@@ -7866,7 +7883,10 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
     if (validateIntervalNode(pSql, pQueryInfo, pSqlNode) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     } else {
-      if (isTimeWindowQuery(pQueryInfo) || pQueryInfo->sessionWindow.gap > 0) {
+      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);
         if (pCol->info.type != TSDB_DATA_TYPE_TIMESTAMP) {
@@ -7889,7 +7909,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
     }
 
 //    updateFunctionInterBuf(pQueryInfo, false);
-
+    updateLastScanOrderIfNeeded(pQueryInfo);
   } else {
     pQueryInfo->command = TSDB_SQL_SELECT;
 
@@ -7978,8 +7998,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
 
-    if ((isTimeWindowQuery(pQueryInfo) || pQueryInfo->sessionWindow.gap > 0) &&
+    if (isTimeWindowQuery(pQueryInfo) && (validateFunctionsInIntervalOrGroupbyQuery(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS)) {
-        (validateFunctionsInIntervalOrGroupbyQuery(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS)) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
 

src/connector/go

@@ -1 +1 @@
-Subproject commit 7a26c432f8b4203e42344ff3290b9b9b01b983d5
+Subproject commit b8f76da4a708d158ec3cc4b844571dc4414e36b4

src/connector/hivemq-tdengine-extension

@@ -1 +1 @@
-Subproject commit b62a26ecc164a310104df57691691b237e091c89
+Subproject commit ce5201014136503d34fecbd56494b67b4961056c

src/query/src/qExecutor.c

@@ -1774,7 +1774,10 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
       case OP_SessionWindow: {
         pRuntimeEnv->proot =
             createSWindowOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1, pQueryAttr->numOfOutput);
+        int32_t opType = pRuntimeEnv->proot->upstream[0]->operatorType;
+        if (opType != OP_DummyInput) {
           setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
+        }
         break;
       }
       case OP_MultiTableAggregate: {
@@ -1810,7 +1813,10 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
       }
       case OP_StateWindow: {
         pRuntimeEnv->proot = createStatewindowOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1, pQueryAttr->numOfOutput); 
+        int32_t opType = pRuntimeEnv->proot->upstream[0]->operatorType;
+        if (opType != OP_DummyInput) {
           setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
+        }
         break;
       }
 

tests/pytest/query/querySession.py

@@ -51,38 +51,73 @@ class TDTestCase:
         tdSql.checkRows(15)
         tdSql.checkData(0, 1, 2)
 
+        # session(ts,5a) main query
+        tdSql.query("select count(*) from (select * from dev_001) session(ts,5a)")
+        tdSql.checkRows(15)
+        tdSql.checkData(0, 1, 2)
+
 
         # session(ts,1s)
         tdSql.query("select count(*) from dev_001 session(ts,1s)")
         tdSql.checkRows(12)
         tdSql.checkData(0, 1, 5)
 
+        # session(ts,1s) main query
+        tdSql.query("select count(*) from (select * from dev_001) session(ts,1s)")
+        tdSql.checkRows(12)
+        tdSql.checkData(0, 1, 5)
+
         tdSql.query("select count(*) from dev_001 session(ts,1000a)")
         tdSql.checkRows(12)
         tdSql.checkData(0, 1, 5)
 
+        tdSql.query("select count(*) from  (select * from dev_001) session(ts,1000a)")
+        tdSql.checkRows(12)
+        tdSql.checkData(0, 1, 5)
+
         # session(ts,1m)
         tdSql.query("select count(*) from dev_001 session(ts,1m)")
         tdSql.checkRows(9)
         tdSql.checkData(0, 1, 8)
 
+        # session(ts,1m)
+        tdSql.query("select count(*) from (select * from dev_001) session(ts,1m)")
+        tdSql.checkRows(9)
+        tdSql.checkData(0, 1, 8)
+
         # session(ts,1h)
         tdSql.query("select count(*) from dev_001 session(ts,1h)")
         tdSql.checkRows(6)
         tdSql.checkData(0, 1, 11)
 
+        # session(ts,1h)
+        tdSql.query("select count(*) from (select * from dev_001) session(ts,1h)")
+        tdSql.checkRows(6)
+        tdSql.checkData(0, 1, 11)
+
         # session(ts,1d)
         tdSql.query("select count(*) from dev_001 session(ts,1d)")
         tdSql.checkRows(4)
         tdSql.checkData(0, 1, 13)
 
+        # session(ts,1d)
+        tdSql.query("select count(*) from (select * from dev_001) session(ts,1d)")
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 1, 13)
+
         # session(ts,1w)
         tdSql.query("select count(*) from dev_001 session(ts,1w)")
         tdSql.checkRows(2)
         tdSql.checkData(0, 1, 15)
 
+        # session(ts,1w)
+        tdSql.query("select count(*) from (select * from dev_001) session(ts,1w)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 15)
+
         # session with where 
         tdSql.query("select count(*),first(tagtype),last(tagtype),avg(tagtype),sum(tagtype),min(tagtype),max(tagtype),leastsquares(tagtype, 1, 1),spread(tagtype),stddev(tagtype),percentile(tagtype,0)  from dev_001 where ts <'2020-05-20 0:0:0' session(ts,1d)")
+
         tdSql.checkRows(2)
         tdSql.checkData(0, 1, 13)
         tdSql.checkData(0, 2, 1)
@@ -97,6 +132,20 @@ class TDTestCase:
         tdSql.checkData(0, 11, 1)
         tdSql.checkData(1, 11, 14)
 
+        # session with where main
+
+        tdSql.query("select count(*),first(tagtype),last(tagtype),avg(tagtype),sum(tagtype),min(tagtype),max(tagtype),leastsquares(tagtype, 1, 1) from (select * from dev_001 where ts <'2020-05-20 0:0:0') session(ts,1d)")
+
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 13)
+        tdSql.checkData(0, 2, 1)
+        tdSql.checkData(0, 3, 13)
+        tdSql.checkData(0, 4, 7)
+        tdSql.checkData(0, 5, 91)
+        tdSql.checkData(0, 6, 1)
+        tdSql.checkData(0, 7, 13)
+        tdSql.checkData(0, 8, '{slop:1.000000, intercept:0.000000}')
+
         # tdsql err
         tdSql.error("select * from dev_001 session(ts,1w)")
         tdSql.error("select count(*) from st session(ts,1w)")

tests/script/general/parser/lastrow.sim

@@ -70,4 +70,17 @@ sleep 100
 
 run general/parser/lastrow_query.sim
 
+print =================== last_row + nested query
+sql use $db
+sql create table lr_nested(ts timestamp, f int)
+sql insert into lr_nested values(now, 1)
+sql insert into lr_nested values(now+1s, null)
+sql select last_row(*) from (select * from lr_nested)
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT