Merge branch '3.0' into feat/TD-17777-V30

cmake/taostools_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG 85179e9
+        GIT_TAG 85b582b
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

include/libs/function/function.h

@@ -54,7 +54,7 @@ typedef struct SFuncExecFuncs {
   FExecCombine  combine;
 } SFuncExecFuncs;
 
-#define MAX_INTERVAL_TIME_WINDOW 1000000  // maximum allowed time windows in final results
+#define MAX_INTERVAL_TIME_WINDOW 10000000  // maximum allowed time windows in final results
 
 #define TOP_BOTTOM_QUERY_LIMIT    100
 #define FUNCTIONS_NAME_MAX_LENGTH 16

packaging/tools/makepkg.sh

@@ -47,7 +47,7 @@ if [ -d ${top_dir}/tools/taos-tools/packaging/deb ]; then
   cd ${top_dir}/tools/taos-tools/packaging/deb
   [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
 
-  taostools_ver=$(git describe --tags | sed -e 's/ver-//g' | awk -F '-' '{print $1}')
+  taostools_ver=$(git tag |grep -v taos | sort | tail -1)
   taostools_install_dir="${release_dir}/${clientName}Tools-${taostools_ver}"
 
   cd ${curr_dir}

source/dnode/mnode/impl/src/mndMain.c

@@ -814,9 +814,11 @@ int32_t mndAcquireRpcRef(SMnode *pMnode) {
   int32_t code = 0;
   taosThreadRwlockRdlock(&pMnode->lock);
   if (pMnode->stopped) {
+    mTrace("mnode not running");
     terrno = TSDB_CODE_APP_NOT_READY;
     code = -1;
   } else if (!mndIsMaster(pMnode)) {
+    mTrace("mnode not ready, role:%s restored:%d", syncGetMyRoleStr(pMnode->syncMgmt.sync), pMnode->restored);
     code = -1;
   } else {
     int32_t ref = atomic_add_fetch_32(&pMnode->rpcRef, 1);

source/dnode/vnode/inc/vnode.h

@@ -91,6 +91,8 @@ typedef struct SMeta       SMeta;  // todo: remove
 typedef struct SMetaReader SMetaReader;
 typedef struct SMetaEntry  SMetaEntry;
 
+#define META_READER_NOLOCK 0x1
+
 void        metaReaderInit(SMetaReader *pReader, SMeta *pMeta, int32_t flags);
 void        metaReaderClear(SMetaReader *pReader);
 int32_t     metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);

source/dnode/vnode/src/meta/metaQuery.c

@@ -19,11 +19,13 @@ void metaReaderInit(SMetaReader *pReader, SMeta *pMeta, int32_t flags) {
   memset(pReader, 0, sizeof(*pReader));
   pReader->flags = flags;
   pReader->pMeta = pMeta;
-  metaRLock(pMeta);
+  if (!(flags & META_READER_NOLOCK)) {
+    metaRLock(pMeta);
+  }
 }
 
 void metaReaderClear(SMetaReader *pReader) {
-  if (pReader->pMeta) {
+  if (pReader->pMeta && !(pReader->flags & META_READER_NOLOCK)) {
     metaULock(pReader->pMeta);
   }
   tDecoderClear(&pReader->coder);

source/dnode/vnode/src/tsdb/tsdbMergeTree.c

@@ -265,24 +265,43 @@ int32_t tLDataIterOpen(struct SLDataIter **pIter, SDataFReader *pReader, int32_t
 
     // only apply to the child tables, ordinary tables will not incur this filter procedure.
     size = taosArrayGetSize(pBlockLoadInfo->aSttBlk);
-    SArray *pTmp = taosArrayInit(size, sizeof(SSttBlk));
-    for (int32_t i = 0; i < size; ++i) {
-      SSttBlk *p = taosArrayGet(pBlockLoadInfo->aSttBlk, i);
-      uint64_t s = p->suid;
-      if (s < suid) {
-        continue;
-      }
 
-      if (s == suid) {
-        taosArrayPush(pTmp, p);
-      } else if (s > suid) {
-        break;
+    if (size > 1) {
+      SSttBlk *pStart = taosArrayGet(pBlockLoadInfo->aSttBlk, 0);
+      SSttBlk *pEnd = taosArrayGet(pBlockLoadInfo->aSttBlk, size - 1);
+
+      // all identical
+      if (pStart->suid == pEnd->suid) {
+        if (pStart->suid == suid) {
+          // do nothing
+        } else if (pStart->suid != suid) {
+          // no qualified stt block existed
+          (*pIter)->iSttBlk = -1;
+          double el = (taosGetTimestampUs() - st)/1000.0;
+          tsdbDebug("load the last file info completed, elapsed time:%.2fms, %s", el, idStr);
+          return code;
+        }
+      } else {
+        SArray *pTmp = taosArrayInit(size, sizeof(SSttBlk));
+        for (int32_t i = 0; i < size; ++i) {
+          SSttBlk *p = taosArrayGet(pBlockLoadInfo->aSttBlk, i);
+          uint64_t s = p->suid;
+          if (s < suid) {
+            continue;
+          }
+
+          if (s == suid) {
+            taosArrayPush(pTmp, p);
+          } else if (s > suid) {
+            break;
+          }
+        }
+
+        taosArrayDestroy(pBlockLoadInfo->aSttBlk);
+        pBlockLoadInfo->aSttBlk = pTmp;
       }
     }
 
-    taosArrayDestroy(pBlockLoadInfo->aSttBlk);
-    pBlockLoadInfo->aSttBlk = pTmp;
-
     double el = (taosGetTimestampUs() - st)/1000.0;
     tsdbDebug("load the last file info completed, elapsed time:%.2fms, %s", el, idStr);
   }

source/libs/executor/src/scanoperator.c

@@ -2757,7 +2757,7 @@ static SSDataBlock* sysTableScanUserTables(SOperatorInfo* pOperator) {
         colDataAppend(pColInfoData, numOfRows, (char*)&ts, false);
 
         SMetaReader mr = {0};
-        metaReaderInit(&mr, pInfo->readHandle.meta, 0);
+        metaReaderInit(&mr, pInfo->readHandle.meta, META_READER_NOLOCK);
 
         uint64_t suid = pInfo->pCur->mr.me.ctbEntry.suid;
         int32_t  code = metaGetTableEntryByUid(&mr, suid);

source/libs/function/src/builtins.c

@@ -662,7 +662,7 @@ static int32_t translateTopBot(SFunctionNode* pFunc, char* pErrBuf, int32_t len)
     return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
   }
 
-  if (pValue->datum.i < 1 || pValue->datum.i > 100) {
+  if (pValue->datum.i < 1 || pValue->datum.i > TOP_BOTTOM_QUERY_LIMIT) {
     return invaildFuncParaValueErrMsg(pErrBuf, len, pFunc->functionName);
   }