Merge pull request #7453 from taosdata/feature/d1

merge from master into develop

.drone.yml

@@ -23,6 +23,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: test_arm64_bionic
@@ -150,6 +151,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: build_trusty
@@ -176,6 +178,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: build_xenial
@@ -201,7 +204,7 @@ steps:
     branch:
     - develop
     - master
-
+    - 2.0
 ---
 kind: pipeline
 name: build_bionic
@@ -226,6 +229,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: build_centos7
@@ -249,4 +253,4 @@ steps:
     branch:
     - develop
     - master
-
+    - 2.0
\ No newline at end of file

cmake/version.inc

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

deps/MsvcLibX/src/iconv.c

@@ -98,6 +98,7 @@ int ConvertString(char *buf, size_t nBytes, UINT cpFrom, UINT cpTo, LPCSTR lpDef
 char *DupAndConvert(const char *string, UINT cpFrom, UINT cpTo, LPCSTR lpDefaultChar) {
   int nBytes;
   char *pBuf;
+  char *pBuf1;
   nBytes = 4 * ((int)lstrlen(string) + 1); /* Worst case for the size needed */
   pBuf = (char *)malloc(nBytes);
   if (!pBuf) {
@@ -110,8 +111,9 @@ char *DupAndConvert(const char *string, UINT cpFrom, UINT cpTo, LPCSTR lpDefault
     free(pBuf);
     return NULL;
   }
-  pBuf = realloc(pBuf, nBytes+1);
-  return pBuf;
+  pBuf1 = realloc(pBuf, nBytes+1);
+  if(pBuf1 == NULL && pBuf != NULL)  free(pBuf);
+  return pBuf1;
 }
 
 int CountCharacters(const char *string, UINT cp) {

deps/MsvcLibX/src/main.c

@@ -68,6 +68,7 @@ int BreakArgLine(LPSTR pszCmdLine, char ***pppszArg) {
   int iString = FALSE;	/* TRUE = string mode; FALSE = non-string mode */
   int nBackslash = 0;
   char **ppszArg;
+  char **ppszArg1;
   int iArg = FALSE;	/* TRUE = inside an argument; FALSE = between arguments */
 
   ppszArg = (char **)malloc((argc+1)*sizeof(char *));
@@ -89,7 +90,10 @@ int BreakArgLine(LPSTR pszCmdLine, char ***pppszArg) {
     if ((!iArg) && (c != ' ') && (c != '\t')) { /* Beginning of a new argument */
       iArg = TRUE;
       ppszArg[argc++] = pszCopy+j;
-      ppszArg = (char **)realloc(ppszArg, (argc+1)*sizeof(char *));
+      ppszArg1 = (char **)realloc(ppszArg, (argc+1)*sizeof(char *));
+      if(ppszArg1 == NULL && ppszArg != NULL)
+            free(ppszArg); 
+      ppszArg = ppszArg1;
       if (!ppszArg) return -1;
       pszCopy[j] = c0 = '\0';
     }
@@ -212,7 +216,7 @@ int _initU(void) {
     fprintf(stderr, "Warning: Can't convert the argument line to UTF-8\n");
     _acmdln[0] = '\0';
   }
-  realloc(_acmdln, n+1); /* Resize the memory block to fit the UTF-8 line */
+  //realloc(_acmdln, n+1); /* Resize the memory block to fit the UTF-8 line */
   /* Should not fail since we make it smaller */
 
   /* Record the console code page, to allow converting the output accordingly */

deps/MsvcLibX/src/realpath.c

@@ -196,6 +196,7 @@ not_compact_enough:
 /* Normally defined in stdlib.h. Output buf must contain PATH_MAX bytes */
 char *realpath(const char *path, char *outbuf) {
   char *pOutbuf = outbuf;
+  char *pOutbuf1 = NULL;
   int iErr;
   const char *pc;
 
@@ -242,8 +243,11 @@ realpath_failed:
     return NULL;
   }
 
-  if (!outbuf) pOutbuf = realloc(pOutbuf, strlen(pOutbuf) + 1);
-  return pOutbuf;
+  if (!outbuf) {
+    pOutbuf1 = realloc(pOutbuf, strlen(pOutbuf) + 1);
+    if(pOutbuf1 == NULL && pOutbuf) free(pOutbuf);
+  }
+  return pOutbuf1;
 }
 
 #endif
@@ -517,6 +521,7 @@ int ResolveLinksA(const char *path, char *buf, size_t bufsize) {
 /* Normally defined in stdlib.h. Output buf must contain PATH_MAX bytes */
 char *realpathU(const char *path, char *outbuf) {
   char *pOutbuf = outbuf;
+  char *pOutbuf1 = NULL;
   char *pPath1 = NULL;
   char *pPath2 = NULL;
   int iErr;
@@ -590,10 +595,13 @@ realpathU_failed:
   }
 
   DEBUG_LEAVE(("return 0x%p; // \"%s\"\n", pOutbuf, pOutbuf));
-  if (!outbuf) pOutbuf = realloc(pOutbuf, strlen(pOutbuf) + 1);
+  if (!outbuf) {
+    pOutbuf1 = realloc(pOutbuf, strlen(pOutbuf) + 1);
+    if(pOutbuf1 == NULL && pOutbuf) free(pOutbuf);
+  }  
   free(pPath1);
   free(pPath2);
-  return pOutbuf;
+  return pOutbuf1;
 }
 
 #endif /* defined(_WIN32) */

TSZ @ ceda5bf9

-Subproject commit 0ca5b15a8eac40327dd737be52c926fa5675712c
+Subproject commit ceda5bf9fcd7836509ac97dcc0056b3f1dd48cc5

snap/snapcraft.yaml

 name: tdengine
 base: core18
-version: '2.1.6.0'
+version: '2.1.7.1'
 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.6.0
+      - usr/lib/libtaos.so.2.1.7.1
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so
 

src/balance/src/bnScore.c

@@ -116,8 +116,17 @@ void bnCleanupDnodes() {
 
 static void bnCheckDnodesSize(int32_t dnodesNum) {
   if (tsBnDnodes.maxSize <= dnodesNum) {
-    tsBnDnodes.maxSize = dnodesNum * 2;
-    tsBnDnodes.list = realloc(tsBnDnodes.list, tsBnDnodes.maxSize * sizeof(SDnodeObj *));
+    int32_t maxSize = dnodesNum * 2;
+    SDnodeObj** list1 = NULL;
+    int32_t retry = 0;
+    
+    while(list1 == NULL && retry++ < 3) {
+      list1 = realloc(tsBnDnodes.list, maxSize * sizeof(SDnodeObj *));
+    }    
+    if(list1) {
+      tsBnDnodes.list = list1;
+      tsBnDnodes.maxSize = maxSize;
+    }
   }
 }
 

src/client/inc/tscSubquery.h

@@ -50,6 +50,12 @@ void tscUnlockByThread(int64_t *lockedBy);
 
 int tsInsertInitialCheck(SSqlObj *pSql);
 
+void doCleanupSubqueries(SSqlObj *pSql, int32_t numOfSubs);
+
+void tscFreeRetrieveSup(SSqlObj *pSql);
+
+
+
 #ifdef __cplusplus
 }
 #endif

src/client/inc/tscUtil.h

@@ -144,6 +144,7 @@ bool tscIsSessionWindowQuery(SQueryInfo* pQueryInfo);
 bool tscIsSecondStageQuery(SQueryInfo* pQueryInfo);
 bool tsIsArithmeticQueryOnAggResult(SQueryInfo* pQueryInfo);
 bool tscGroupbyColumn(SQueryInfo* pQueryInfo);
+int32_t tscGetTopBotQueryExprIndex(SQueryInfo* pQueryInfo);
 bool tscIsTopBotQuery(SQueryInfo* pQueryInfo);
 bool hasTagValOutput(SQueryInfo* pQueryInfo);
 bool timeWindowInterpoRequired(SQueryInfo *pQueryInfo);

src/client/inc/tsclient.h

@@ -128,7 +128,7 @@ typedef struct {
   int32_t kvLen;    // len of SKVRow
 } SMemRowInfo;
 typedef struct {
-  uint8_t      memRowType;   // default is 0, that is SDataRow
+  uint8_t      memRowType;   // default is 0, that is SDataRow 
   uint8_t      compareStat;  // 0 no need, 1 need compare
   TDRowTLenT   kvRowInitLen;
   SMemRowInfo *rowInfo;

src/client/src/tscParseInsert.c

@@ -1693,7 +1693,7 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int32_t numOfRow
   STableMeta *    pTableMeta = pTableMetaInfo->pTableMeta;
   STableComInfo   tinfo = tscGetTableInfo(pTableMeta);
 
-  SInsertStatementParam* pInsertParam = &pCmd->insertParam;
+  SInsertStatementParam *pInsertParam = &pCmd->insertParam;
   destroyTableNameList(pInsertParam);
 
   pInsertParam->pDataBlocks = tscDestroyBlockArrayList(pInsertParam->pDataBlocks);

src/client/src/tscPrepare.c

@@ -1527,8 +1527,9 @@ int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
   pCmd->insertParam.insertType = TSDB_QUERY_TYPE_STMT_INSERT;
   pCmd->insertParam.objectId = pSql->self;
 
-  pSql->sqlstr = realloc(pSql->sqlstr, sqlLen + 1);
-
+  char* sqlstr = realloc(pSql->sqlstr, sqlLen + 1);
+  if(sqlstr == NULL && pSql->sqlstr) free(pSql->sqlstr);  
+  pSql->sqlstr = sqlstr;
   if (pSql->sqlstr == NULL) {
     tscError("%p failed to malloc sql string buffer", pSql);
     STMT_RET(TSDB_CODE_TSC_OUT_OF_MEMORY);

src/client/src/tscSQLParser.c

@@ -2070,9 +2070,10 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
     pQueryInfo->colList = taosArrayInit(4, POINTER_BYTES);
   }
 
+  
   bool hasDistinct = false;
   bool hasAgg      = false; 
-  size_t  numOfExpr = taosArrayGetSize(pSelNodeList);
+  size_t numOfExpr = taosArrayGetSize(pSelNodeList);
   int32_t distIdx = -1; 
   for (int32_t i = 0; i < numOfExpr; ++i) {
     int32_t outputIndex = (int32_t)tscNumOfExprs(pQueryInfo);
@@ -2127,7 +2128,6 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
     }
   }
 
-  
   //TODO(dengyihao), refactor as function     
   //handle distinct func mixed with other func 
   if (hasDistinct == true) {
@@ -2143,6 +2143,7 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
     if (pQueryInfo->pDownstream != NULL) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg8);
     }
+    
     pQueryInfo->distinct = true;
   }
   
@@ -2666,7 +2667,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
           tickPerSec /= TSDB_TICK_PER_SECOND(TSDB_TIME_PRECISION_MICRO);
         } else if (info.precision == TSDB_TIME_PRECISION_MICRO) {
           tickPerSec /= TSDB_TICK_PER_SECOND(TSDB_TIME_PRECISION_MILLI);
-	}
+	      }
 
         if (tickPerSec <= 0 || tickPerSec < TSDB_TICK_PER_SECOND(info.precision)) {
           return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg10);
@@ -2700,8 +2701,8 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
         assert(ids.num == 1);
         tscColumnListInsert(pQueryInfo->colList, ids.ids[0].columnIndex, pExpr->base.uid, pSchema);
       }
-
       tscInsertPrimaryTsSourceColumn(pQueryInfo, pExpr->base.uid);
+        
       return TSDB_CODE_SUCCESS;
     }
 
@@ -3083,7 +3084,6 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
           tscColumnListInsert(pQueryInfo->colList, index.columnIndex, uid, &s);
         }
       }
-
       tscInsertPrimaryTsSourceColumn(pQueryInfo, pTableMetaInfo->pTableMeta->id.uid);
       return TSDB_CODE_SUCCESS;
     }
@@ -4681,7 +4681,7 @@ static int32_t handleExprInQueryCond(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSql
         }
 
         pQueryInfo->type |= TSDB_QUERY_TYPE_JOIN_QUERY;
-        ret = setExprToCond(&pCondExpr->pJoinExpr, *pExpr, NULL, parentOptr, pQueryInfo->msg);
+        ret = setExprToCond(&pCondExpr->pJoinExpr, *pExpr, NULL, parentOptr, pCmd->payload);
         *pExpr = NULL;
         if (type) {
           *type |= TSQL_EXPR_JOIN;
@@ -5663,6 +5663,7 @@ int32_t validateFillNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSqlNo
   const char* msg3 = "top/bottom not support fill";
   const char* msg4 = "illegal value or data overflow";
   const char* msg5 = "fill only available for interval query";
+  const char* msg6 = "not supported function now";
 
   if ((!isTimeWindowQuery(pQueryInfo)) && (!tscIsPointInterpQuery(pQueryInfo))) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5);
@@ -5701,6 +5702,9 @@ int32_t validateFillNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSqlNo
     }
   } else if (strncasecmp(pItem->pVar.pz, "prev", 4) == 0 && pItem->pVar.nLen == 4) {
     pQueryInfo->fillType = TSDB_FILL_PREV;
+    if (tscIsPointInterpQuery(pQueryInfo) && pQueryInfo->order.order == TSDB_ORDER_DESC) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
+    }
   } else if (strncasecmp(pItem->pVar.pz, "next", 4) == 0 && pItem->pVar.nLen == 4) {
     pQueryInfo->fillType = TSDB_FILL_NEXT;
   } else if (strncasecmp(pItem->pVar.pz, "linear", 6) == 0 && pItem->pVar.nLen == 6) {
@@ -5900,12 +5904,14 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
         pQueryInfo->order.orderColId = pSchema[index.columnIndex].colId;
       } else if (isTopBottomQuery(pQueryInfo)) {
         /* order of top/bottom query in interval is not valid  */
+
         int32_t pos = tscExprTopBottomIndex(pQueryInfo);
         assert(pos > 0);
         SExprInfo* pExpr = tscExprGet(pQueryInfo, pos - 1);
         assert(pExpr->base.functionId == TSDB_FUNC_TS);
 
         pExpr = tscExprGet(pQueryInfo, pos);
+
         if (pExpr->base.colInfo.colIndex != index.columnIndex && index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
           return invalidOperationMsg(pMsgBuf, msg5);
         }
@@ -5996,13 +6002,13 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
           return invalidOperationMsg(pMsgBuf, msg8);
         }
       } else {
-        /* order of top/bottom query in interval is not valid  */
         int32_t pos = tscExprTopBottomIndex(pQueryInfo);
         assert(pos > 0);
         SExprInfo* pExpr = tscExprGet(pQueryInfo, pos - 1);
         assert(pExpr->base.functionId == TSDB_FUNC_TS);
 
         pExpr = tscExprGet(pQueryInfo, pos);
+
         if (pExpr->base.colInfo.colIndex != index.columnIndex && index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
           return invalidOperationMsg(pMsgBuf, msg5);
         }
@@ -8707,6 +8713,7 @@ static STableMeta* extractTempTableMetaFromSubquery(SQueryInfo* pUpstream) {
 
     n += 1;
   }
+
   info->numOfColumns = n;
 
   return meta;
@@ -8737,7 +8744,6 @@ static int32_t doValidateSubquery(SSqlNode* pSqlNode, int32_t index, SSqlObj* pS
     return code;
   }
 
-
   // create dummy table meta info
   STableMetaInfo* pTableMetaInfo1 = calloc(1, sizeof(STableMetaInfo));
   if (pTableMetaInfo1 == NULL) {

src/client/src/tscSql.c

@@ -892,7 +892,9 @@ int taos_validate_sql(TAOS *taos, const char *sql) {
     return TSDB_CODE_TSC_EXCEED_SQL_LIMIT;
   }
 
-  pSql->sqlstr = realloc(pSql->sqlstr, sqlLen + 1);
+  char* sqlstr = realloc(pSql->sqlstr, sqlLen + 1);
+  if(sqlstr == NULL && pSql->sqlstr) free(pSql->sqlstr);
+  pSql->sqlstr = sqlstr;
   if (pSql->sqlstr == NULL) {
     tscError("0x%"PRIx64" failed to malloc sql string buffer", pSql->self);
     tfree(pSql);

src/client/src/tscSubquery.c

@@ -2038,17 +2038,14 @@ void tscHandleMasterJoinQuery(SSqlObj* pSql) {
   tscAsyncResultOnError(pSql);
 }
 
-static void doCleanupSubqueries(SSqlObj *pSql, int32_t numOfSubs) {
+void doCleanupSubqueries(SSqlObj *pSql, int32_t numOfSubs) {
   assert(numOfSubs <= pSql->subState.numOfSub && numOfSubs >= 0);
   
   for(int32_t i = 0; i < numOfSubs; ++i) {
     SSqlObj* pSub = pSql->pSubs[i];
     assert(pSub != NULL);
-    
-    SRetrieveSupport* pSupport = pSub->param;
-    
-    tfree(pSupport->localBuffer);
-    tfree(pSupport);
+
+    tscFreeRetrieveSup(pSub);
     
     taos_free_result(pSub);
   }
@@ -2406,6 +2403,10 @@ int32_t tscHandleFirstRoundStableQuery(SSqlObj *pSql) {
         } else {
           SSchema ss = {.type = (uint8_t)pCol->info.type, .bytes = pCol->info.bytes, .colId = (int16_t)pCol->columnIndex};
           tscColumnListInsert(pNewQueryInfo->colList, pCol->columnIndex, pCol->tableUid, &ss);
+          int32_t ti = tscColumnExists(pNewQueryInfo->colList, pCol->columnIndex, pCol->tableUid);
+          assert(ti >= 0);
+          SColumn* x = taosArrayGetP(pNewQueryInfo->colList, ti);
+          tscColumnCopy(x, pCol);
         }
       }
     }
@@ -2607,7 +2608,7 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
   return TSDB_CODE_SUCCESS;
 }
 
-static void tscFreeRetrieveSup(SSqlObj *pSql) {
+void tscFreeRetrieveSup(SSqlObj *pSql) {
   SRetrieveSupport *trsupport = pSql->param;
 
   void* p = atomic_val_compare_exchange_ptr(&pSql->param, trsupport, 0);
@@ -2765,27 +2766,43 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
   if (!TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE)) {
 
     int32_t code = pParentSql->res.code;
-    if ((code == TSDB_CODE_TDB_INVALID_TABLE_ID || code == TSDB_CODE_VND_INVALID_VGROUP_ID) && pParentSql->retry < pParentSql->maxRetry) {
-      // remove the cached tableMeta and vgroup id list, and then parse the sql again
-      tscResetSqlCmd( &pParentSql->cmd, true, pParentSql->self);
+    SSqlObj *userSql = NULL;
+    if (pParentSql->param) {
+      userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
+    }
 
-      pParentSql->retry++;
-      pParentSql->res.code = TSDB_CODE_SUCCESS;
-      tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", pParentSql->self,
-          tstrerror(code), pParentSql->retry);
+    if (userSql == NULL) {
+      userSql = pParentSql;
+    }
 
-      code = tsParseSql(pParentSql, true);
+    if ((code == TSDB_CODE_TDB_INVALID_TABLE_ID || code == TSDB_CODE_VND_INVALID_VGROUP_ID) && userSql->retry < userSql->maxRetry) {
+      if (userSql != pParentSql) {
+        tscFreeRetrieveSup(pParentSql);
+      }
+
+      tscFreeSubobj(userSql);      
+      tfree(userSql->pSubs);
+
+      userSql->res.code = TSDB_CODE_SUCCESS;
+      userSql->retry++;
+
+      tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", userSql->self,
+          tstrerror(code), userSql->retry);
+
+      tscResetSqlCmd(&userSql->cmd, true, userSql->self);
+      code = tsParseSql(userSql, true);
       if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
         return;
       }
 
       if (code != TSDB_CODE_SUCCESS) {
-        pParentSql->res.code = code;
-        tscAsyncResultOnError(pParentSql);
+        userSql->res.code = code;
+        tscAsyncResultOnError(userSql);
         return;
       }
 
-      executeQuery(pParentSql, pQueryInfo);
+      pQueryInfo = tscGetQueryInfo(&userSql->cmd);
+      executeQuery(userSql, pQueryInfo);
     } else {
       (*pParentSql->fp)(pParentSql->param, pParentSql, pParentSql->res.code);
     }
@@ -2855,7 +2872,6 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p
       pParentSql->self, pState->numOfSub, pState->numOfRetrievedRows);
   
   SQueryInfo *pPQueryInfo = tscGetQueryInfo(&pParentSql->cmd);
-  tscClearInterpInfo(pPQueryInfo);
   
   code = tscCreateGlobalMerger(trsupport->pExtMemBuffer, pState->numOfSub, pDesc, pPQueryInfo, &pParentSql->res.pMerger, pParentSql->self);
   pParentSql->res.code = code;

src/client/src/tscUtil.c

@@ -403,6 +403,27 @@ bool tscGroupbyColumn(SQueryInfo* pQueryInfo) {
   return false;
 }
 
+int32_t tscGetTopBotQueryExprIndex(SQueryInfo* pQueryInfo) {
+  size_t numOfExprs = tscNumOfExprs(pQueryInfo);
+
+  for (int32_t i = 0; i < numOfExprs; ++i) {
+    SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
+    if (pExpr == NULL) {
+      continue;
+    }
+
+    if (pExpr->base.functionId == TSDB_FUNC_TS) {
+      continue;
+    }
+
+    if (pExpr->base.functionId == TSDB_FUNC_TOP || pExpr->base.functionId == TSDB_FUNC_BOTTOM) {
+      return i;
+    }
+  }
+
+  return -1;
+}
+
 bool tscIsTopBotQuery(SQueryInfo* pQueryInfo) {
   size_t numOfExprs = tscNumOfExprs(pQueryInfo);
 
@@ -659,8 +680,10 @@ static void setResRawPtrImpl(SSqlRes* pRes, SInternalField* pInfo, int32_t i, bo
 
   } else if (convertNchar && pInfo->field.type == TSDB_DATA_TYPE_NCHAR) {
     // convert unicode to native code in a temporary buffer extra one byte for terminated symbol
-    pRes->buffer[i] = realloc(pRes->buffer[i], pInfo->field.bytes * pRes->numOfRows);
-
+    char* buffer = realloc(pRes->buffer[i], pInfo->field.bytes * pRes->numOfRows);
+    if(buffer == NULL)
+       return ;
+    pRes->buffer[i] = buffer;
     // string terminated char for binary data
     memset(pRes->buffer[i], 0, pInfo->field.bytes * pRes->numOfRows);
 
@@ -1236,6 +1259,7 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
     }
 
     SOperatorInfo* pSourceOperator = createDummyInputOperator(pSqlObjList[0], pSchema, numOfCol1, pFilters);
+
     pOutput->precision = pSqlObjList[0]->res.precision;
 
     SSchema* schema = NULL;
@@ -3634,10 +3658,10 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
   pNewQueryInfo->prjOffset = pQueryInfo->prjOffset;
   pNewQueryInfo->numOfTables = 0;
   pNewQueryInfo->pTableMetaInfo = NULL;
-  pNewQueryInfo->bufLen   =  pQueryInfo->bufLen;
-  pNewQueryInfo->distinct =  pQueryInfo->distinct;
-
+  pNewQueryInfo->bufLen = pQueryInfo->bufLen;
   pNewQueryInfo->buf = malloc(pQueryInfo->bufLen);
+
+  pNewQueryInfo->distinct =  pQueryInfo->distinct;
   if (pNewQueryInfo->buf == NULL) {
     terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
     goto _error;
@@ -3853,8 +3877,7 @@ static void tscSubqueryCompleteCallback(void* param, TAOS_RES* tres, int code) {
     int32_t index = ps->subqueryIndex;
     bool ret = subAndCheckDone(pSql, pParentSql, index);
 
-    tfree(ps);
-    pSql->param = NULL;
+    tscFreeRetrieveSup(pSql);
 
     if (!ret) {
       tscDebug("0x%"PRIx64" sub:0x%"PRIx64" orderOfSub:%d completed, not all subquery finished", pParentSql->self, pSql->self, index);
@@ -3863,7 +3886,13 @@ static void tscSubqueryCompleteCallback(void* param, TAOS_RES* tres, int code) {
 
     // todo refactor
     tscDebug("0x%"PRIx64" all subquery response received, retry", pParentSql->self);
-    tscResetSqlCmd(&pParentSql->cmd, true, pParentSql->self);
+    if (code && !((code == TSDB_CODE_TDB_INVALID_TABLE_ID || code == TSDB_CODE_VND_INVALID_VGROUP_ID) && pParentSql->retry < pParentSql->maxRetry)) {
+      tscAsyncResultOnError(pParentSql);
+      return;
+    }
+
+    tscFreeSubobj(pParentSql);    
+    tfree(pParentSql->pSubs);
 
     pParentSql->res.code = TSDB_CODE_SUCCESS;
     pParentSql->retry++;
@@ -3871,6 +3900,9 @@ static void tscSubqueryCompleteCallback(void* param, TAOS_RES* tres, int code) {
     tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", pParentSql->self,
              tstrerror(code), pParentSql->retry);
 
+    
+    tscResetSqlCmd(&pParentSql->cmd, true, pParentSql->self);
+    
     code = tsParseSql(pParentSql, true);
     if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
       return;
@@ -3905,9 +3937,11 @@ void executeQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo) {
   }
 
   if (taosArrayGetSize(pQueryInfo->pUpstream) > 0) {  // nest query. do execute it firstly
+    assert(pSql->subState.numOfSub == 0);
     pSql->subState.numOfSub = (int32_t) taosArrayGetSize(pQueryInfo->pUpstream);
-
+    assert(pSql->pSubs == NULL);
     pSql->pSubs = calloc(pSql->subState.numOfSub, POINTER_BYTES);
+    assert(pSql->subState.states == NULL);
     pSql->subState.states = calloc(pSql->subState.numOfSub, sizeof(int8_t));
     code = pthread_mutex_init(&pSql->subState.mutex, NULL);
 
@@ -3933,6 +3967,9 @@ void executeQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo) {
       pNew->sqlstr    = strdup(pSql->sqlstr);
       pNew->fp        = tscSubqueryCompleteCallback;
       pNew->maxRetry  = pSql->maxRetry;
+
+      pNew->cmd.resColumnId = TSDB_RES_COL_ID;
+      
       tsem_init(&pNew->rspSem, 0, 0);
 
       SRetrieveSupport* ps = calloc(1, sizeof(SRetrieveSupport));  // todo use object id
@@ -4465,10 +4502,14 @@ int32_t tscCreateTableMetaFromSTableMeta(STableMeta** ppChild, const char* name,
   assert(*ppChild != NULL);
   STableMeta* p      = *ppSTable;
   STableMeta* pChild = *ppChild;
+
   size_t sz = (p != NULL) ? tscGetTableMetaSize(p) : 0; //ppSTableBuf actually capacity may larger than sz, dont care 
   if (p != NULL && sz != 0) {
     memset((char *)p, 0, sz);
   }
+
+  STableMeta* pChild1;
+   
   taosHashGetCloneExt(tscTableMetaMap, pChild->sTableName, strnlen(pChild->sTableName, TSDB_TABLE_FNAME_LEN), NULL, (void **)&p, &sz);
   *ppSTable = p; 
 
@@ -4479,7 +4520,10 @@ int32_t tscCreateTableMetaFromSTableMeta(STableMeta** ppChild, const char* name,
     int32_t totalBytes    = (p->tableInfo.numOfColumns + p->tableInfo.numOfTags) * sizeof(SSchema);
     int32_t tableMetaSize =  sizeof(STableMeta)  + totalBytes;
     if (*tableMetaCapacity < tableMetaSize) {
-      pChild = realloc(pChild, tableMetaSize); 
+      pChild1 = realloc(pChild, tableMetaSize);
+      if(pChild1 == NULL) 
+        return -1;
+      pChild = pChild1; 
       *tableMetaCapacity = (size_t)tableMetaSize;
     }
 

src/common/inc/tdataformat.h

@@ -547,8 +547,9 @@ SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder);
 static FORCE_INLINE int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *value) {
   if (pBuilder->nCols >= pBuilder->tCols) {
     pBuilder->tCols *= 2;
-    pBuilder->pColIdx = (SColIdx *)realloc((void *)(pBuilder->pColIdx), sizeof(SColIdx) * pBuilder->tCols);
-    if (pBuilder->pColIdx == NULL) return -1;
+    SColIdx* pColIdx = (SColIdx *)realloc((void *)(pBuilder->pColIdx), sizeof(SColIdx) * pBuilder->tCols);
+    if (pColIdx == NULL) return -1;
+    pBuilder->pColIdx = pColIdx;
   }
 
   pBuilder->pColIdx[pBuilder->nCols].colId = colId;
@@ -561,8 +562,9 @@ static FORCE_INLINE int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId,
     while (tlen > pBuilder->alloc - pBuilder->size) {
       pBuilder->alloc *= 2;
     }
-    pBuilder->buf = realloc(pBuilder->buf, pBuilder->alloc);
-    if (pBuilder->buf == NULL) return -1;
+    void* buf = realloc(pBuilder->buf, pBuilder->alloc);
+    if (buf == NULL) return -1;
+    pBuilder->buf = buf;
   }
 
   memcpy(POINTER_SHIFT(pBuilder->buf, pBuilder->size), value, tlen);

src/common/inc/tglobal.h

@@ -163,6 +163,7 @@ extern char    tsDataDir[];
 extern char    tsLogDir[];
 extern char    tsScriptDir[];
 extern int64_t tsTickPerDay[3];
+extern int32_t tsTopicBianryLen;
 
 // system info
 extern char    tsOsName[];

src/common/src/tdataformat.c

@@ -138,8 +138,9 @@ int tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int1
 
   if (pBuilder->nCols >= pBuilder->tCols) {
     pBuilder->tCols *= 2;
-    pBuilder->columns = (STColumn *)realloc(pBuilder->columns, sizeof(STColumn) * pBuilder->tCols);
-    if (pBuilder->columns == NULL) return -1;
+    STColumn* columns = (STColumn *)realloc(pBuilder->columns, sizeof(STColumn) * pBuilder->tCols);
+    if (columns == NULL) return -1;
+    pBuilder->columns = columns;
   }
 
   STColumn *pCol = &(pBuilder->columns[pBuilder->nCols]);

src/common/src/tglobal.c

@@ -84,7 +84,7 @@ int32_t tsCompressColData = -1;
 
 // client
 int32_t tsMaxSQLStringLen = TSDB_MAX_ALLOWED_SQL_LEN;
-int32_t tsMaxWildCardsLen = TSDB_PATTERN_STRING_MAX_LEN;
+int32_t tsMaxWildCardsLen = TSDB_PATTERN_STRING_DEFAULT_LEN;
 int8_t  tsTscEnableRecordSql = 0;
 
 // the maximum number of results for projection query on super table that are returned from
@@ -152,7 +152,6 @@ int32_t tsTableIncStepPerVnode = TSDB_TABLES_STEP;
 int32_t tsTsdbMetaCompactRatio = TSDB_META_COMPACT_RATIO;
 
 // tsdb config 
-
 // For backward compatibility
 bool tsdbForceKeepFile = false;
 
@@ -210,6 +209,7 @@ char   tsScriptDir[PATH_MAX] = {0};
 char   tsTempDir[PATH_MAX] = "/tmp/";
 
 int32_t  tsDiskCfgNum = 0;
+int32_t tsTopicBianryLen = 16000;
 
 #ifndef _STORAGE
 SDiskCfg tsDiskCfg[1];
@@ -570,7 +570,6 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
   
-
   cfg.option = "numOfMnodes";
   cfg.ptr = &tsNumOfMnodes;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
@@ -1238,6 +1237,16 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
+  cfg.option = "topicBianryLen";
+  cfg.ptr = &tsTopicBianryLen;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 16;
+  cfg.maxValue = 16000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
   cfg.option = "httpEnableRecordSql";
   cfg.ptr = &tsHttpEnableRecordSql;
   cfg.valType = TAOS_CFG_VTYPE_INT8;

go @ 050667e5

-Subproject commit b8f76da4a708d158ec3cc4b844571dc4414e36b4
+Subproject commit 050667e5b4d0eafa5387e4283e713559b421203f

hivemq-tdengine-extension @ b62a26ec

-Subproject commit ce5201014136503d34fecbd56494b67b4961056c
+Subproject commit b62a26ecc164a310104df57691691b237e091c89

src/kit/shell/src/shellCheck.c

@@ -72,12 +72,13 @@ static int32_t shellShowTables(TAOS *con, char *db) {
       int32_t tbIndex = tbNum++;
       if (tbMallocNum < tbNum) {
         tbMallocNum = (tbMallocNum * 2 + 1);
-        tbNames = realloc(tbNames, tbMallocNum * sizeof(char *));
-        if (tbNames == NULL) {
+        char** tbNames1 = realloc(tbNames, tbMallocNum * sizeof(char *));
+        if (tbNames1 == NULL) {
           fprintf(stdout, "failed to malloc tablenames, num:%d\n", tbMallocNum);
           code = TSDB_CODE_TSC_OUT_OF_MEMORY;
           break;
         }
+        tbNames = tbNames1;
       }
 
       tbNames[tbIndex] = malloc(TSDB_TABLE_NAME_LEN);

src/kit/taospack/taospack.c

@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+
 #if defined(WINDOWS) 
 int main(int argc, char *argv[]) {
   printf("welcome to use taospack tools v1.3 for windows.\n");
@@ -148,7 +149,10 @@ float* read_float(const char* inFile, int* pcount){
     //printf(" buff=%s float=%.50f \n ", buf, floats[fi]);
     if ( ++fi == malloc_cnt ) {
       malloc_cnt += 100000;
-      floats = realloc(floats, malloc_cnt*sizeof(float));
+      float* floats1 = realloc(floats, malloc_cnt*sizeof(float));
+      if(floats1 == NULL)
+         break;
+      floats = floats1;   
     }
     memset(buf, 0, sizeof(buf));
   }
@@ -601,7 +605,6 @@ void test_threadsafe_double(int thread_count){
   
 }
 
-
 void unitTestFloat() {
 
   float ft1 [] = {1.11, 2.22, 3.333};
@@ -662,7 +665,50 @@ void unitTestFloat() {
   free(ft2);
   free(buff);
   free(output); 
- 
+}
+
+void leakFloat() {
+
+  int cnt = sizeof(g_ft1)/sizeof(float);
+  float* floats = g_ft1;
+  int algorithm = 2;
+
+  // compress
+  const char* input = (const char*)floats;
+  int input_len = cnt * sizeof(float);
+  int output_len = input_len + 1024;
+  char* output = (char*) malloc(output_len);
+  char* buff = (char*) malloc(input_len);
+  int buff_len = input_len;
+
+  int ret_len = 0;
+  ret_len = tsCompressFloatLossy(input, input_len, cnt, output, output_len, algorithm, buff, buff_len);
+
+  if(ret_len == 0) {
+    printf(" compress float error.\n");
+    free(buff);
+    free(output); 
+    return ;
+  }
+  
+  float* ft2 = (float*)malloc(input_len); 
+  ret_len = tsDecompressFloatLossy(output, ret_len, cnt, (char*)ft2, input_len, algorithm, buff, buff_len);
+  if(ret_len == 0) {
+    printf(" decompress float error.\n");
+  }
+  
+  free(ft2);
+  free(buff);
+  free(output); 
+}
+
+
+void leakTest(){
+  for(int i=0; i< 90000000000000; i++){
+    if(i%10000==0)
+        printf(" ---------- %d ---------------- \n", i);
+    leakFloat();
+  }
 }
 
 #define DB_CNT 500
@@ -689,7 +735,7 @@ extern char Compressor [];
 //   -----------------  main ----------------------
 //
 int main(int argc, char *argv[]) {
-  printf("welcome to use taospack tools v1.3\n");
+  printf("welcome to use taospack tools v1.6\n");
 
   //printf(" sizeof(int)=%d\n",  (int)sizeof(int));
   //printf(" sizeof(long)=%d\n", (int)sizeof(long));
@@ -753,6 +799,9 @@ int main(int argc, char *argv[]) {
     if(strcmp(argv[1], "-mem") == 0) {
       memTest();
     } 
+    else if(strcmp(argv[1], "-leak") == 0) {
+      leakTest();
+    }
   }
   else{
     unitTestFloat();

src/mnode/src/mnodeTable.c

@@ -2921,10 +2921,11 @@ static SMultiTableMeta* ensureMsgBufferSpace(SMultiTableMeta *pMultiMeta, SArray
       (*totalMallocLen) *= 2;
     }
 
-    pMultiMeta = realloc(pMultiMeta, *totalMallocLen);
-    if (pMultiMeta == NULL) {
+    SMultiTableMeta* pMultiMeta1 = realloc(pMultiMeta, *totalMallocLen);
+    if (pMultiMeta1 == NULL) {
       return NULL;
     }
+    pMultiMeta = pMultiMeta1;
   }
 
   return pMultiMeta;

src/os/src/detail/osMemory.c

@@ -504,8 +504,9 @@ void * taosTRealloc(void *ptr, size_t size) {
 
   void * tptr = (void *)((char *)ptr - sizeof(size_t));
   size_t tsize = size + sizeof(size_t);
-  tptr = realloc(tptr, tsize);
-  if (tptr == NULL) return NULL;
+  void* tptr1 = realloc(tptr, tsize);
+  if (tptr1 == NULL) return NULL;
+  tptr = tptr1;
 
   *(size_t *)tptr = size;
 

src/os/src/windows/wGetline.c

@@ -81,11 +81,13 @@ int32_t getstr(char **lineptr, size_t *n, FILE *stream, char terminator, int32_t
         *n += MIN_CHUNK;
 
       nchars_avail = (int32_t)(*n + *lineptr - read_pos);
-      *lineptr = realloc(*lineptr, *n);
-      if (!*lineptr) {
+      char* lineptr1 = realloc(*lineptr, *n);
+      if (!lineptr1) {
         errno = ENOMEM;
         return -1;
       }
+      *lineptr = lineptr1;
+
       read_pos = *n - nchars_avail + *lineptr;
       assert((*lineptr + *n) == (read_pos + nchars_avail));
     }

src/query/inc/qExtbuffer.h

@@ -220,6 +220,8 @@ tOrderDescriptor *tOrderDesCreate(const int32_t *orderColIdx, int32_t numOfOrder
 
 void tOrderDescDestroy(tOrderDescriptor *pDesc);
 
+void taoscQSort(void** pCols, SSchema* pSchema, int32_t numOfCols, int32_t numOfRows, int32_t index, __compar_fn_t compareFn);
+
 void tColModelAppend(SColumnModel *dstModel, tFilePage *dstPage, void *srcData, int32_t srcStartRows,
                      int32_t numOfRowsToWrite, int32_t srcCapacity);
 

src/query/src/qAggMain.c

@@ -3670,6 +3670,8 @@ static void interp_function_impl(SQLFunctionCtx *pCtx) {
     return;
   }
 
+  bool ascQuery = (pCtx->order == TSDB_ORDER_ASC);
+
   if (pCtx->inputType == TSDB_DATA_TYPE_TIMESTAMP) {
     *(TSKEY *)pCtx->pOutput = pCtx->startTs;
   } else if (type == TSDB_FILL_NULL) {
@@ -3677,7 +3679,7 @@ static void interp_function_impl(SQLFunctionCtx *pCtx) {
   } else if (type == TSDB_FILL_SET_VALUE) {
     tVariantDump(&pCtx->param[1], pCtx->pOutput, pCtx->inputType, true);
   } else {
-    if (pCtx->start.key != INT64_MIN && pCtx->start.key < pCtx->startTs && pCtx->end.key > pCtx->startTs) {
+    if (pCtx->start.key != INT64_MIN && ((ascQuery && pCtx->start.key <= pCtx->startTs && pCtx->end.key >= pCtx->startTs) || ((!ascQuery) && pCtx->start.key >= pCtx->startTs && pCtx->end.key <= pCtx->startTs))) {
       if (type == TSDB_FILL_PREV) {
         if (IS_NUMERIC_TYPE(pCtx->inputType) || pCtx->inputType == TSDB_DATA_TYPE_BOOL) {
           SET_TYPED_DATA(pCtx->pOutput, pCtx->inputType, pCtx->start.val);
@@ -3716,13 +3718,14 @@ static void interp_function_impl(SQLFunctionCtx *pCtx) {
       TSKEY skey = GET_TS_DATA(pCtx, 0);
 
       if (type == TSDB_FILL_PREV) {
-        if (skey > pCtx->startTs) {
+        if ((ascQuery && skey > pCtx->startTs) || ((!ascQuery) && skey < pCtx->startTs)) {
           return;
         }
 
         if (pCtx->size > 1) {
           TSKEY ekey = GET_TS_DATA(pCtx, 1);
-          if (ekey > skey && ekey <= pCtx->startTs) {
+          if ((ascQuery &&  ekey > skey && ekey <= pCtx->startTs) ||
+             ((!ascQuery) && ekey < skey && ekey >= pCtx->startTs)){
             skey = ekey;
           }
         }
@@ -3731,10 +3734,10 @@ static void interp_function_impl(SQLFunctionCtx *pCtx) {
         TSKEY ekey = skey;
         char* val = NULL;
         
-        if (ekey < pCtx->startTs) {
+        if ((ascQuery && ekey < pCtx->startTs) || ((!ascQuery) && ekey > pCtx->startTs)) {
           if (pCtx->size > 1) {
             ekey = GET_TS_DATA(pCtx, 1);
-            if (ekey < pCtx->startTs) {
+            if ((ascQuery && ekey < pCtx->startTs) || ((!ascQuery) && ekey > pCtx->startTs)) {
               return;
             }
 
@@ -3755,12 +3758,11 @@ static void interp_function_impl(SQLFunctionCtx *pCtx) {
         TSKEY ekey = GET_TS_DATA(pCtx, 1);
       
         // no data generated yet
-        if (!(skey < pCtx->startTs && ekey > pCtx->startTs)) {
+        if ((ascQuery && !(skey <= pCtx->startTs && ekey >= pCtx->startTs))
+           || ((!ascQuery) && !(skey >= pCtx->startTs && ekey <= pCtx->startTs))) {
           return;
         }
         
-        assert(pCtx->start.key == INT64_MIN && skey < pCtx->startTs && ekey > pCtx->startTs);
-        
         char *start = GET_INPUT_DATA(pCtx, 0);
         char *end = GET_INPUT_DATA(pCtx, 1);
 
@@ -3788,11 +3790,37 @@ static void interp_function_impl(SQLFunctionCtx *pCtx) {
 static void interp_function(SQLFunctionCtx *pCtx) {
   // at this point, the value is existed, return directly
   if (pCtx->size > 0) {
-    // impose the timestamp check
-    TSKEY key = GET_TS_DATA(pCtx, 0);
+    bool ascQuery = (pCtx->order == TSDB_ORDER_ASC);
+    TSKEY key;
+    char *pData;
+    int32_t typedData = 0;
+    
+    if (ascQuery) {
+      key = GET_TS_DATA(pCtx, 0);
+      pData = GET_INPUT_DATA(pCtx, 0);
+    } else {
+      key = pCtx->start.key;
+      if (key == INT64_MIN) {
+        key = GET_TS_DATA(pCtx, 0);
+        pData = GET_INPUT_DATA(pCtx, 0);
+      } else {        
+        if (!(IS_NUMERIC_TYPE(pCtx->inputType) || pCtx->inputType == TSDB_DATA_TYPE_BOOL)) {
+          pData = pCtx->start.ptr;
+        } else {
+          typedData = 1;
+          pData = (char *)&pCtx->start.val;
+        }
+      }
+    }
+    
+    //if (key == pCtx->startTs && (ascQuery || !(IS_NUMERIC_TYPE(pCtx->inputType) || pCtx->inputType == TSDB_DATA_TYPE_BOOL))) {
     if (key == pCtx->startTs) {
-      char *pData = GET_INPUT_DATA(pCtx, 0);
-      assignVal(pCtx->pOutput, pData, pCtx->inputBytes, pCtx->inputType);
+      if (typedData) {
+        SET_TYPED_DATA(pCtx->pOutput, pCtx->inputType, *(double *)pData);
+      } else {
+        assignVal(pCtx->pOutput, pData, pCtx->inputBytes, pCtx->inputType);
+      }
+      
       SET_VAL(pCtx, 1, 1);
     } else {
       interp_function_impl(pCtx);

src/query/src/qExecutor.c

@@ -45,7 +45,7 @@
 
 #define MULTI_KEY_DELIM  "-"
 
-#define HASH_CAPACITY_LIMIT  10000000 
+#define HASH_CAPACITY_LIMIT  10000000
 
 #define TIME_WINDOW_COPY(_dst, _src)  do {\
    (_dst).skey = (_src).skey;\
@@ -1327,6 +1327,16 @@ void doTimeWindowInterpolation(SOperatorInfo* pOperator, SOptrBasicInfo* pInfo,
 
         pCtx[k].end.key = curTs;
         pCtx[k].end.val = v2;
+
+        if (pColInfo->info.type == TSDB_DATA_TYPE_BINARY || pColInfo->info.type == TSDB_DATA_TYPE_NCHAR) {
+          if (prevRowIndex == -1) {
+            pCtx[k].start.ptr = (char *)pRuntimeEnv->prevRow[index];
+          } else {
+            pCtx[k].start.ptr = (char *)pColInfo->pData + prevRowIndex * pColInfo->info.bytes;
+          }
+          
+          pCtx[k].end.ptr = (char *)pColInfo->pData + curRowIndex * pColInfo->info.bytes;
+        }
       }
     } else if (functionId == TSDB_FUNC_TWA) {
       SPoint point1 = (SPoint){.key = prevTs,    .val = &v1};
@@ -1596,6 +1606,7 @@ static void hashAllIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pRe
   SResultRow* pResult = NULL;
   int32_t forwardStep = 0;
   int32_t ret = 0;
+  STimeWindow preWin = win;
 
   while (1) {
     // null data, failed to allocate more memory buffer
@@ -1610,12 +1621,13 @@ static void hashAllIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pRe
 
     // window start(end) key interpolation
     doWindowBorderInterpolation(pOperatorInfo, pSDataBlock, pInfo->pCtx, pResult, &win, startPos, forwardStep);
-    doApplyFunctions(pRuntimeEnv, pInfo->pCtx, &win, startPos, forwardStep, tsCols, pSDataBlock->info.rows, numOfOutput);
-
+    doApplyFunctions(pRuntimeEnv, pInfo->pCtx, ascQuery ? &win : &preWin, startPos, forwardStep, tsCols, pSDataBlock->info.rows, numOfOutput);
+    preWin = win;
+    
     int32_t prevEndPos = (forwardStep - 1) * step + startPos;
     startPos = getNextQualifiedWindow(pQueryAttr, &win, &pSDataBlock->info, tsCols, binarySearchForKey, prevEndPos);
     if (startPos < 0) {
-      if (win.skey <= pQueryAttr->window.ekey) {
+      if ((ascQuery && win.skey <= pQueryAttr->window.ekey) || ((!ascQuery) && win.ekey >= pQueryAttr->window.ekey)) {
         int32_t code = setResultOutputBufByKey(pRuntimeEnv, pResultRowInfo, pSDataBlock->info.tid, &win, masterScan, &pResult, tableGroupId,
                                                pInfo->pCtx, numOfOutput, pInfo->rowCellInfoOffset);
         if (code != TSDB_CODE_SUCCESS || pResult == NULL) {
@@ -1626,7 +1638,7 @@ static void hashAllIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pRe
 
         // window start(end) key interpolation
         doWindowBorderInterpolation(pOperatorInfo, pSDataBlock, pInfo->pCtx, pResult, &win, startPos, forwardStep);
-        doApplyFunctions(pRuntimeEnv, pInfo->pCtx, &win, startPos, forwardStep, tsCols, pSDataBlock->info.rows, numOfOutput);
+        doApplyFunctions(pRuntimeEnv, pInfo->pCtx, ascQuery ? &win : &preWin, startPos, forwardStep, tsCols, pSDataBlock->info.rows, numOfOutput);
       }
 
       break;
@@ -3570,7 +3582,7 @@ void setDefaultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SOptrBasicInfo *pInfo, i
   SResultRowInfo* pResultRowInfo = &pInfo->resultRowInfo;
 
   int64_t tid = 0;
-  pRuntimeEnv->keyBuf = realloc(pRuntimeEnv->keyBuf, sizeof(tid) + sizeof(int64_t) + POINTER_BYTES);   
+  pRuntimeEnv->keyBuf = realloc(pRuntimeEnv->keyBuf, sizeof(tid) + sizeof(int64_t) + POINTER_BYTES);
   SResultRow* pRow = doSetResultOutBufByKey(pRuntimeEnv, pResultRowInfo, tid, (char *)&tid, sizeof(tid), true, uid);
 
   for (int32_t i = 0; i < pDataBlock->info.numOfCols; ++i) {
@@ -7156,14 +7168,14 @@ static bool initMultiDistinctInfo(SDistinctOperatorInfo *pInfo, SOperatorInfo* p
       SColumnInfoData* pColDataInfo = taosArrayGet(pBlock->pDataBlock, j);
       if (pColDataInfo->info.colId == pOperator->pExpr[i].base.resColId) {
         SDistinctDataInfo item = {.index = j, .type = pColDataInfo->info.type, .bytes = pColDataInfo->info.bytes};
-        taosArrayInsert(pInfo->pDistinctDataInfo, i, &item);     
+        taosArrayInsert(pInfo->pDistinctDataInfo, i, &item);
       }
     }
   }
   pInfo->totalBytes += (int32_t)strlen(MULTI_KEY_DELIM) * (pOperator->numOfOutput);
   pInfo->buf        =  calloc(1, pInfo->totalBytes);
   return  taosArrayGetSize(pInfo->pDistinctDataInfo) == pOperator->numOfOutput ? true : false;
-} 
+}
 
 static void buildMultiDistinctKey(SDistinctOperatorInfo *pInfo, SSDataBlock *pBlock, int32_t rowId) {
   char *p = pInfo->buf;
@@ -7188,11 +7200,13 @@ static void buildMultiDistinctKey(SDistinctOperatorInfo *pInfo, SSDataBlock *pBl
     p += strlen(MULTI_KEY_DELIM);
   }
 }
+
 static SSDataBlock* hashDistinct(void* param, bool* newgroup) {
   SOperatorInfo* pOperator = (SOperatorInfo*) param;
   if (pOperator->status == OP_EXEC_DONE) {
     return NULL;
   }
+
   SDistinctOperatorInfo* pInfo = pOperator->info;
   SSDataBlock* pRes = pInfo->pRes;
 
@@ -7247,11 +7261,11 @@ static SSDataBlock* hashDistinct(void* param, bool* newgroup) {
         pRes->info.rows += 1;
       } 
     }
+
     if (pRes->info.rows >= pInfo->threshold) {
       break;
     }
   }
-
   return (pInfo->pRes->info.rows > 0)? pInfo->pRes:NULL;
 }
 

src/query/src/qExtbuffer.c

@@ -768,60 +768,6 @@ void tColDataQSort(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t sta
   free(buf);
 }
 
-void taoscQSort(void** pCols, SSchema* pSchema, int32_t numOfCols, int32_t numOfRows, int32_t index, __compar_fn_t compareFn) {
-  assert(numOfRows > 0 && numOfCols > 0 && index >= 0 && index < numOfCols);
-
-  int32_t bytes = pSchema[index].bytes;
-  int32_t size = bytes + sizeof(int32_t);
-
-  char* buf = calloc(1, size * numOfRows);
-
-  for(int32_t i = 0; i < numOfRows; ++i) {
-    char* dest = buf + size * i;
-    memcpy(dest, ((char*)pCols[index]) + bytes * i, bytes);
-    *(int32_t*)(dest+bytes) = i;
-  }
-
-  qsort(buf, numOfRows, size, compareFn);
-
-  int32_t prevLength = 0;
-  char* p = NULL;
-
-  for(int32_t i = 0; i < numOfCols; ++i) {
-    int32_t bytes1 = pSchema[i].bytes;
-
-    if (i == index) {
-      for(int32_t j = 0; j < numOfRows; ++j){
-        char* src  = buf + (j * size);
-        char* dest = (char*) pCols[i] + (j * bytes1);
-        memcpy(dest, src, bytes1);
-      }
-    } else {
-      // make sure memory buffer is enough
-      if (prevLength < bytes1) {
-        char *tmp = realloc(p, bytes1 * numOfRows);
-        assert(tmp);
-
-        p = tmp;
-        prevLength = bytes1;
-      }
-
-      memcpy(p, pCols[i], bytes1 * numOfRows);
-
-      for(int32_t j = 0; j < numOfRows; ++j){
-        char* dest = (char*) pCols[i] + bytes1 * j;
-
-        int32_t newPos = *(int32_t*)(buf + (j * size) + bytes);
-        char* src = p + (newPos * bytes1);
-        memcpy(dest, src, bytes1);
-      }
-    }
-  }
-
-  tfree(buf);
-  tfree(p);
-}
-
 /*
  * deep copy of sschema
  */
@@ -1157,3 +1103,57 @@ void tOrderDescDestroy(tOrderDescriptor *pDesc) {
   destroyColumnModel(pDesc->pColumnModel);
   tfree(pDesc);
 }
+
+void taoscQSort(void** pCols, SSchema* pSchema, int32_t numOfCols, int32_t numOfRows, int32_t index, __compar_fn_t compareFn) {
+  assert(numOfRows > 0 && numOfCols > 0 && index >= 0 && index < numOfCols);
+
+  int32_t bytes = pSchema[index].bytes;
+  int32_t size = bytes + sizeof(int32_t);
+
+  char* buf = calloc(1, size * numOfRows);
+
+  for(int32_t i = 0; i < numOfRows; ++i) {
+    char* dest = buf + size * i;
+    memcpy(dest, ((char*) pCols[index]) + bytes * i, bytes);
+    *(int32_t*)(dest+bytes) = i;
+  }
+
+  qsort(buf, numOfRows, size, compareFn);
+
+  int32_t prevLength = 0;
+  char* p = NULL;
+
+  for(int32_t i = 0; i < numOfCols; ++i) {
+    int32_t bytes1 = pSchema[i].bytes;
+
+    if (i == index) {
+      for(int32_t j = 0; j < numOfRows; ++j){
+        char* src  = buf + (j * size);
+        char* dest = ((char*)pCols[i]) + (j * bytes1);
+        memcpy(dest, src, bytes1);
+      }
+    } else {
+      // make sure memory buffer is enough
+      if (prevLength < bytes1) {
+        char *tmp = realloc(p, bytes1 * numOfRows);
+        assert(tmp);
+
+        p = tmp;
+        prevLength = bytes1;
+      }
+
+      memcpy(p, pCols[i], bytes1 * numOfRows);
+
+      for(int32_t j = 0; j < numOfRows; ++j){
+        char* dest = ((char*)pCols[i]) + bytes1 * j;
+
+        int32_t newPos = *(int32_t*)(buf + (j * size) + bytes);
+        char* src = p + (newPos * bytes1);
+        memcpy(dest, src, bytes1);
+      }
+    }
+  }
+
+  tfree(buf);
+  tfree(p);
+}

src/query/src/qPlan.c

@@ -698,7 +698,7 @@ SArray* createGlobalMergePlan(SQueryAttr* pQueryAttr) {
   }
 
   // fill operator
-  if (pQueryAttr->fillType != TSDB_FILL_NONE && (!pQueryAttr->pointInterpQuery)) {
+  if (pQueryAttr->fillType != TSDB_FILL_NONE && pQueryAttr->interval.interval > 0) {
     op = OP_Fill;
     taosArrayPush(plan, &op);
   }

src/query/src/qTsbuf.c

@@ -223,8 +223,11 @@ static STSGroupBlockInfoEx* addOneGroupInfo(STSBuf* pTSBuf, int32_t id) {
 static void shrinkBuffer(STSList* ptsData) {
   // shrink tmp buffer size if it consumes too many memory compared to the pre-defined size
   if (ptsData->allocSize >= ptsData->threshold * 2) {
-    ptsData->rawBuf = realloc(ptsData->rawBuf, MEM_BUF_SIZE);
-    ptsData->allocSize = MEM_BUF_SIZE;
+    char* rawBuf = realloc(ptsData->rawBuf, MEM_BUF_SIZE);
+    if(rawBuf) {
+      ptsData->rawBuf = rawBuf;
+      ptsData->allocSize = MEM_BUF_SIZE;
+    }
   }
 }
 

src/tsdb/inc/tsdbFS.h

@@ -18,6 +18,9 @@
 
 #define TSDB_FS_VERSION 0
 
+// ================== TSDB global config
+extern bool tsdbForceKeepFile;
+
 // ================== CURRENT file header info
 typedef struct {
   uint32_t version;  // Current file system version (relating to code)
@@ -110,4 +113,4 @@ static FORCE_INLINE int tsdbUnLockFS(STsdbFS* pFs) {
   return 0;
 }
 
-#endif /* _TD_TSDB_FS_H_ */
+#endif /* _TD_TSDB_FS_H_ */
\ No newline at end of file

src/tsdb/src/tsdbFS.c

@@ -37,6 +37,7 @@ static void tsdbScanAndTryFixDFilesHeader(STsdbRepo *pRepo, int32_t *nExpired);
 static int  tsdbProcessExpiredFS(STsdbRepo *pRepo);
 static int  tsdbCreateMeta(STsdbRepo *pRepo);
 
+// For backward compatibility
 // ================== CURRENT file header info
 static int tsdbEncodeFSHeader(void **buf, SFSHeader *pHeader) {
   int tlen = 0;

src/tsdb/src/tsdbRead.c

@@ -3480,6 +3480,7 @@ void filterPrepare(void* expr, void* param) {
         SArray *arr = (SArray *)(pCond->arr);
         for (size_t i = 0; i < taosArrayGetSize(arr); i++) {
           char* p = taosArrayGetP(arr, i);
+          strtolower(varDataVal(p), varDataVal(p));
           taosHashPut(pObj, varDataVal(p),varDataLen(p), &dummy, sizeof(dummy));
         }
      } else {

src/util/inc/tcompare.h

@@ -22,10 +22,10 @@ extern "C" {
 
 #include "os.h"
 
-#define TSDB_PATTERN_MATCH 0
-#define TSDB_PATTERN_NOMATCH 1
-#define TSDB_PATTERN_NOWILDCARDMATCH 2
-#define TSDB_PATTERN_STRING_MAX_LEN 100
+#define TSDB_PATTERN_MATCH               0
+#define TSDB_PATTERN_NOMATCH             1
+#define TSDB_PATTERN_NOWILDCARDMATCH     2
+#define TSDB_PATTERN_STRING_DEFAULT_LEN  100
 
 #define FLT_COMPAR_TOL_FACTOR    4
 #define FLT_EQUAL(_x, _y)        (fabs((_x) - (_y)) <= (FLT_COMPAR_TOL_FACTOR * FLT_EPSILON))

src/util/src/tcompare.c

@@ -139,8 +139,8 @@ int32_t compareFloatVal(const void *pLeft, const void *pRight) {
   }
   if (FLT_EQUAL(p1, p2)) {
     return 0;
-  } 
-  return FLT_GREATER(p1, p2) ? 1: -1; 
+  }
+  return FLT_GREATER(p1, p2) ? 1: -1;
 }
 
 int32_t compareFloatValDesc(const void* pLeft, const void* pRight) {
@@ -164,8 +164,8 @@ int32_t compareDoubleVal(const void *pLeft, const void *pRight) {
   }
   if (FLT_EQUAL(p1, p2)) {
     return 0;
-  } 
-  return FLT_GREATER(p1, p2) ? 1: -1; 
+  }
+  return FLT_GREATER(p1, p2) ? 1: -1;
 }
 
 int32_t compareDoubleValDesc(const void* pLeft, const void* pRight) {
@@ -175,7 +175,7 @@ int32_t compareDoubleValDesc(const void* pLeft, const void* pRight) {
 int32_t compareLenPrefixedStr(const void *pLeft, const void *pRight) {
   int32_t len1 = varDataLen(pLeft);
   int32_t len2 = varDataLen(pRight);
-  
+
   if (len1 != len2) {
     return len1 > len2? 1:-1;
   } else {
@@ -224,33 +224,33 @@ int32_t compareLenPrefixedWStrDesc(const void* pLeft, const void* pRight) {
  */
 int patternMatch(const char *patterStr, const char *str, size_t size, const SPatternCompareInfo *pInfo) {
   char c, c1;
-  
+
   int32_t i = 0;
   int32_t j = 0;
-  
+
   while ((c = patterStr[i++]) != 0) {
     if (c == pInfo->matchAll) { /* Match "*" */
-      
+
       while ((c = patterStr[i++]) == pInfo->matchAll || c == pInfo->matchOne) {
         if (c == pInfo->matchOne && (j > size || str[j++] == 0)) {
           // empty string, return not match
           return TSDB_PATTERN_NOWILDCARDMATCH;
         }
       }
-      
+
       if (c == 0) {
         return TSDB_PATTERN_MATCH; /* "*" at the end of the pattern matches */
       }
-      
+
       char next[3] = {toupper(c), tolower(c), 0};
       while (1) {
         size_t n = strcspn(str, next);
         str += n;
-        
+
         if (str[0] == 0 || (n >= size)) {
           break;
         }
-        
+
         int32_t ret = patternMatch(&patterStr[i], ++str, size - n - 1, pInfo);
         if (ret != TSDB_PATTERN_NOMATCH) {
           return ret;
@@ -258,19 +258,19 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
       }
       return TSDB_PATTERN_NOWILDCARDMATCH;
     }
-    
+
     c1 = str[j++];
-    
+
     if (j <= size) {
       if (c == '\\' && patterStr[i] == '_' && c1 == '_') { i++; continue; }
       if (c == c1 || tolower(c) == tolower(c1) || (c == pInfo->matchOne && c1 != 0)) {
         continue;
       }
     }
-    
+
     return TSDB_PATTERN_NOMATCH;
   }
-  
+
   return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH;
 }
 
@@ -278,13 +278,13 @@ int WCSPatternMatch(const wchar_t *patterStr, const wchar_t *str, size_t size, c
   wchar_t c, c1;
   wchar_t matchOne = L'_';  // "_"
   wchar_t matchAll = L'%';  // "%"
-  
+
   int32_t i = 0;
   int32_t j = 0;
-  
+
   while ((c = patterStr[i++]) != 0) {
     if (c == matchAll) { /* Match "%" */
-      
+
       while ((c = patterStr[i++]) == matchAll || c == matchOne) {
         if (c == matchOne && (j > size || str[j++] == 0)) {
           return TSDB_PATTERN_NOWILDCARDMATCH;
@@ -293,33 +293,33 @@ int WCSPatternMatch(const wchar_t *patterStr, const wchar_t *str, size_t size, c
       if (c == 0) {
         return TSDB_PATTERN_MATCH;
       }
-      
+
       wchar_t accept[3] = {towupper(c), towlower(c), 0};
       while (1) {
         size_t n = wcscspn(str, accept);
-        
+
         str += n;
         if (str[0] == 0 || (n >= size)) {
           break;
         }
-        
+
         int32_t ret = WCSPatternMatch(&patterStr[i], ++str, size - n - 1, pInfo);
         if (ret != TSDB_PATTERN_NOMATCH) {
           return ret;
         }
       }
-      
+
       return TSDB_PATTERN_NOWILDCARDMATCH;
     }
-    
+
     c1 = str[j++];
-    
+
     if (j <= size) {
       if (c == c1 || towlower(c) == towlower(c1) || (c == matchOne && c1 != 0)) {
         continue;
       }
     }
-    
+
     return TSDB_PATTERN_NOMATCH;
   }
   
@@ -359,12 +359,13 @@ int32_t compareWStrPatternComp(const void* pLeft, const void* pRight) {
   SPatternCompareInfo pInfo = {'%', '_'};
 
   assert(varDataLen(pRight) <= TSDB_MAX_FIELD_LEN * TSDB_NCHAR_SIZE);
-  wchar_t *pattern = calloc(varDataLen(pRight) + 1, sizeof(wchar_t));
 
+  wchar_t *pattern = calloc(varDataLen(pRight) + 1, sizeof(wchar_t));
   memcpy(pattern, varDataVal(pRight), varDataLen(pRight));
 
   int32_t ret = WCSPatternMatch(pattern, varDataVal(pLeft), varDataLen(pLeft)/TSDB_NCHAR_SIZE, &pInfo);
   free(pattern);
+
   return (ret == TSDB_PATTERN_MATCH) ? 0 : 1;
 }
 
@@ -411,10 +412,10 @@ __compar_fn_t getComparFunc(int32_t type, int32_t optr) {
       } else { /* normal relational comparFn */
         comparFn = compareLenPrefixedStr;
       }
-    
+
       break;
     }
-  
+
     case TSDB_DATA_TYPE_NCHAR: {
       if (optr == TSDB_RELATION_LIKE) {
         comparFn = compareWStrPatternComp;
@@ -435,13 +436,13 @@ __compar_fn_t getComparFunc(int32_t type, int32_t optr) {
       comparFn = compareInt32Val;
       break;
   }
-  
+
   return comparFn;
 }
 
 __compar_fn_t getKeyComparFunc(int32_t keyType, int32_t order) {
   __compar_fn_t comparFn = NULL;
-  
+
   switch (keyType) {
     case TSDB_DATA_TYPE_TINYINT:
     case TSDB_DATA_TYPE_BOOL:
@@ -485,7 +486,7 @@ __compar_fn_t getKeyComparFunc(int32_t keyType, int32_t order) {
       comparFn = (order == TSDB_ORDER_ASC)? compareInt32Val:compareInt32ValDesc;
       break;
   }
-  
+
   return comparFn;
 }
 
@@ -518,7 +519,7 @@ int32_t doCompare(const char* f1, const char* f2, int32_t type, size_t size) {
     default: {  // todo refactor
       tstr* t1 = (tstr*) f1;
       tstr* t2 = (tstr*) f2;
-      
+
       if (t1->len != t2->len) {
         return t1->len > t2->len? 1:-1;
       } else {

src/util/tests/skiplistTest.cpp

@@ -70,7 +70,7 @@ void doubleSkipListTest() {
 }
 
 void randKeyTest() {
-  SSkipList* pSkipList = tSkipListCreate(10, TSDB_DATA_TYPE_INT, sizeof(int32_t), getKeyComparFunc(TSDB_DATA_TYPE_INT),
+  SSkipList* pSkipList = tSkipListCreate(10, TSDB_DATA_TYPE_INT, sizeof(int32_t), getKeyComparFunc(TSDB_DATA_TYPE_INT, TSDB_ORDER_ASC),
       false, getkey);
 
   int32_t size = 200000;

src/wal/src/walWrite.c

@@ -540,7 +540,7 @@ static int32_t walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp, ch
 
     pWal->version = pHead->version;
 
-    //wInfo("writeFp: %ld", offset);
+    // wInfo("writeFp: %ld", offset);
     if (0 != walSMemRowCheck(pHead)) {
       wError("vgId:%d, restore wal, fileId:%" PRId64 " hver:%" PRIu64 " wver:%" PRIu64 " len:%d offset:%" PRId64,
              pWal->vgId, fileId, pHead->version, pWal->version, pHead->len, offset);

tests/pytest/fulltest.sh

@@ -80,6 +80,7 @@ python3 ./test.py -f tag_lite/set.py
 python3 ./test.py -f tag_lite/smallint.py
 python3 ./test.py -f tag_lite/tinyint.py
 python3 ./test.py -f tag_lite/timestamp.py
+python3 ./test.py -f tag_lite/TestModifyTag.py
 
 #python3 ./test.py -f dbmgmt/database-name-boundary.py
 python3 test.py -f dbmgmt/nanoSecondCheck.py
@@ -381,7 +382,9 @@ python3 ./test.py -f query/querySession.py
 python3 test.py -f  alter/alter_create_exception.py
 python3 ./test.py -f insert/flushwhiledrop.py
 python3 ./test.py -f insert/schemalessInsert.py
-python3 ./test.py -f alter/alterColMultiTimes.py 
+python3 ./test.py -f alter/alterColMultiTimes.py
+python3 ./test.py -f query/queryWildcardLength.py
+python3 ./test.py -f query/queryTbnameUpperLower.py
 
 #======================p4-end===============
 

tests/pytest/functions/function_interp.py

@@ -26,18 +26,70 @@ class TDTestCase:
 
         self.rowNum = 10
         self.ts = 1537146000000
-        
+
     def run(self):
         tdSql.prepare()
-        tdSql.execute("create table t(ts timestamp, k int)")
-        tdSql.execute("insert into t values('2021-1-1 1:1:1', 12);")
-        
-        tdSql.query("select interp(*) from t where ts='2021-1-1 1:1:1'")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 1, 12)
-
-        tdSql.error("select interp(*) from t where ts >'2021-1-1 1:1:1' and ts < now interval(1s) fill(next)")
- 
+        tdSql.execute("create table ap1 (ts timestamp, pav float)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:54.119', 2.90799)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:54.317', 3.07399)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:54.517', 0.58117)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:54.717', 0.16150)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:54.918', 1.47885)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:56.569', 1.76472)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:57.381', 2.13722)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:57.574', 4.10256)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:57.776', 3.55345)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:57.976', 1.46624)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:58.187', 0.17943)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:58.372', 2.04101)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:58.573', 3.20924)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:58.768', 1.71807)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:58.964', 4.60900)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:59.155', 4.33907)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:59.359', 0.76940)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:59.553', 0.06458)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:59.742', 4.59857)")
+        tdSql.execute("insert into ap1 values ('2021-07-25 02:19:59.938', 1.55081)")
+
+        tdSql.query("select interp(pav) from ap1 where ts = '2021-07-25 02:19:54' FILL (PREV)")
+        tdSql.checkRows(0)
+        tdSql.query("select interp(pav) from ap1 where ts = '2021-07-25 02:19:54' FILL (NEXT)")
+        tdSql.checkRows(0)
+        tdSql.query("select interp(pav) from ap1 where ts = '2021-07-25 02:19:54' FILL (LINEAR)")
+        tdSql.checkRows(0)
+        tdSql.query("select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' INTERVAL(1000a) FILL (LINEAR)")
+        tdSql.checkRows(6)
+        tdSql.query("select interp(pav) from ap1 where ts>= '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' INTERVAL(1000a) FILL (NEXT)")
+        tdSql.checkRows(6)
+        tdSql.checkData(0,1,2.90799)
+        tdSql.query("select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts <= '2021-07-25 02:20:00' INTERVAL(1000a) FILL (PREV)")
+        tdSql.checkRows(7)
+        tdSql.checkData(1,1,1.47885)
+        tdSql.query("select interp(pav) from ap1 where ts>= '2021-07-25 02:19:54' and ts <= '2021-07-25 02:20:00' INTERVAL(1000a) FILL (LINEAR)")
+        tdSql.checkRows(7)
+
+        # check desc order
+        tdSql.error("select interp(pav) from ap1 where ts = '2021-07-25 02:19:54' FILL (PREV) order by ts desc")
+        tdSql.query("select interp(pav) from ap1 where ts = '2021-07-25 02:19:54' FILL (NEXT) order by ts desc")
+        tdSql.checkRows(0)
+        tdSql.query("select interp(pav) from ap1 where ts = '2021-07-25 02:19:54' FILL (LINEAR) order by ts desc")
+        tdSql.checkRows(0)
+        tdSql.query("select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' INTERVAL(1000a) FILL (LINEAR) order by ts desc")
+        tdSql.checkRows(6)
+        tdSql.query("select interp(pav) from ap1 where ts>= '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' INTERVAL(1000a) FILL (NEXT) order by ts desc")
+        tdSql.checkRows(6)
+        tdSql.checkData(0,1,4.60900)
+        tdSql.error("select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts <= '2021-07-25 02:20:00' INTERVAL(1000a) FILL (PREV) order by ts desc")
+        tdSql.query("select interp(pav) from ap1 where ts>= '2021-07-25 02:19:54' and ts <= '2021-07-25 02:20:00' INTERVAL(1000a) FILL (LINEAR) order by ts desc")
+        tdSql.checkRows(7)
+
+        # check exception
+        tdSql.error("select interp(*) from ap1")
+        tdSql.error("select interp(*) from ap1 FILL(NEXT)")
+        tdSql.error("select interp(*) from ap1 ts >= '2021-07-25 02:19:54' FILL(NEXT)")
+        tdSql.error("select interp(*) from ap1 ts <= '2021-07-25 02:19:54' FILL(NEXT)")
+        tdSql.error("select interp(*) from ap1 where ts >'2021-07-25 02:19:59.938' and ts < now interval(1s) fill(next)")
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/functions/queryTestCases.py

@@ -13,6 +13,8 @@
 
 import sys
 import subprocess
+import random
+import math
 
 from util.log import *
 from util.cases import *
@@ -56,7 +58,7 @@ class TDTestCase:
     def td3690(self):
         tdLog.printNoPrefix("==========TD-3690==========")
         tdSql.query("show variables")
-        tdSql.checkData(51, 1, 864000)
+        tdSql.checkData(53, 1, 864000)
 
     def td4082(self):
         tdLog.printNoPrefix("==========TD-4082==========")
@@ -106,6 +108,9 @@ class TDTestCase:
         tdSql.execute("drop database if exists db1")
         tdSql.execute("create database  if not exists db keep 3650")
         tdSql.execute("create database  if not exists db1 keep 3650")
+        tdSql.execute("create database  if not exists new keep 3650")
+        tdSql.execute("create database  if not exists private keep 3650")
+        tdSql.execute("create database  if not exists db2 keep 3650")
 
         tdSql.execute("create stable db.stb1 (ts timestamp, c1 int) tags(t1 int)")
         tdSql.execute("create stable db.stb2 (ts timestamp, c1 int) tags(t1 int)")
@@ -122,6 +127,14 @@ class TDTestCase:
         # p1 不进入指定数据库
         tdSql.query("show create database db")
         tdSql.checkRows(1)
+        tdSql.query("show create database db1")
+        tdSql.checkRows(1)
+        tdSql.query("show create database db2")
+        tdSql.checkRows(1)
+        tdSql.query("show create database new")
+        tdSql.checkRows(1)
+        tdSql.query("show create database private")
+        tdSql.checkRows(1)
         tdSql.error("show create database ")
         tdSql.error("show create databases db ")
         tdSql.error("show create database db.stb1")
@@ -255,7 +268,7 @@ class TDTestCase:
         tdSql.execute("drop database if exists db")
         tdSql.execute("create database  if not exists db")
         tdSql.query("show variables")
-        tdSql.checkData(36, 1, 3650)
+        tdSql.checkData(38, 1, 3650)
         tdSql.query("show databases")
         tdSql.checkData(0,7,"3650,3650,3650")
 
@@ -283,7 +296,7 @@ class TDTestCase:
         tdSql.query("show databases")
         tdSql.checkData(0, 7, "3650,3650,3650")
         tdSql.query("show variables")
-        tdSql.checkData(36, 1, 3650)
+        tdSql.checkData(38, 1, 3650)
 
         tdSql.execute("alter database db1 keep 365")
         tdSql.execute("drop database if exists db1")
@@ -340,17 +353,552 @@ class TDTestCase:
 
         pass
 
+    def td4889(self):
+        tdLog.printNoPrefix("==========TD-4889==========")
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database  if not exists db keep 3650")
+
+        tdSql.execute("use db")
+        tdSql.execute("create stable db.stb1 (ts timestamp, c1 int) tags(t1 int)")
+
+        for i in range(1000):
+            tdSql.execute(f"create table db.t1{i} using db.stb1 tags({i})")
+            for j in range(100):
+                tdSql.execute(f"insert into db.t1{i} values (now-100d, {i+j})")
+
+        tdSql.query("show vgroups")
+        index = tdSql.getData(0,0)
+        tdSql.checkData(0, 6, 0)
+        tdSql.execute(f"compact vnodes in({index})")
+        for i in range(3):
+            tdSql.query("show vgroups")
+            if tdSql.getData(0, 6) == 1:
+                tdLog.printNoPrefix("show vgroups row:0 col:6 data:1 == expect:1")
+                break
+            if i == 3:
+                tdLog.exit("compacting not occured")
+            time.sleep(0.5)
+
+        pass
+
+    def td5168insert(self):
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database  if not exists db keep 3650")
+
+        tdSql.execute("use db")
+        tdSql.execute("create stable db.stb1 (ts timestamp, c1 float, c2 float, c3 double, c4 double) tags(t1 int)")
+        tdSql.execute("create table db.t1 using db.stb1 tags(1)")
+
+        for i in range(5):
+            c1 = 1001.11 + i*0.1
+            c2 = 1001.11 + i*0.1 + 1*0.01
+            c3 = 1001.11 + i*0.1 + 2*0.01
+            c4 = 1001.11 + i*0.1 + 3*0.01
+            tdSql.execute(f"insert into db.t1 values ('2021-07-01 08:00:0{i}.000', {c1}, {c2}, {c3}, {c4})")
+
+        # tdSql.execute("insert into db.t1 values ('2021-07-01 08:00:00.000', 1001.11, 1001.12, 1001.13, 1001.14)")
+        # tdSql.execute("insert into db.t1 values ('2021-07-01 08:00:01.000', 1001.21, 1001.22, 1001.23, 1001.24)")
+        # tdSql.execute("insert into db.t1 values ('2021-07-01 08:00:02.000', 1001.31, 1001.32, 1001.33, 1001.34)")
+        # tdSql.execute("insert into db.t1 values ('2021-07-01 08:00:03.000', 1001.41, 1001.42, 1001.43, 1001.44)")
+        # tdSql.execute("insert into db.t1 values ('2021-07-01 08:00:04.000', 1001.51, 1001.52, 1001.53, 1001.54)")
+
+        # for i in range(1000000):
+        for i in range(1000000):
+            random1 = random.uniform(1000,1001)
+            random2 = random.uniform(1000,1001)
+            random3 = random.uniform(1000,1001)
+            random4 = random.uniform(1000,1001)
+            tdSql.execute(f"insert into db.t1 values (now+{i}a, {random1}, {random2},{random3}, {random4})")
+
+        pass
+
+    def td5168(self):
+        tdLog.printNoPrefix("==========TD-5168==========")
+        # 插入小范围内的随机数
+        tdLog.printNoPrefix("=====step0: 默认情况下插入数据========")
+        self.td5168insert()
+
+        # 获取五个时间点的数据作为基准数值,未压缩情况下精准匹配
+        for i in range(5):
+            tdSql.query(f"select * from db.t1 where ts='2021-07-01 08:00:0{i}.000' ")
+            # c1, c2, c3, c4 = tdSql.getData(0, 1), tdSql.getData(0, 2), tdSql.getData(0, 3), tdSql.getData(0, 4)
+            for j in range(4):
+                locals()["f" + str(j) + str(i)] = tdSql.getData(0, j+1)
+                print(f"f{j}{i}:", locals()["f" + str(j) + str(i)])
+                tdSql.checkData(0, j+1, locals()["f" + str(j) + str(i)])
+
+        # tdSql.query("select * from db.t1 limit 100,1")
+        # f10, f11, f12, f13 = tdSql.getData(0,1), tdSql.getData(0,2), tdSql.getData(0,3), tdSql.getData(0,4)
+        #
+        # tdSql.query("select * from db.t1 limit 1000,1")
+        # f20, f21, f22, f23 = tdSql.getData(0,1), tdSql.getData(0,2), tdSql.getData(0,3), tdSql.getData(0,4)
+        #
+        # tdSql.query("select * from db.t1 limit 10000,1")
+        # f30, f31, f32, f33 = tdSql.getData(0,1), tdSql.getData(0,2), tdSql.getData(0,3), tdSql.getData(0,4)
+        #
+        # tdSql.query("select * from db.t1 limit 100000,1")
+        # f40, f41, f42, f43 = tdSql.getData(0,1), tdSql.getData(0,2), tdSql.getData(0,3), tdSql.getData(0,4)
+        #
+        # tdSql.query("select * from db.t1 limit 1000000,1")
+        # f50, f51, f52, f53 = tdSql.getData(0,1), tdSql.getData(0,2), tdSql.getData(0,3), tdSql.getData(0,4)
+
+        # 关闭服务并获取未开启压缩情况下的数据容量
+        tdSql.query("show dnodes")
+        index = tdSql.getData(0, 0)
+        tdDnodes.stop(index)
+
+        cfgdir = self.getCfgDir()
+        cfgfile = self.getCfgFile()
+
+        lossy_cfg_cmd=f"grep lossyColumns {cfgfile}|awk '{{print $2}}'"
+        data_size_cmd = f"du -s {cfgdir}/../data/vnode/  | awk '{{print $1}}'"
+        dsize_init = int(subprocess.check_output(data_size_cmd,shell=True).decode("utf-8"))
+        lossy_args = subprocess.check_output(lossy_cfg_cmd, shell=True).decode("utf-8")
+        tdLog.printNoPrefix(f"close the lossyColumns，data size is: {dsize_init};the lossyColumns line is: {lossy_args}")
+
+        ###################################################
+        float_lossy = "float"
+        double_lossy = "double"
+        float_double_lossy = "float|double"
+        no_loosy = ""
+
+        double_precision_cmd = f"sed -i '$a dPrecision 0.000001' {cfgfile}"
+        _ = subprocess.check_output(double_precision_cmd, shell=True).decode("utf-8")
+
+        lossy_float_cmd = f"sed -i '$a  lossyColumns {float_lossy}' {cfgfile} "
+        lossy_double_cmd = f"sed -i '$d' {cfgfile} && sed -i '$a  lossyColumns {double_lossy}' {cfgfile} "
+        lossy_float_double_cmd = f"sed -i '$d' {cfgfile} && sed -i '$a  lossyColumns {float_double_lossy}' {cfgfile} "
+        lossy_no_cmd =  f"sed -i '$a  lossyColumns {no_loosy}' {cfgfile} "
+
+        ###################################################
+
+        # 开启有损压缩，参数float，并启动服务插入数据
+        tdLog.printNoPrefix("=====step1: lossyColumns设置为float========")
+        lossy_float =  subprocess.check_output(lossy_float_cmd, shell=True).decode("utf-8")
+        tdDnodes.start(index)
+        self.td5168insert()
+
+        # 查询前面所述5个时间数据并与基准数值进行比较
+        for i in range(5):
+            tdSql.query(f"select * from db.t1 where ts='2021-07-01 08:00:0{i}.000' ")
+            # c1, c2, c3, c4 = tdSql.getData(0, 1), tdSql.getData(0, 2), tdSql.getData(0, 3), tdSql.getData(0, 4)
+            for j in range(4):
+                # locals()["f" + str(j) + str(i)] = tdSql.getData(0, j+1)
+                # print(f"f{j}{i}:", locals()["f" + str(j) + str(i)])
+                tdSql.checkData(0, j+1, locals()["f" + str(j) + str(i)])
+
+        # 关闭服务并获取压缩参数为float情况下的数据容量
+        tdDnodes.stop(index)
+        dsize_float = int(subprocess.check_output(data_size_cmd,shell=True).decode("utf-8"))
+        lossy_args = subprocess.check_output(lossy_cfg_cmd, shell=True).decode("utf-8")
+        tdLog.printNoPrefix(f"open the lossyColumns， data size is：{dsize_float};the lossyColumns line is: {lossy_args}")
+
+        # 修改有损压缩，参数double，并启动服务
+        tdLog.printNoPrefix("=====step2: lossyColumns设置为double========")
+        lossy_double =  subprocess.check_output(lossy_double_cmd, shell=True).decode("utf-8")
+        tdDnodes.start(index)
+        self.td5168insert()
+
+        # 查询前面所述5个时间数据并与基准数值进行比较
+        for i in range(5):
+            tdSql.query(f"select * from db.t1 where ts='2021-07-01 08:00:0{i}.000' ")
+            for j in range(4):
+                tdSql.checkData(0, j+1, locals()["f" + str(j) + str(i)])
+
+        # 关闭服务并获取压缩参数为double情况下的数据容量
+        tdDnodes.stop(index)
+        dsize_double = int(subprocess.check_output(data_size_cmd, shell=True).decode("utf-8"))
+        lossy_args = subprocess.check_output(lossy_cfg_cmd, shell=True).decode("utf-8")
+        tdLog.printNoPrefix(f"open the lossyColumns, data size is：{dsize_double};the lossyColumns line is: {lossy_args}")
+
+        # 修改有损压缩，参数 float&&double ，并启动服务
+        tdLog.printNoPrefix("=====step3: lossyColumns设置为 float&&double ========")
+        lossy_float_double =  subprocess.check_output(lossy_float_double_cmd, shell=True).decode("utf-8")
+        tdDnodes.start(index)
+        self.td5168insert()
+
+        # 查询前面所述5个时间数据并与基准数值进行比较
+        for i in range(5):
+            tdSql.query(f"select * from db.t1 where ts='2021-07-01 08:00:0{i}.000' ")
+            for j in range(4):
+                tdSql.checkData(0, j+1, locals()["f" + str(j) + str(i)])
+
+        # 关闭服务并获取压缩参数为 float&&double 情况下的数据容量
+        tdDnodes.stop(index)
+        dsize_float_double = int(subprocess.check_output(data_size_cmd, shell=True).decode("utf-8"))
+        lossy_args = subprocess.check_output(lossy_cfg_cmd, shell=True).decode("utf-8")
+        tdLog.printNoPrefix(f"open the lossyColumns， data size is：{dsize_float_double};the lossyColumns line is: {lossy_args}")
+
+        if not ((dsize_float_double < dsize_init) and (dsize_double < dsize_init) and (dsize_float < dsize_init)) :
+            tdLog.printNoPrefix(f"When lossyColumns value is float, data size is: {dsize_float}")
+            tdLog.printNoPrefix(f"When lossyColumns value is double, data size is: {dsize_double}")
+            tdLog.printNoPrefix(f"When lossyColumns value is float and double, data size is: {dsize_float_double}")
+            tdLog.printNoPrefix(f"When lossyColumns is closed, data size is: {dsize_init}")
+            tdLog.exit("压缩未生效")
+        else:
+            tdLog.printNoPrefix(f"When lossyColumns value is float, data size is: {dsize_float}")
+            tdLog.printNoPrefix(f"When lossyColumns value is double, data size is: {dsize_double}")
+            tdLog.printNoPrefix(f"When lossyColumns value is float and double, data size is: {dsize_float_double}")
+            tdLog.printNoPrefix(f"When lossyColumns is closed, data size is: {dsize_init}")
+            tdLog.printNoPrefix("压缩生效")
+
+        pass
+
+    def td5433(self):
+        tdLog.printNoPrefix("==========TD-5433==========")
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database  if not exists db keep 3650")
+
+        tdSql.execute("use db")
+        tdSql.execute("create stable db.stb1 (ts timestamp, c1 int) tags(t0 tinyint, t1 int)")
+        tdSql.execute("create stable db.stb2 (ts timestamp, c1 int) tags(t0 binary(16), t1 binary(16))")
+        numtab=2000000
+        for i in range(numtab):
+            sql  = f"create table db.t{i} using db.stb1 tags({i%128}, {100+i})"
+            tdSql.execute(sql)
+            tdSql.execute(f"insert into db.t{i} values (now-10d, {i})")
+            tdSql.execute(f"insert into db.t{i} values (now-9d, {i*2})")
+            tdSql.execute(f"insert into db.t{i} values (now-8d, {i*3})")
+
+        tdSql.execute("create table db.t01 using db.stb2 tags('1', '100')")
+        tdSql.execute("create table db.t02 using db.stb2 tags('2', '200')")
+        tdSql.execute("create table db.t03 using db.stb2 tags('3', '300')")
+        tdSql.execute("create table db.t04 using db.stb2 tags('4', '400')")
+        tdSql.execute("create table db.t05 using db.stb2 tags('5', '500')")
+
+        tdSql.query("select distinct t1 from stb1 where t1 != '150'")
+        tdSql.checkRows(numtab-1)
+        tdSql.query("select distinct t1 from stb1 where t1 != 150")
+        tdSql.checkRows(numtab-1)
+        tdSql.query("select distinct t1 from stb1 where t1 = 150")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct t1 from stb1 where t1 = '150'")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct t1 from stb1")
+        tdSql.checkRows(numtab)
+
+        tdSql.query("select distinct t0 from stb1 where t0 != '2'")
+        tdSql.checkRows(127)
+        tdSql.query("select distinct t0 from stb1 where t0 != 2")
+        tdSql.checkRows(127)
+        tdSql.query("select distinct t0 from stb1 where t0 = 2")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct t0 from stb1 where t0 = '2'")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct t0 from stb1")
+        tdSql.checkRows(128)
+
+        tdSql.query("select distinct t1 from stb2 where t1 != '200'")
+        tdSql.checkRows(4)
+        tdSql.query("select distinct t1 from stb2 where t1 != 200")
+        tdSql.checkRows(4)
+        tdSql.query("select distinct t1 from stb2 where t1 = 200")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct t1 from stb2 where t1 = '200'")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct t1 from stb2")
+        tdSql.checkRows(5)
+
+        tdSql.query("select distinct t0 from stb2 where t0 != '2'")
+        tdSql.checkRows(4)
+        tdSql.query("select distinct t0 from stb2 where t0 != 2")
+        tdSql.checkRows(4)
+        tdSql.query("select distinct t0 from stb2 where t0 = 2")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct t0 from stb2 where t0 = '2'")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct t0 from stb2")
+        tdSql.checkRows(5)
+
+        pass
+
+    def td5798(self):
+        tdLog.printNoPrefix("==========TD-5798 + TD-5810==========")
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database  if not exists db keep 3650")
+
+        tdSql.execute("use db")
+        tdSql.execute("create stable db.stb1 (ts timestamp, c1 int, c2 int) tags(t0 tinyint, t1 int, t2 int)")
+        tdSql.execute("create stable db.stb2 (ts timestamp, c2 int, c3 binary(16)) tags(t2 binary(16), t3 binary(16), t4 int)")
+        maxRemainderNum=7
+        tbnum=101
+        for i in range(tbnum-1):
+            sql  = f"create table db.t{i} using db.stb1 tags({i%maxRemainderNum}, {(i-1)%maxRemainderNum}, {i%2})"
+            tdSql.execute(sql)
+            tdSql.execute(f"insert into db.t{i} values (now-10d, {i}, {i%3})")
+            tdSql.execute(f"insert into db.t{i} values (now-9d, {i}, {(i-1)%3})")
+            tdSql.execute(f"insert into db.t{i} values (now-8d, {i}, {(i-2)%3})")
+            tdSql.execute(f"insert into db.t{i} (ts )values (now-7d)")
+
+            tdSql.execute(f"create table db.t0{i} using db.stb2 tags('{i%maxRemainderNum}', '{(i-1)%maxRemainderNum}', {i%3})")
+            tdSql.execute(f"insert into db.t0{i} values (now-10d, {i}, '{(i+1)%3}')")
+            tdSql.execute(f"insert into db.t0{i} values (now-9d, {i}, '{(i+2)%3}')")
+            tdSql.execute(f"insert into db.t0{i} values (now-8d, {i}, '{(i)%3}')")
+            tdSql.execute(f"insert into db.t0{i} (ts )values (now-7d)")
+        tdSql.execute("create table db.t100num using db.stb1 tags(null, null, null)")
+        tdSql.execute("create table db.t0100num using db.stb2 tags(null, null, null)")
+        tdSql.execute(f"insert into db.t100num values (now-10d, {tbnum-1}, 1)")
+        tdSql.execute(f"insert into db.t100num values (now-9d, {tbnum-1}, 0)")
+        tdSql.execute(f"insert into db.t100num values (now-8d, {tbnum-1}, 2)")
+        tdSql.execute(f"insert into db.t100num (ts )values (now-7d)")
+        tdSql.execute(f"insert into db.t0100num values (now-10d, {tbnum-1}, 1)")
+        tdSql.execute(f"insert into db.t0100num values (now-9d, {tbnum-1}, 0)")
+        tdSql.execute(f"insert into db.t0100num values (now-8d, {tbnum-1}, 2)")
+        tdSql.execute(f"insert into db.t0100num (ts )values (now-7d)")
+
+        #========== TD-5810 suport distinct multi-data-coloumn ==========
+        tdSql.query(f"select distinct  c1 from stb1 where c1 <{tbnum}")
+        tdSql.checkRows(tbnum)
+        tdSql.query(f"select distinct  c2 from stb1")
+        tdSql.checkRows(4)
+        tdSql.query(f"select distinct  c1,c2 from stb1 where c1 <{tbnum}")
+        tdSql.checkRows(tbnum*3)
+        tdSql.query(f"select distinct  c1,c1 from stb1 where c1 <{tbnum}")
+        tdSql.checkRows(tbnum)
+        tdSql.query(f"select distinct  c1,c2 from stb1 where c1 <{tbnum} limit 3")
+        tdSql.checkRows(3)
+        tdSql.query(f"select distinct  c1,c2 from stb1 where c1 <{tbnum} limit 3 offset {tbnum*3-2}")
+        tdSql.checkRows(2)
+
+        tdSql.query(f"select distinct  c1 from t1 where c1 <{tbnum}")
+        tdSql.checkRows(1)
+        tdSql.query(f"select distinct  c2 from t1")
+        tdSql.checkRows(4)
+        tdSql.query(f"select distinct  c1,c2 from t1 where c1 <{tbnum}")
+        tdSql.checkRows(3)
+        tdSql.query(f"select distinct  c1,c1 from t1 ")
+        tdSql.checkRows(2)
+        tdSql.query(f"select distinct  c1,c1 from t1 where c1 <{tbnum}")
+        tdSql.checkRows(1)
+        tdSql.query(f"select distinct  c1,c2 from t1 where c1 <{tbnum} limit 3")
+        tdSql.checkRows(3)
+        tdSql.query(f"select distinct  c1,c2 from t1 where c1 <{tbnum} limit 3 offset 2")
+        tdSql.checkRows(1)
+
+        tdSql.query(f"select distinct  c3 from stb2 where c2 <{tbnum} ")
+        tdSql.checkRows(3)
+        tdSql.query(f"select distinct  c3, c2 from stb2 where c2 <{tbnum} limit 2")
+        tdSql.checkRows(2)
+
+        tdSql.error("select distinct c5 from stb1")
+        tdSql.error("select distinct c5 from t1")
+        tdSql.error("select distinct c1 from db.*")
+        tdSql.error("select c2, distinct c1 from stb1")
+        tdSql.error("select c2, distinct c1 from t1")
+        tdSql.error("select distinct c2 from ")
+        tdSql.error("distinct c2 from stb1")
+        tdSql.error("distinct c2 from t1")
+        tdSql.error("select distinct  c1, c2, c3 from stb1")
+        tdSql.error("select distinct  c1, c2, c3 from t1")
+        tdSql.error("select distinct  stb1.c1, stb1.c2, stb2.c2, stb2.c3 from stb1")
+        tdSql.error("select distinct  stb1.c1, stb1.c2, stb2.c2, stb2.c3 from t1")
+        tdSql.error("select distinct  t1.c1, t1.c2, t2.c1, t2.c2 from t1")
+        tdSql.query(f"select distinct  c1 c2, c2 c3 from stb1 where c1 <{tbnum}")
+        tdSql.checkRows(tbnum*3)
+        tdSql.query(f"select distinct  c1 c2, c2 c3 from t1 where c1 <{tbnum}")
+        tdSql.checkRows(3)
+        tdSql.query("select distinct  c1, c2 from stb1 order by ts")
+        tdSql.checkRows(tbnum*3+1)
+        tdSql.query("select distinct  c1, c2 from t1 order by ts")
+        tdSql.checkRows(4)
+        tdSql.error("select distinct  c1, ts from stb1 group by c2")
+        tdSql.error("select distinct  c1, ts from t1 group by c2")
+        tdSql.error("select distinct  c1, max(c2) from stb1 ")
+        tdSql.error("select distinct  c1, max(c2) from t1 ")
+        tdSql.error("select max(c2), distinct  c1 from stb1 ")
+        tdSql.error("select max(c2), distinct  c1 from t1 ")
+        tdSql.error("select distinct  c1, c2 from stb1 where c1 > 3 group by t0")
+        tdSql.error("select distinct  c1, c2 from t1 where c1 > 3 group by t0")
+        tdSql.error("select distinct  c1, c2 from stb1 where c1 > 3 interval(1d) ")
+        tdSql.error("select distinct  c1, c2 from t1 where c1 > 3 interval(1d) ")
+        tdSql.error("select distinct  c1, c2 from stb1 where c1 > 3 interval(1d) fill(next)")
+        tdSql.error("select distinct  c1, c2 from t1 where c1 > 3 interval(1d) fill(next)")
+        tdSql.error("select distinct  c1, c2 from stb1 where ts > now-10d and ts < now interval(1d) fill(next)")
+        tdSql.error("select distinct  c1, c2 from t1 where ts > now-10d and ts < now interval(1d) fill(next)")
+        tdSql.error("select distinct  c1, c2 from stb1 where c1 > 3 slimit 1")
+        tdSql.error("select distinct  c1, c2 from t1 where c1 > 3 slimit 1")
+        tdSql.query(f"select distinct  c1, c2 from stb1 where c1 between {tbnum-2} and {tbnum} ")
+        tdSql.checkRows(6)
+        tdSql.query("select distinct  c1, c2 from stb1 where c1 in (1,2,3,4,5)")
+        tdSql.checkRows(15)
+        tdSql.query("select distinct  c1, c2 from stb1 where c1 in (100,1000,10000)")
+        tdSql.checkRows(3)
+
+        tdSql.query(f"select distinct  c1,c2 from (select * from stb1 where c1 > {tbnum-2}) ")
+        tdSql.checkRows(3)
+        tdSql.query(f"select distinct  c1,c2 from (select * from t1 where c1 < {tbnum}) ")
+        tdSql.checkRows(3)
+        tdSql.query(f"select distinct  c1,c2 from (select * from stb1 where t2 !=0 and t2 != 1) ")
+        tdSql.checkRows(4)
+        tdSql.error("select distinct  c1, c2 from (select distinct c1, c2 from stb1 where t0 > 2 and t1 < 3) ")
+        tdSql.error("select  c1, c2 from (select distinct c1, c2 from stb1 where t0 > 2 and t1 < 3) ")
+        tdSql.query("select distinct  c1, c2 from (select c2, c1 from stb1 where c1 > 2 ) where  c1 < 4")
+        tdSql.checkRows(3)
+        tdSql.error("select distinct  c1, c2 from (select c1 from stb1 where t0 > 2 ) where  t1 < 3")
+        tdSql.error("select distinct  c1, c2 from (select c2, c1 from stb1 where c1 > 2 order by ts)")
+        # tdSql.error("select distinct  c1, c2 from (select c2, c1 from t1 where c1 > 2 order by ts)")
+        tdSql.error("select distinct  c1, c2 from (select c2, c1 from stb1 where c1 > 2 group by c1)")
+        # tdSql.error("select distinct  c1, c2 from (select max(c1) c1, max(c2) c2 from stb1 group by c1)")
+        # tdSql.error("select distinct  c1, c2 from (select max(c1) c1, max(c2) c2 from t1 group by c1)")
+        tdSql.query("select distinct  c1, c2 from (select max(c1) c1, max(c2) c2 from stb1 )")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct  c1, c2 from (select max(c1) c1, max(c2) c2 from t1 )")
+        tdSql.checkRows(1)
+        tdSql.error("select distinct  stb1.c1, stb1.c2 from stb1 , stb2 where stb1.ts=stb2.ts and stb1.t2=stb2.t4")
+        tdSql.error("select distinct  t1.c1, t1.c2 from t1 , t2 where t1.ts=t2.ts ")
+
+        # tdSql.error("select distinct  c1, c2 from (select count(c1) c1, count(c2) c2 from stb1 group by ts)")
+        # tdSql.error("select distinct  c1, c2 from (select count(c1) c1, count(c2) c2 from t1 group by ts)")
+
+
+
+        #========== TD-5798 suport distinct multi-tags-coloumn ==========
+        tdSql.query("select distinct  t1 from stb1")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t0, t1 from stb1")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t1, t0 from stb1")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t1, t2 from stb1")
+        tdSql.checkRows(maxRemainderNum*2+1)
+        tdSql.query("select distinct  t0, t1, t2 from stb1")
+        tdSql.checkRows(maxRemainderNum*2+1)
+        tdSql.query("select distinct  t0 t1, t1 t2 from stb1")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t0, t0, t0 from stb1")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t0, t1 from t1")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct  t0, t1 from t100num")
+        tdSql.checkRows(1)
+
+        tdSql.query("select distinct  t3 from stb2")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t2, t3 from stb2")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t3, t2 from stb2")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t4, t2 from stb2")
+        tdSql.checkRows(maxRemainderNum*3+1)
+        tdSql.query("select distinct  t2, t3, t4 from stb2")
+        tdSql.checkRows(maxRemainderNum*3+1)
+        tdSql.query("select distinct  t2 t1, t3 t2 from stb2")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t3, t3, t3 from stb2")
+        tdSql.checkRows(maxRemainderNum+1)
+        tdSql.query("select distinct  t2, t3 from t01")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct  t3, t4 from t0100num")
+        tdSql.checkRows(1)
+
+
+        ########## should be error #########
+        tdSql.error("select distinct  from stb1")
+        tdSql.error("select distinct t3 from stb1")
+        tdSql.error("select distinct t1 from db.*")
+        tdSql.error("select distinct t2 from ")
+        tdSql.error("distinct t2 from stb1")
+        tdSql.error("select distinct stb1")
+        tdSql.error("select distinct  t0, t1, t2, t3 from stb1")
+        tdSql.error("select distinct  stb1.t0, stb1.t1, stb2.t2, stb2.t3 from stb1")
+
+        tdSql.error("select dist t0 from stb1")
+        tdSql.error("select distinct  stb2.t2, stb2.t3 from stb1")
+        tdSql.error("select distinct  stb2.t2 t1, stb2.t3 t2 from stb1")
+
+        tdSql.error("select distinct  t0, t1 from t1 where t0 < 7")
+
+        ########## add where condition ##########
+        tdSql.query("select distinct  t0, t1 from stb1 where t1 > 3")
+        tdSql.checkRows(3)
+        tdSql.query("select distinct  t0, t1 from stb1 where t1 > 3 limit 2")
+        tdSql.checkRows(2)
+        tdSql.query("select distinct  t0, t1 from stb1 where t1 > 3 limit 2 offset 2")
+        tdSql.checkRows(1)
+        tdSql.query("select distinct  t0, t1 from stb1 where t1 > 3 slimit 2")
+        tdSql.checkRows(3)
+        tdSql.error("select distinct  t0, t1 from stb1 where c1 > 2")
+        tdSql.query("select distinct  t0, t1 from stb1 where t1 > 3 and t1 < 5")
+        tdSql.checkRows(1)
+        tdSql.error("select distinct  stb1.t0, stb1.t1 from stb1, stb2 where stb1.t2=stb2.t4")
+        tdSql.error("select distinct  t0, t1 from stb1 where stb2.t4 > 2")
+        tdSql.error("select distinct  t0, t1 from stb1 where t1 > 3 group by t0")
+        tdSql.error("select distinct  t0, t1 from stb1 where t1 > 3 interval(1d) ")
+        tdSql.error("select distinct  t0, t1 from stb1 where t1 > 3 interval(1d) fill(next)")
+        tdSql.error("select distinct  t0, t1 from stb1 where ts > now-10d and ts < now interval(1d) fill(next)")
+
+        tdSql.error("select max(c1), distinct t0 from stb1 where t0 > 2")
+        tdSql.error("select distinct t0, max(c1) from stb1 where t0 > 2")
+        tdSql.error("select distinct  t0  from stb1 where t0 in (select t0 from stb1 where t0 > 2)")
+        tdSql.query("select distinct  t0, t1  from stb1 where t0 in (1,2,3,4,5)")
+        tdSql.checkRows(5)
+        tdSql.query("select distinct  t1 from (select t0, t1 from stb1 where t0 > 2) ")
+        tdSql.checkRows(4)
+        tdSql.error("select distinct  t1 from (select distinct t0, t1 from stb1 where t0 > 2 and t1 < 3) ")
+        tdSql.error("select distinct  t1 from (select distinct t0, t1 from stb1 where t0 > 2 ) where  t1 < 3")
+        tdSql.query("select distinct  t1 from (select t0, t1 from stb1 where t0 > 2 ) where  t1 < 3")
+        tdSql.checkRows(1)
+        tdSql.error("select distinct  t1, t0 from (select t1 from stb1 where t0 > 2 ) where  t1 < 3")
+        tdSql.error("select distinct  t1, t0 from (select max(t1) t1, max(t0) t0 from stb1 group by t1)")
+        tdSql.error("select distinct  t1, t0 from (select max(t1) t1, max(t0) t0 from stb1)")
+        tdSql.query("select distinct  t1, t0 from (select t1,t0 from stb1 where t0 > 2 ) where  t1 < 3")
+        tdSql.checkRows(1)
+        tdSql.error(" select distinct  t1, t0 from (select t1,t0 from stb1 where t0 > 2 order by ts) where  t1 < 3")
+        tdSql.error("select t1, t0 from (select distinct t1,t0 from stb1 where t0 > 2 ) where  t1 < 3")
+        tdSql.error(" select distinct  t1, t0 from (select t1,t0 from stb1 where t0 > 2  group by ts) where  t1 < 3")
+        tdSql.error("select distinct  stb1.t1, stb1.t2 from stb1 , stb2 where stb1.ts=stb2.ts and stb1.t2=stb2.t4")
+        tdSql.error("select distinct  t1.t1, t1.t2 from t1 , t2 where t1.ts=t2.ts ")
+
+        pass
+
+    def td5935(self):
+        tdLog.printNoPrefix("==========TD-5935==========")
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database  if not exists db keep 3650")
+
+        tdSql.execute("use db")
+        tdSql.execute("create stable db.stb1 (ts timestamp, c1 int, c2 float) tags(t1 int, t2 int)")
+        nowtime=int(round((time.time()*1000)))
+        for i in range(100):
+            sql = f"create table db.t{i} using db.stb1 tags({i % 7}, {i % 2})"
+            tdSql.execute(sql)
+            for j in range(1000):
+                tdSql.execute(f"insert into db.t{i} values ({nowtime-j*10}, {1000-j}, {round(random.random()*j,3)})")
+            tdSql.execute(f"insert into db.t{i} (ts) values ({nowtime-10000}) ")
+
+        ########### TD-5933  verify the bug of "function stddev with interval return 0 rows" is fixed ##########
+        stddevAndIntervalSql=f"select last(*) from t0 where ts>={nowtime-10000}  interval(10a) limit 10"
+        tdSql.query(stddevAndIntervalSql)
+        tdSql.checkRows(10)
+
+        ########## TD-5978 verify the bug of "when start row is null, result by fill(next) is 0 " is fixed ##########
+        fillsql=f"select last(*) from t0 where ts>={nowtime-10000} and ts<{nowtime}  interval(10a) fill(next) limit 10"
+        tdSql.query(fillsql)
+        fillResult=False
+        if (tdSql.getData(0,2) != 0) and (tdSql.getData(0, 2)  is not None):
+            fillResult=True
+        if fillResult:
+            tdLog.success(f"sql is :{fillsql}, fill(next) is correct")
+        else:
+            tdLog.exit("fill(next) is wrong")
+
+        pass
+
     def run(self):
 
         # master branch
         # self.td3690()
         # self.td4082()
         # self.td4288()
-        self.td4724()
+        # self.td4724()
+        self.td5798()
+        # self.td5935()
 
         # develop branch
         # self.td4097()
-
+        # self.td4889()
+        # self.td5168()
+        # self.td5433()
 
     def stop(self):
         tdSql.close()

tests/pytest/query/queryError.py

@@ -65,6 +65,10 @@ class TDTestCase:
         # TD-2208
         tdSql.error("select diff(tagtype),top(tagtype,1) from dev_001")
 
+        # TD-6006
+        tdSql.error("select * from dev_001 where 'name' is not null")
+        tdSql.error("select * from dev_001 where \"name\" = 'first'")
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/query/queryTbnameUpperLower.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+from util.common import tdCom
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def checkStbWhereIn(self):
+        '''
+            where in ---> upper lower mixed
+        '''
+        tdCom.cleanTb()
+        table_name = tdCom.getLongName(8, "letters_mixed")
+        table_name_sub = f'{table_name}_sub'
+        tb_name_lower = table_name_sub.lower()
+        tb_name_upper = table_name_sub.upper()
+
+        ## create stb and tb
+        tdSql.execute(f'CREATE TABLE {table_name} (ts timestamp, id int, bi1 binary(20)) tags (si1 binary(20))')
+        tdSql.execute(f'create table {table_name_sub}1 using {table_name} tags ("{table_name_sub}1")')
+        tdSql.execute(f'create table {tb_name_lower}2 using {table_name} tags ("{tb_name_lower}2")')
+        tdSql.execute(f'create table {tb_name_upper}3 using {table_name} tags ("{tb_name_upper}3")')
+
+        ## insert values
+        tdSql.execute(f'insert into {table_name_sub}1 values (now-1s, 1, "{table_name_sub}1")')
+        tdSql.execute(f'insert into {tb_name_lower}2 values (now-2s, 2, "{tb_name_lower}21")')
+        tdSql.execute(f'insert into {tb_name_lower}2 values (now-3s, 3, "{tb_name_lower}22")')
+        tdSql.execute(f'insert into {tb_name_upper}3 values (now-4s, 4, "{tb_name_upper}31")')
+        tdSql.execute(f'insert into {tb_name_upper}3 values (now-5s, 5, "{tb_name_upper}32")')
+        tdSql.execute(f'insert into {tb_name_upper}3 values (now-6s, 6, "{tb_name_upper}33")')
+
+        ## query where tbname in single
+        tdSql.query(f'select * from {table_name} where tbname in ("{table_name_sub}1")')
+        tdSql.checkRows(1)
+        tdSql.query(f'select * from {table_name} where tbname in ("{table_name_sub.upper()}1")')
+        tdSql.checkRows(1)
+        tdSql.query(f'select * from {table_name} where tbname in ("{table_name_sub.lower()}1")')
+        tdSql.checkRows(1)
+        tdSql.query(f'select * from {table_name} where tbname in ("{tb_name_lower}2")')
+        tdSql.checkRows(2)
+        tdSql.query(f'select * from {table_name} where tbname in ("{tb_name_lower.upper()}2")')
+        tdSql.checkRows(2)
+        tdSql.query(f'select * from {table_name} where tbname in ("{tb_name_upper}3")')
+        tdSql.checkRows(3)
+        tdSql.query(f'select * from {table_name} where tbname in ("{tb_name_upper.lower()}3")')
+        tdSql.checkRows(3)
+        
+        ## query where tbname in multi
+        tdSql.query(f'select * from {table_name} where id=5 and tbname in ("{table_name_sub}1", "{tb_name_lower.upper()}2", "{tb_name_upper.lower()}3")')
+        tdSql.checkRows(1)
+        tdSql.query(f'select * from {table_name} where tbname in ("{table_name_sub}1", "{tb_name_lower.upper()}2", "{tb_name_upper.lower()}3")')
+        tdSql.checkRows(6)
+
+    def run(self):
+        tdSql.prepare()
+        self.checkStbWhereIn()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/pytest/query/tbname.py

@@ -53,6 +53,9 @@ class TDTestCase:
             "select * from cars where id=0 and tbname in ('carzero', 'cartwo')")
         tdSql.checkRows(1)
 
+        tdSql.query("select * from cars where tbname in ('carZero', 'CARONE')")
+        tdSql.checkRows(2)
+
         """
         tdSql.query("select * from cars where tbname like 'car%'")
         tdSql.checkRows(2)

tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py

@@ -47,6 +47,7 @@ class TDTestCase:
         else:
             tdLog.info("taosd found in %s" % buildPath)
         binPath = buildPath + "/build/bin/"
+
         # insert: create one  or mutiple tables per sql and insert multiple rows per sql
         # insert data from a special timestamp
         # check stable stb0
@@ -89,6 +90,7 @@ class TDTestCase:
         os.system(
             "%staosdemo -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestNanoDatabaseNow.json -y " %
             binPath)
+
         tdSql.execute("use nsdb2")
         tdSql.query("show stables")
         tdSql.checkData(0, 4, 100)

tests/pytest/util/common.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import random
+import string
+from util.sql import tdSql
+
+class TDCom:
+    def init(self, conn, logSql):
+        tdSql.init(conn.cursor(), logSql)
+
+    def cleanTb(self):
+        query_sql = "show stables"
+        res_row_list = tdSql.query(query_sql, True)
+        stb_list = map(lambda x: x[0], res_row_list)
+        for stb in stb_list:
+            tdSql.execute(f'drop table if exists {stb}')
+
+        query_sql = "show tables"
+        res_row_list = tdSql.query(query_sql, True)
+        tb_list = map(lambda x: x[0], res_row_list)
+        for tb in tb_list:
+            tdSql.execute(f'drop table if exists {tb}')
+
+    def getLongName(self, len, mode = "mixed"):
+        """
+            generate long name
+            mode could be numbers/letters/letters_mixed/mixed
+        """    
+        if mode == "numbers": 
+            chars = ''.join(random.choice(string.digits) for i in range(len))
+        elif mode == "letters": 
+            chars = ''.join(random.choice(string.ascii_letters.lower()) for i in range(len))
+        elif mode == "letters_mixed": 
+            chars = ''.join(random.choice(string.ascii_letters.upper() + string.ascii_letters.lower()) for i in range(len))
+        else:
+            chars = ''.join(random.choice(string.ascii_letters.lower() + string.digits) for i in range(len))
+        return chars
+
+    def close(self):
+        self.cursor.close()
+
+tdCom = TDCom()
\ No newline at end of file

tests/script/general/parser/function.sim

@@ -313,6 +313,12 @@ if $rows != 6 then
   return -1
 endi
 
+print =============================> TD-6086
+sql create stable td6086st(ts timestamp, d double) tags(t nchar(50));
+sql create table td6086ct1 using td6086st tags("ct1");
+sql create table td6086ct2 using td6086st tags("ct2");
+sql SELECT LAST(d),t FROM td6086st WHERE tbname in ('td6086ct1', 'td6086ct2') and ts>="2019-07-30 00:00:00" and ts<="2021-08-31 00:00:00" interval(1800s) fill(prev) GROUP BY tbname;
+
 print ==================> td-2624
 sql create table tm2(ts timestamp, k int, b binary(12));
 sql insert into tm2 values('2011-01-02 18:42:45.326',      -1,'abc');
@@ -1149,9 +1155,11 @@ endi
 
 sql select derivative(test_column_alias_name, 1s, 0) from (select avg(k) test_column_alias_name from t1 interval(1s));
 
-sql create table smeters (ts timestamp, current float, voltage int);
-sql insert into smeters values ('2021-08-08 10:10:10', 10, 1);
-sql insert into smeters values ('2021-08-08 10:10:12', 10, 2);
+sql create table smeters (ts timestamp, current float, voltage int) tags (t1 int);
+sql create table smeter1 using smeters tags (1);
+sql insert into smeter1 values ('2021-08-08 10:10:10', 10, 2);
+sql insert into smeter1 values ('2021-08-08 10:10:12', 10, 2);
+sql insert into smeter1 values ('2021-08-08 10:10:14', 20, 1);
 
 sql select stddev(voltage) from smeters where ts>='2021-08-08 10:10:10.000' and ts < '2021-08-08 10:10:20.000'  and current=10 interval(1000a);
 if $rows != 2 then
@@ -1160,9 +1168,21 @@ endi
 if $data00 != @21-08-08 10:10:10.000@ then
   return -1
 endi
+if $data01 != 0.000000000 then
+  return -1
+endi
 if $data10 != @21-08-08 10:10:12.000@ then
   return -1
 endi
+if $data11 != 0.000000000 then
+  return -1
+endi
 
-
+sql select stddev(voltage) from smeters where ts>='2021-08-08 10:10:10.000' and ts < '2021-08-08 10:10:20.000'  and current=10;
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 0.000000000 then
+  return -1
+endi
 

tests/script/general/parser/interp.sim

@@ -68,7 +68,6 @@ print ================== server restart completed
 
 run general/parser/interp_test.sim
 
-
 print ================= TD-5931
 sql create stable st5931(ts timestamp, f int) tags(t int)
 sql create table ct5931 using st5931 tags(1)
@@ -76,6 +75,7 @@ sql create table nt5931(ts timestamp, f int)
 sql select interp(*) from nt5931 where ts=now
 sql select interp(*) from st5931 where ts=now
 sql select interp(*) from ct5931 where ts=now
+
 if $rows != 0 then
   return -1
 endi

tests/script/general/parser/interp_test.sim

@@ -930,8 +930,254 @@ if $data44 != @18-11-25 19:06:00.000@ then
 endi
 
 
+sql select interp(c1) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:42:00.000' interval(1m) fill(linear);
+if $rows != 8 then
+  return -1
+endi
+if $data00 != @18-09-17 20:35:00.000@  then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi
+if $data10 != @18-09-17 20:36:00.000@  then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data20 != @18-09-17 20:37:00.000@  then
+  return -1
+endi
+if $data21 != NULL then
+  return -1
+endi
+if $data30 != @18-09-17 20:38:00.000@  then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data40 != @18-09-17 20:39:00.000@  then
+  return -1
+endi
+if $data41 != NULL then
+  return -1
+endi
+if $data50 != @18-09-17 20:40:00.000@  then
+  return -1
+endi
+if $data51 != 0 then
+  return -1
+endi
+if $data60 != @18-09-17 20:41:00.000@  then
+  return -1
+endi
+if $data61 != NULL then
+  return -1
+endi
+if $data70 != @18-09-17 20:42:00.000@  then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+
 
+sql select interp(c1) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:42:00.000' interval(1m) fill(linear) order by ts desc;
+if $rows != 8 then
+  return -1
+endi
+if $data00 != @18-09-17 20:42:00.000@  then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi
+if $data10 != @18-09-17 20:41:00.000@  then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data20 != @18-09-17 20:40:00.000@  then
+  return -1
+endi
+if $data21 != 0 then
+  return -1
+endi
+if $data30 != @18-09-17 20:39:00.000@  then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data40 != @18-09-17 20:38:00.000@  then
+  return -1
+endi
+if $data41 != NULL then
+  return -1
+endi
+if $data50 != @18-09-17 20:37:00.000@  then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data60 != @18-09-17 20:36:00.000@  then
+  return -1
+endi
+if $data61 != NULL then
+  return -1
+endi
+if $data70 != @18-09-17 20:35:00.000@  then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
 
+sql  select interp(c3) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:50:00.000' interval(2m) fill(linear) order by ts;
+if $rows != 9 then
+  return -1
+endi
+if $data00 != @18-09-17 20:34:00.000@  then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi
+if $data10 != @18-09-17 20:36:00.000@  then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data20 != @18-09-17 20:38:00.000@  then
+  return -1
+endi
+if $data21 != NULL then
+  return -1
+endi
+if $data30 != @18-09-17 20:40:00.000@  then
+  return -1
+endi
+if $data31 != 0.00000 then
+  return -1
+endi
+if $data40 != @18-09-17 20:42:00.000@  then
+  return -1
+endi
+if $data41 != 0.20000 then
+  return -1
+endi
+if $data50 != @18-09-17 20:44:00.000@  then
+  return -1
+endi
+if $data51 != 0.40000 then
+  return -1
+endi
+if $data60 != @18-09-17 20:46:00.000@  then
+  return -1
+endi
+if $data61 != 0.60000 then
+  return -1
+endi
+if $data70 != @18-09-17 20:48:00.000@  then
+  return -1
+endi
+if $data71 != 0.80000 then
+  return -1
+endi
+if $data80 != @18-09-17 20:50:00.000@  then
+  return -1
+endi
+if $data81 != 1.00000 then
+  return -1
+endi
+
+
+sql select interp(c3) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:50:00.000' interval(3m) fill(linear) order by ts;
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @18-09-17 20:33:00.000@  then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi
+if $data10 != @18-09-17 20:36:00.000@  then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data20 != @18-09-17 20:39:00.000@  then
+  return -1
+endi
+if $data21 != NULL then
+  return -1
+endi
+if $data30 != @18-09-17 20:42:00.000@  then
+  return -1
+endi
+if $data31 != 0.20000 then
+  return -1
+endi
+if $data40 != @18-09-17 20:45:00.000@  then
+  return -1
+endi
+if $data41 != 0.50000 then
+  return -1
+endi
+if $data50 != @18-09-17 20:48:00.000@  then
+  return -1
+endi
+if $data51 != 0.80000 then
+  return -1
+endi
+
+sql select interp(c3) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:50:00.000' interval(3m) fill(linear) order by ts desc;
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @18-09-17 20:48:00.000@  then
+  return -1
+endi
+if $data01 != 0.80000 then
+  return -1
+endi
+if $data10 != @18-09-17 20:45:00.000@  then
+  return -1
+endi
+if $data11 != 0.50000 then
+  return -1
+endi
+if $data20 != @18-09-17 20:42:00.000@  then
+  return -1
+endi
+if $data21 != 0.20000 then
+  return -1
+endi
+if $data30 != @18-09-17 20:39:00.000@  then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data40 != @18-09-17 20:36:00.000@  then
+  return -1
+endi
+if $data41 != NULL then
+  return -1
+endi
+if $data50 != @18-09-17 20:33:00.000@  then
+  return -1
+endi
+if $data51 != NULL  then
+  return -1
+endi
 
 
 

tests/script/general/parser/limit.sim

@@ -75,4 +75,9 @@ sleep 100
 run general/parser/limit_tb.sim
 run general/parser/limit_stb.sim
 
+print ========> TD-6017
+sql use $db
+sql select * from (select ts, top(c1, 5) from $tb where ts >= $ts0 order by ts desc limit 3 offset 1)
+sql select * from (select ts, top(c1, 5) from $stb where ts >= $ts0 order by ts desc limit 3 offset 1)
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/parser/limit_tb.sim

@@ -355,6 +355,10 @@ sql select top(c1, 1) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
 if $rows != 0 then
   return -1
 endi
+
+print ========> TD-6017
+sql select * from (select ts, top(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu order by ts desc limit 3 offset 1)
+
 sql select top(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu order by ts desc limit 3 offset 1
 print select top(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu order by ts desc limit 3 offset 1
 print $data00 $data01

tests/script/general/parser/tbnameIn_query.sim

@@ -101,6 +101,30 @@ if $data11 != 2 then
   return -1
 endi
 
+## tbname in can accpet Upper case table name
+sql select count(*) from $stb where tbname in ('ti_tb0', 'TI_tb1', 'TI_TB2') group by t1 order by t1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != 10 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data10 != 10 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+if $data20 != 10 then
+  return -1
+endi
+if $data21 != 2 then
+  return -1
+endi
+
 # multiple tbname in is not allowed NOW
 sql_error select count(*) from $stb where tbname in ('ti_tb1', 'ti_tb300') and tbname in ('ti_tb5', 'ti_tb1000') group by t1 order by t1 asc
 #if $rows != 4 then

tests/script/jenkins/basic.txt

@@ -90,6 +90,14 @@ cd ../../../debug; make
 ./test.sh -f general/parser/function.sim
 ./test.sh -f unique/cluster/vgroup100.sim
 
+./test.sh -f unique/http/admin.sim
+./test.sh -f unique/http/opentsdb.sim
+
+./test.sh -f unique/import/replica2.sim
+./test.sh -f unique/import/replica3.sim
+
+./test.sh -f general/alter/cached_schema_after_alter.sim
+
 #======================b1-end===============
 #======================b2-start===============