From dfc91a38b0030fa359d828d04c50e16d9ff8b835 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 10 Oct 2022 21:29:36 +0800
Subject: [PATCH 01/19] more code

---
 source/dnode/vnode/src/meta/metaOpen.c | 14 +++++++++++---
 source/dnode/vnode/src/tsdb/tsdbFS.c   |  9 +++++++--
 source/dnode/vnode/src/tsdb/tsdbOpen.c |  7 +++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c
index fb450f3594..515fd31e9d 100644
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
@@ -35,7 +35,11 @@ int metaOpen(SVnode *pVnode, SMeta **ppMeta) {
   *ppMeta = NULL;
 
   // create handle
-  slen = strlen(tfsGetPrimaryPath(pVnode->pTfs)) + strlen(pVnode->path) + strlen(VNODE_META_DIR) + 3;
+  if (pVnode->pTfs) {
+    slen = strlen(tfsGetPrimaryPath(pVnode->pTfs)) + strlen(pVnode->path) + strlen(VNODE_META_DIR) + 3;
+  } else {
+    slen = strlen(pVnode->path) + strlen(VNODE_META_DIR) + 2;
+  }
   if ((pMeta = taosMemoryCalloc(1, sizeof(*pMeta) + slen)) == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
@@ -43,8 +47,12 @@ int metaOpen(SVnode *pVnode, SMeta **ppMeta) {
 
   metaInitLock(pMeta);
   pMeta->path = (char *)&pMeta[1];
-  sprintf(pMeta->path, "%s%s%s%s%s", tfsGetPrimaryPath(pVnode->pTfs), TD_DIRSEP, pVnode->path, TD_DIRSEP,
-          VNODE_META_DIR);
+  if (pVnode->pTfs) {
+    sprintf(pMeta->path, "%s%s%s%s%s", tfsGetPrimaryPath(pVnode->pTfs), TD_DIRSEP, pVnode->path, TD_DIRSEP,
+            VNODE_META_DIR);
+  } else {
+    sprintf(pMeta->path, "%s%s%s", pVnode->path, TD_DIRSEP, VNODE_META_DIR);
+  }
   taosRealPath(pMeta->path, NULL, slen);
   pMeta->pVnode = pVnode;
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbFS.c b/source/dnode/vnode/src/tsdb/tsdbFS.c
index 10926ae6ad..85514ed5b6 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS.c
@@ -417,6 +417,7 @@ _err:
 // EXPOSED APIS ====================================================================================
 int32_t tsdbFSOpen(STsdb *pTsdb) {
   int32_t code = 0;
+  SVnode *pVnode = pTsdb->pVnode;
 
   // open handle
   pTsdb->fs.pDelFile = NULL;
@@ -429,8 +430,12 @@ int32_t tsdbFSOpen(STsdb *pTsdb) {
   // load fs or keep empty
   char fname[TSDB_FILENAME_LEN];
 
-  snprintf(fname, TSDB_FILENAME_LEN - 1, "%s%s%s%sCURRENT", tfsGetPrimaryPath(pTsdb->pVnode->pTfs), TD_DIRSEP,
-           pTsdb->path, TD_DIRSEP);
+  if (pVnode->pTfs) {
+    snprintf(fname, TSDB_FILENAME_LEN - 1, "%s%s%s%sCURRENT", tfsGetPrimaryPath(pTsdb->pVnode->pTfs), TD_DIRSEP,
+             pTsdb->path, TD_DIRSEP);
+  } else {
+    snprintf(fname, TSDB_FILENAME_LEN - 1, "%s%sCURRENT", pTsdb->path, TD_DIRSEP);
+  }
 
   if (!taosCheckExistFile(fname)) {
     // empty one
diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c
index fcbcff9248..e4080ccf1e 100644
--- a/source/dnode/vnode/src/tsdb/tsdbOpen.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c
@@ -57,10 +57,13 @@ int tsdbOpen(SVnode *pVnode, STsdb **ppTsdb, const char *dir, STsdbKeepCfg *pKee
   } else {
     memcpy(&pTsdb->keepCfg, pKeepCfg, sizeof(STsdbKeepCfg));
   }
-  // pTsdb->fs = tsdbNewFS(REPO_KEEP_CFG(pTsdb));
 
   // create dir
-  tfsMkdir(pVnode->pTfs, pTsdb->path);
+  if (pVnode->pTfs) {
+    tfsMkdir(pVnode->pTfs, pTsdb->path);
+  } else {
+    taosMkDir(pTsdb->path);
+  }
 
   // open tsdb
   if (tsdbFSOpen(pTsdb) < 0) {

From 8fbf4af35f8cba0f66191c172750585923a0ee09 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 10 Oct 2022 21:30:23 +0800
Subject: [PATCH 02/19] more code

---
 source/dnode/vnode/src/vnd/vnodeCommit.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index 6dc3ef86a7..07d9b96261 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -227,7 +227,11 @@ int vnodeCommit(SVnode *pVnode) {
   info.state.committed = pVnode->state.applied;
   info.state.commitTerm = pVnode->state.applyTerm;
   info.state.commitID = pVnode->state.commitID;
-  snprintf(dir, TSDB_FILENAME_LEN, "%s%s%s", tfsGetPrimaryPath(pVnode->pTfs), TD_DIRSEP, pVnode->path);
+  if (pVnode->pTfs) {
+    snprintf(dir, TSDB_FILENAME_LEN, "%s%s%s", tfsGetPrimaryPath(pVnode->pTfs), TD_DIRSEP, pVnode->path);
+  } else {
+    snprintf(dir, TSDB_FILENAME_LEN, "%s", pVnode->path);
+  }
   if (vnodeSaveInfo(dir, &info) < 0) {
     ASSERT(0);
     return -1;

From 1a8877c7876519fb0900564d749d4a5a606a4ee0 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 11 Oct 2022 16:15:38 +0800
Subject: [PATCH 03/19] more code

---
 source/dnode/vnode/src/vnd/vnodeOpen.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index 414834e2eb..f016b3ffd4 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -138,12 +138,6 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
   sprintf(tdir, "%s%s%s", dir, TD_DIRSEP, VNODE_WAL_DIR);
   taosRealPath(tdir, NULL, sizeof(tdir));
 
-// for test tsdb snapshot
-#if 0
-  pVnode->config.walCfg.segSize = 200;
-  pVnode->config.walCfg.retentionSize = 2000;
-#endif
-
   pVnode->pWal = walOpen(tdir, &(pVnode->config.walCfg));
   if (pVnode->pWal == NULL) {
     vError("vgId:%d, failed to open vnode wal since %s", TD_VID(pVnode), tstrerror(terrno));

From c310d4a177f23e23a9c8210db8c62e93891f5e3f Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 11 Oct 2022 16:43:01 +0800
Subject: [PATCH 04/19] more code

---
 source/dnode/vnode/src/vnd/vnodeOpen.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index f016b3ffd4..de3af7cde6 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -153,12 +153,14 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
     goto _err;
   }
 
+#if !VNODE_AS_LIB
   // open query
   if (vnodeQueryOpen(pVnode)) {
     vError("vgId:%d, failed to open vnode query since %s", TD_VID(pVnode), tstrerror(terrno));
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     goto _err;
   }
+#endif
 
   // vnode begin
   if (vnodeBegin(pVnode) < 0) {
@@ -167,11 +169,13 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
     goto _err;
   }
 
+#if !VNODE_AS_LIB
   // open sync
   if (vnodeSyncOpen(pVnode, dir)) {
     vError("vgId:%d, failed to open sync since %s", TD_VID(pVnode), tstrerror(terrno));
     goto _err;
   }
+#endif
 
   return pVnode;
 

From 14c4ff1d94c00ed12f3a7a89eeca2b357c119cef Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Tue, 11 Oct 2022 16:48:13 +0800
Subject: [PATCH 05/19] add demo for stream user defined table name

---
 examples/c/stream_demo.c                      | 11 ++++++-----
 source/libs/executor/src/timewindowoperator.c |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/examples/c/stream_demo.c b/examples/c/stream_demo.c
index 1c9d11b755..9243b68100 100644
--- a/examples/c/stream_demo.c
+++ b/examples/c/stream_demo.c
@@ -49,28 +49,28 @@ int32_t init_env() {
   }
   taos_free_result(pRes);
 
-  pRes = taos_query(pConn, "create stable if not exists st1 (ts timestamp, k int) tags(a int)");
+  pRes = taos_query(pConn, "create stable if not exists st1 (ts timestamp, k int, j varchar(20)) tags(a varchar(20))");
   if (taos_errno(pRes) != 0) {
     printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
     return -1;
   }
   taos_free_result(pRes);
 
-  pRes = taos_query(pConn, "create table if not exists tu1 using st1 tags(1)");
+  pRes = taos_query(pConn, "create table if not exists tu1 using st1 tags('c1')");
   if (taos_errno(pRes) != 0) {
     printf("failed to create child table tu1, reason:%s\n", taos_errstr(pRes));
     return -1;
   }
   taos_free_result(pRes);
 
-  pRes = taos_query(pConn, "create table if not exists tu2 using st1 tags(2)");
+  pRes = taos_query(pConn, "create table if not exists tu2 using st1 tags('c2')");
   if (taos_errno(pRes) != 0) {
     printf("failed to create child table tu2, reason:%s\n", taos_errstr(pRes));
     return -1;
   }
   taos_free_result(pRes);
 
-  pRes = taos_query(pConn, "create table if not exists tu3 using st1 tags(3)");
+  pRes = taos_query(pConn, "create table if not exists tu3 using st1 tags('c3')");
   if (taos_errno(pRes) != 0) {
     printf("failed to create child table tu3, reason:%s\n", taos_errstr(pRes));
     return -1;
@@ -96,7 +96,8 @@ int32_t create_stream() {
   taos_free_result(pRes);
 
   pRes = taos_query(pConn,
-                    "create stream stream1 trigger at_once watermark 10s into outstb as select _wstart start, avg(k) from st1 partition by tbname interval(10s)");
+                    /*"create stream stream1 trigger at_once watermark 10s into outstb as select _wstart start, avg(k) from st1 partition by tbname interval(10s)");*/
+                    "create stream stream2 into outstb subtable(concat(concat(concat('prefix_', tname), '_suffix'), cast(k1 as varchar(20)))) as select _wstart wstart, avg(k) from st1 partition by tbname tname, a k1 interval(10s);");
   if (taos_errno(pRes) != 0) {
     printf("failed to create stream stream1, reason:%s\n", taos_errstr(pRes));
     return -1;
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index c968f82702..560a1d319a 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -3611,6 +3611,7 @@ void destroyStreamSessionAggOperatorInfo(void* param) {
   blockDataDestroy(pInfo->pUpdateRes);
   destroySqlFunctionCtx(pInfo->pDummyCtx, 0);
   taosHashCleanup(pInfo->pStDeleted);
+  taosHashCleanup(pInfo->pGroupIdTbNameMap);
 
   taosMemoryFreeClear(param);
 }
@@ -4670,6 +4671,7 @@ void destroyStreamStateOperatorInfo(void* param) {
   colDataDestroy(&pInfo->twAggSup.timeWindowData);
   blockDataDestroy(pInfo->pDelRes);
   taosHashCleanup(pInfo->pSeDeleted);
+  taosHashCleanup(pInfo->pGroupIdTbNameMap);
   destroySqlFunctionCtx(pInfo->pDummyCtx, 0);
 
   taosMemoryFreeClear(param);

From 41474e40bf2fd552fc6f43cf572894bec94cf34a Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 12 Oct 2022 01:11:47 +0800
Subject: [PATCH 06/19] enh(wal): auto fix

---
 examples/c/stream_demo.c      |   2 +-
 source/libs/wal/src/walMeta.c | 113 ++++++++++++++++++++++++++++------
 2 files changed, 95 insertions(+), 20 deletions(-)

diff --git a/examples/c/stream_demo.c b/examples/c/stream_demo.c
index 9243b68100..46c8297fba 100644
--- a/examples/c/stream_demo.c
+++ b/examples/c/stream_demo.c
@@ -97,7 +97,7 @@ int32_t create_stream() {
 
   pRes = taos_query(pConn,
                     /*"create stream stream1 trigger at_once watermark 10s into outstb as select _wstart start, avg(k) from st1 partition by tbname interval(10s)");*/
-                    "create stream stream2 into outstb subtable(concat(concat(concat('prefix_', tname), '_suffix'), cast(k1 as varchar(20)))) as select _wstart wstart, avg(k) from st1 partition by tbname tname, a k1 interval(10s);");
+                    "create stream stream2 into outstb subtable(concat(concat(concat('prefix_', tname), '_suffix_'), cast(k1 as varchar(20)))) as select _wstart wstart, avg(k) from st1 partition by tbname tname, a k1 interval(10s);");
   if (taos_errno(pRes) != 0) {
     printf("failed to create stream stream1, reason:%s\n", taos_errstr(pRes));
     return -1;
diff --git a/source/libs/wal/src/walMeta.c b/source/libs/wal/src/walMeta.c
index 233d6a87b8..62f2d51f1b 100644
--- a/source/libs/wal/src/walMeta.c
+++ b/source/libs/wal/src/walMeta.c
@@ -150,6 +150,7 @@ int walCheckAndRepairMeta(SWal* pWal) {
   const char* idxPattern = "^[0-9]+.idx$";
   regex_t     logRegPattern;
   regex_t     idxRegPattern;
+  bool        fixed = false;
 
   regcomp(&logRegPattern, logPattern, REG_EXTENDED);
   regcomp(&idxRegPattern, idxPattern, REG_EXTENDED);
@@ -206,6 +207,77 @@ int walCheckAndRepairMeta(SWal* pWal) {
   actualFileNum = taosArrayGetSize(pLogInfoArray);
 #endif
 
+  {
+    int32_t i = 0, j = 0;
+    while (i < actualFileNum && j < metaFileNum) {
+      SWalFileInfo* pActualFile = taosArrayGet(actualLog, i);
+      SWalFileInfo* pMetaFile = taosArrayGet(pWal->fileInfoSet, j);
+      if (pActualFile->firstVer < pMetaFile->firstVer) {
+        char fNameStr[WAL_FILE_LEN];
+        walBuildLogName(pWal, pActualFile->firstVer, fNameStr);
+        taosRemoveFile(fNameStr);
+        walBuildIdxName(pWal, pActualFile->firstVer, fNameStr);
+        taosRemoveFile(fNameStr);
+        i++;
+      } else if (pActualFile->firstVer > pMetaFile->firstVer) {
+        taosArrayRemove(pWal->fileInfoSet, j);
+        metaFileNum--;
+      } else {
+        i++;
+        j++;
+      }
+    }
+    if (i == actualFileNum && j == metaFileNum) {
+      if (j > 0) {
+        SWalFileInfo* pLastInfo = taosArrayGet(pWal->fileInfoSet, j - 1);
+        int64_t       fsize = 0;
+        char          fNameStr[WAL_FILE_LEN];
+        walBuildLogName(pWal, pLastInfo->firstVer, fNameStr);
+        taosStatFile(fNameStr, &fsize, NULL);
+        if (pLastInfo->fileSize != fsize) {
+          fixed = true;
+          pLastInfo->fileSize = fsize;
+          pLastInfo->lastVer = walScanLogGetLastVer(pWal);
+        }
+      }
+    } else {
+      fixed = true;
+      while (i < actualFileNum) {
+        SWalFileInfo* pActualFile = taosArrayGet(actualLog, i);
+        char          fNameStr[WAL_FILE_LEN];
+        walBuildLogName(pWal, pActualFile->firstVer, fNameStr);
+        taosStatFile(fNameStr, &pActualFile->fileSize, NULL);
+
+        if (pActualFile->fileSize == 0) {
+          ASSERT(i == actualFileNum - 1);
+          taosRemoveFile(fNameStr);
+
+          walBuildIdxName(pWal, pActualFile->firstVer, fNameStr);
+          taosRemoveFile(fNameStr);
+          break;
+        }
+
+        if (i < actualFileNum - 1) {
+          pActualFile->lastVer = ((SWalFileInfo*)taosArrayGet(actualLog, i + 1))->firstVer - 1;
+          taosArrayPush(pWal->fileInfoSet, pActualFile);
+          i++;
+        } else {
+          pActualFile = taosArrayPush(pWal->fileInfoSet, pActualFile);
+          pActualFile->lastVer = walScanLogGetLastVer(pWal);
+          if (pActualFile->lastVer == -1) {
+            taosRemoveFile(fNameStr);
+
+            walBuildIdxName(pWal, pActualFile->firstVer, fNameStr);
+            taosRemoveFile(fNameStr);
+            taosArrayPop(pWal->fileInfoSet);
+          }
+          break;
+        }
+      }
+    }
+  }
+
+#if 0
   if (metaFileNum > actualFileNum) {
     taosArrayPopFrontBatch(pWal->fileInfoSet, metaFileNum - actualFileNum);
   } else if (metaFileNum < actualFileNum) {
@@ -214,30 +286,28 @@ int walCheckAndRepairMeta(SWal* pWal) {
       taosArrayPush(pWal->fileInfoSet, pFileInfo);
     }
   }
+#endif
+
   taosArrayDestroy(actualLog);
 
+  actualFileNum = taosArrayGetSize(pWal->fileInfoSet);
   pWal->writeCur = actualFileNum - 1;
+
   if (actualFileNum > 0) {
-    pWal->vers.firstVer = ((SWalFileInfo*)taosArrayGet(pWal->fileInfoSet, 0))->firstVer;
-
-    SWalFileInfo* pLastFileInfo = taosArrayGet(pWal->fileInfoSet, actualFileNum - 1);
-    char          fnameStr[WAL_FILE_LEN];
-    walBuildLogName(pWal, pLastFileInfo->firstVer, fnameStr);
-    int64_t fileSize = 0;
-    taosStatFile(fnameStr, &fileSize, NULL);
-    /*ASSERT(fileSize != 0);*/
-
-    if (metaFileNum != actualFileNum || pLastFileInfo->fileSize != fileSize) {
-      pLastFileInfo->fileSize = fileSize;
-      pWal->vers.lastVer = walScanLogGetLastVer(pWal);
-      ((SWalFileInfo*)taosArrayGetLast(pWal->fileInfoSet))->lastVer = pWal->vers.lastVer;
-      ASSERT(pWal->vers.lastVer != -1);
-
-      int code = walSaveMeta(pWal);
-      if (code < 0) {
-        return -1;
-      }
+    int64_t fLastVer = ((SWalFileInfo*)taosArrayGet(pWal->fileInfoSet, pWal->writeCur))->lastVer;
+    if (fLastVer != -1 && pWal->vers.lastVer != fLastVer) {
+      fixed = true;
+      pWal->vers.lastVer = fLastVer;
     }
+    int64_t fFirstVer = ((SWalFileInfo*)taosArrayGet(pWal->fileInfoSet, 0))->firstVer;
+    if (fFirstVer != pWal->vers.firstVer) {
+      fixed = true;
+      pWal->vers.firstVer = fFirstVer;
+    }
+  }
+
+  if (fixed) {
+    walSaveMeta(pWal);
   }
 
   return 0;
@@ -530,6 +600,11 @@ int walLoadMeta(SWal* pWal) {
   // read metafile
   int64_t fileSize = 0;
   taosStatFile(fnameStr, &fileSize, NULL);
+  if (fileSize == 0) {
+    taosRemoveFile(fnameStr);
+    wDebug("vgId:%d wal find empty meta ver %d", pWal->cfg.vgId, metaVer);
+    return -1;
+  }
   int   size = (int)fileSize;
   char* buf = taosMemoryMalloc(size + 5);
   if (buf == NULL) {

From fe4a2ae03ec36f0561a8a95ebfa5f65ae79c7e8c Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 12 Oct 2022 10:05:22 +0800
Subject: [PATCH 07/19] adjust cmake

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90e841d5e0..566d4ad29d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,11 +17,12 @@ include(${TD_SUPPORT_DIR}/cmake.platform)
 include(${TD_SUPPORT_DIR}/cmake.define)
 include(${TD_SUPPORT_DIR}/cmake.options)
 include(${TD_SUPPORT_DIR}/cmake.version)
-include(${TD_SUPPORT_DIR}/cmake.install)
 
 # contrib
 add_subdirectory(contrib)
 
+set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_NO_CYCLES OFF)
+
 # api
 add_library(api INTERFACE)
 target_include_directories(api INTERFACE "include/client")
@@ -36,8 +37,7 @@ add_subdirectory(source)
 add_subdirectory(tools)
 add_subdirectory(utils)
 add_subdirectory(examples/c)
+include(${TD_SUPPORT_DIR}/cmake.install)
 
 # docs 
-add_subdirectory(docs/doxgen)
-
-# tests (TODO)
+add_subdirectory(docs/doxgen)
\ No newline at end of file

From 928fd0b13f4c9f10d324fb84164ab3348deed880 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Wed, 12 Oct 2022 10:39:49 +0800
Subject: [PATCH 08/19] fix(query): interp with every(0s) casuing client crash

TD-19484
---
 source/libs/parser/src/parTranslater.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index ab337a985f..1c7ef05087 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -2914,6 +2914,7 @@ static int32_t checkFill(STranslateContext* pCxt, SFillNode* pFill, SValueNode*
   } else {
     intervalRange = pInterval->datum.i;
   }
+
   if ((timeRange == 0) || (timeRange / intervalRange) >= MAX_INTERVAL_TIME_WINDOW) {
     return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_FILL_TIME_RANGE);
   }
@@ -3140,6 +3141,12 @@ static int32_t translateInterpEvery(STranslateContext* pCxt, SNode** pEvery) {
     code = translateExpr(pCxt, pEvery);
   }
 
+  int64_t interval = ((SValueNode*)(*pEvery))->datum.i;
+  if (interval == 0) {
+    return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE,
+                                   "Unsupported time unit in EVERY clause");
+  }
+
   return code;
 }
 

From 0691d7ff9ae7b1cb996581a85664eaed656f22ac Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 12 Oct 2022 10:40:50 +0800
Subject: [PATCH 09/19] enh: code optimization for insert_req statistics

---
 source/dnode/vnode/src/vnd/vnodeSvr.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index 2482ca1a5a..fe0403e763 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -819,11 +819,12 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t version, void *pReq
   int32_t        tsize, ret;
   SEncoder       encoder = {0};
   SArray        *newTbUids = NULL;
+  SVStatis       statis = {0};
   terrno = TSDB_CODE_SUCCESS;
 
   pRsp->code = 0;
   pSubmitReq->version = version;
-  atomic_fetch_add_64(&pVnode->statis.nBatchInsert, 1);
+  statis.nBatchInsert = 1;
 
 #ifdef TD_DEBUG_PRINT_ROW
   vnodeDebugPrintSubmitMsg(pVnode, pReq, __func__);
@@ -943,18 +944,21 @@ _exit:
 
   taosArrayDestroyEx(submitRsp.pArray, tFreeSSubmitBlkRsp);
 
-  atomic_fetch_add_64(&pVnode->statis.nInsert, submitRsp.numOfRows);
-  atomic_fetch_add_64(&pVnode->statis.nInsertSuccess, submitRsp.affectedRows);
-
   // TODO: the partial success scenario and the error case
   // => If partial success, extract the success submitted rows and reconstruct a new submit msg, and push to level
   // 1/level 2.
   // TODO: refactor
   if ((terrno == TSDB_CODE_SUCCESS) && (pRsp->code == TSDB_CODE_SUCCESS)) {
-    atomic_fetch_add_64(&pVnode->statis.nBatchInsertSuccess, 1);
+    statis.nBatchInsertSuccess = 1;
     tdProcessRSmaSubmit(pVnode->pSma, pReq, STREAM_INPUT__DATA_SUBMIT);
   }
 
+  // N.B not strict as the following update steps is not atomic
+  atomic_add_fetch_64(&pVnode->statis.nInsert, submitRsp.numOfRows);
+  atomic_add_fetch_64(&pVnode->statis.nInsertSuccess, submitRsp.affectedRows);
+  atomic_add_fetch_64(&pVnode->statis.nBatchInsertSuccess, statis.nBatchInsertSuccess);
+  atomic_add_fetch_64(&pVnode->statis.nBatchInsert, statis.nBatchInsert);
+
   vDebug("vgId:%d, submit success, index:%" PRId64, pVnode->config.vgId, version);
   return 0;
 }

From 0d50e5933b17dbb0c6977023ca97670ef7ac6ae0 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 12 Oct 2022 10:46:18 +0800
Subject: [PATCH 10/19] enh: code optimization for insert_req statistics

---
 source/dnode/vnode/src/vnd/vnodeSvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index fe0403e763..d4dc7b49b0 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -956,8 +956,8 @@ _exit:
   // N.B not strict as the following update steps is not atomic
   atomic_add_fetch_64(&pVnode->statis.nInsert, submitRsp.numOfRows);
   atomic_add_fetch_64(&pVnode->statis.nInsertSuccess, submitRsp.affectedRows);
-  atomic_add_fetch_64(&pVnode->statis.nBatchInsertSuccess, statis.nBatchInsertSuccess);
   atomic_add_fetch_64(&pVnode->statis.nBatchInsert, statis.nBatchInsert);
+  atomic_add_fetch_64(&pVnode->statis.nBatchInsertSuccess, statis.nBatchInsertSuccess);
 
   vDebug("vgId:%d, submit success, index:%" PRId64, pVnode->config.vgId, version);
   return 0;

From 553394ca7fd507fd3701b51756fee273d5a4a7dd Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 12 Oct 2022 10:47:31 +0800
Subject: [PATCH 11/19] enh: code optimization for insert_req statistics

---
 source/dnode/vnode/src/vnd/vnodeSvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index d4dc7b49b0..bcc3fbd4d5 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -953,7 +953,7 @@ _exit:
     tdProcessRSmaSubmit(pVnode->pSma, pReq, STREAM_INPUT__DATA_SUBMIT);
   }
 
-  // N.B not strict as the following update steps is not atomic
+  // N.B. not strict as the following update steps is not atomic
   atomic_add_fetch_64(&pVnode->statis.nInsert, submitRsp.numOfRows);
   atomic_add_fetch_64(&pVnode->statis.nInsertSuccess, submitRsp.affectedRows);
   atomic_add_fetch_64(&pVnode->statis.nBatchInsert, statis.nBatchInsert);

From 69352e6e8954d1aedcb414627fd43959a1121deb Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 12 Oct 2022 10:28:07 +0800
Subject: [PATCH 12/19] fix tbanme length check

---
 source/dnode/mnode/impl/src/mndConsumer.c | 1 +
 source/dnode/mnode/impl/src/mndOffset.c   | 5 +++++
 source/dnode/mnode/impl/src/mndTopic.c    | 1 +
 source/dnode/vnode/src/tq/tqMeta.c        | 1 +
 source/libs/executor/src/scanoperator.c   | 3 ++-
 source/libs/wal/src/walMeta.c             | 5 +++--
 source/libs/wal/src/walRead.c             | 2 +-
 7 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndConsumer.c b/source/dnode/mnode/impl/src/mndConsumer.c
index c853828bf2..7ffa3cef99 100644
--- a/source/dnode/mnode/impl/src/mndConsumer.c
+++ b/source/dnode/mnode/impl/src/mndConsumer.c
@@ -117,6 +117,7 @@ static int32_t mndProcessConsumerLostMsg(SRpcMsg *pMsg) {
   if (mndTransPrepare(pMnode, pTrans) != 0) goto FAIL;
 
   mndTransDrop(pTrans);
+  tDeleteSMqConsumerObj(pConsumerNew);
   return 0;
 FAIL:
   tDeleteSMqConsumerObj(pConsumerNew);
diff --git a/source/dnode/mnode/impl/src/mndOffset.c b/source/dnode/mnode/impl/src/mndOffset.c
index 2ada3e00bb..8d779f0021 100644
--- a/source/dnode/mnode/impl/src/mndOffset.c
+++ b/source/dnode/mnode/impl/src/mndOffset.c
@@ -182,6 +182,11 @@ static int32_t mndProcessCommitOffsetReq(SRpcMsg *pMsg) {
   tDecodeSMqCMCommitOffsetReq(&decoder, &commitOffsetReq);
 
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_CONFLICT_NOTHING, pMsg, "commit-offset");
+  if (pTrans == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    tDecoderClear(&decoder);
+    return -1;
+  }
 
   for (int32_t i = 0; i < commitOffsetReq.num; i++) {
     SMqOffset *pOffset = &commitOffsetReq.offsets[i];
diff --git a/source/dnode/mnode/impl/src/mndTopic.c b/source/dnode/mnode/impl/src/mndTopic.c
index 5d3a2be79a..ae259b95be 100644
--- a/source/dnode/mnode/impl/src/mndTopic.c
+++ b/source/dnode/mnode/impl/src/mndTopic.c
@@ -222,6 +222,7 @@ SSdbRow *mndTopicActionDecode(SSdbRaw *pRaw) {
     }
     SDB_GET_BINARY(pRaw, dataPos, buf, len, TOPIC_DECODE_OVER);
     if (taosDecodeSSchemaWrapper(buf, &pTopic->schema) == NULL) {
+      taosMemoryFree(buf);
       goto TOPIC_DECODE_OVER;
     }
     taosMemoryFree(buf);
diff --git a/source/dnode/vnode/src/tq/tqMeta.c b/source/dnode/vnode/src/tq/tqMeta.c
index 1a57a391b1..1c5eee7378 100644
--- a/source/dnode/vnode/src/tq/tqMeta.c
+++ b/source/dnode/vnode/src/tq/tqMeta.c
@@ -170,6 +170,7 @@ int32_t tqMetaRestoreCheckInfo(STQ* pTq) {
     tDecoderInit(&decoder, (uint8_t*)pVal, vLen);
     if (tDecodeSTqCheckInfo(&decoder, &info) < 0) {
       terrno = TSDB_CODE_OUT_OF_MEMORY;
+      tdbFree(pKey);
       tdbTbcClose(pCur);
       return -1;
     }
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index df7e5ff06f..0cfdd2b68e 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1341,7 +1341,8 @@ static void calBlockTbName(SExprSupp* pTbNameCalSup, SSDataBlock* pBlock) {
   void* pData = colDataGetData(pCol, 0);
   // TODO check tbname validation
   if (pData != (void*)-1 && pData != NULL) {
-    memcpy(pBlock->info.parTbName, varDataVal(pData), varDataLen(pData));
+    memcpy(pBlock->info.parTbName, varDataVal(pData), TMIN(varDataLen(pData), TSDB_TABLE_NAME_LEN));
+    pBlock->info.parTbName[TSDB_TABLE_NAME_LEN - 1] = 0;
   } else {
     pBlock->info.parTbName[0] = 0;
   }
diff --git a/source/libs/wal/src/walMeta.c b/source/libs/wal/src/walMeta.c
index 62f2d51f1b..e49a963191 100644
--- a/source/libs/wal/src/walMeta.c
+++ b/source/libs/wal/src/walMeta.c
@@ -35,8 +35,8 @@ int64_t FORCE_INLINE walGetCommittedVer(SWal* pWal) { return pWal->vers.commitVe
 
 int64_t FORCE_INLINE walGetAppliedVer(SWal* pWal) { return pWal->vers.appliedVer; }
 
-static FORCE_INLINE int walBuildMetaName(SWal* pWal, int metaVer, char* buf) {
-  return sprintf(buf, "%s/meta-ver%d", pWal->path, metaVer);
+static FORCE_INLINE void walBuildMetaName(SWal* pWal, int metaVer, char* buf) {
+  sprintf(buf, "%s/meta-ver%d", pWal->path, metaVer);
 }
 
 static FORCE_INLINE int64_t walScanLogGetLastVer(SWal* pWal) {
@@ -615,6 +615,7 @@ int walLoadMeta(SWal* pWal) {
   TdFilePtr pFile = taosOpenFile(fnameStr, TD_FILE_READ);
   if (pFile == NULL) {
     terrno = TSDB_CODE_WAL_FILE_CORRUPTED;
+    taosMemoryFree(buf);
     return -1;
   }
   if (taosReadFile(pFile, buf, size) != size) {
diff --git a/source/libs/wal/src/walRead.c b/source/libs/wal/src/walRead.c
index cc6f827b8e..1acaf5e7f3 100644
--- a/source/libs/wal/src/walRead.c
+++ b/source/libs/wal/src/walRead.c
@@ -399,7 +399,7 @@ int32_t walFetchBody(SWalReader *pRead, SWalCkHead **ppHead) {
       terrno = TSDB_CODE_WAL_OUT_OF_MEMORY;
       return -1;
     }
-    *ppHead = ptr;
+    *ppHead = (SWalCkHead *)ptr;
     pReadHead = &((*ppHead)->head);
     pRead->capacity = pReadHead->bodyLen;
   }

From 488b4f31fd04dc6e358c5e7773a6161b2b9b3950 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 12 Oct 2022 10:51:18 +0800
Subject: [PATCH 13/19] enh: code optimization for insert_req statistics

---
 source/dnode/vnode/src/vnd/vnodeSvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index bcc3fbd4d5..131327976f 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -953,7 +953,7 @@ _exit:
     tdProcessRSmaSubmit(pVnode->pSma, pReq, STREAM_INPUT__DATA_SUBMIT);
   }
 
-  // N.B. not strict as the following update steps is not atomic
+  // N.B. not strict as the following procedure is not atomic
   atomic_add_fetch_64(&pVnode->statis.nInsert, submitRsp.numOfRows);
   atomic_add_fetch_64(&pVnode->statis.nInsertSuccess, submitRsp.affectedRows);
   atomic_add_fetch_64(&pVnode->statis.nBatchInsert, statis.nBatchInsert);

From 52bf961622fefe83ccd65c953af489fef36adcdd Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 12 Oct 2022 11:09:42 +0800
Subject: [PATCH 14/19] more code

---
 source/libs/CMakeLists.txt           | 23 ++++++++++++-----------
 source/libs/function/CMakeLists.txt  |  9 ++++++++-
 source/libs/qcom/CMakeLists.txt      |  2 +-
 source/libs/scalar/CMakeLists.txt    | 10 ++++++++--
 source/libs/transport/CMakeLists.txt |  5 -----
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/source/libs/CMakeLists.txt b/source/libs/CMakeLists.txt
index ade2487239..72459f4d35 100644
--- a/source/libs/CMakeLists.txt
+++ b/source/libs/CMakeLists.txt
@@ -1,20 +1,21 @@
-add_subdirectory(transport)
-add_subdirectory(sync)
 add_subdirectory(tdb)
-add_subdirectory(index)
+add_subdirectory(cache)
+add_subdirectory(transport)
 add_subdirectory(wal)
+add_subdirectory(monitor)
+add_subdirectory(tfs)
+add_subdirectory(sync)
+add_subdirectory(qcom)
+add_subdirectory(nodes)
+add_subdirectory(catalog)
+
+add_subdirectory(scalar)
+add_subdirectory(function)
+add_subdirectory(index)
 add_subdirectory(parser)
 add_subdirectory(scheduler)
-add_subdirectory(cache)
-add_subdirectory(catalog)
 add_subdirectory(executor)
 add_subdirectory(stream)
 add_subdirectory(planner)
-add_subdirectory(function)
-add_subdirectory(qcom)
 add_subdirectory(qworker)
-add_subdirectory(tfs)
-add_subdirectory(monitor)
-add_subdirectory(nodes)
-add_subdirectory(scalar)
 add_subdirectory(command)
\ No newline at end of file
diff --git a/source/libs/function/CMakeLists.txt b/source/libs/function/CMakeLists.txt
index dd048a047a..553a2f63b7 100644
--- a/source/libs/function/CMakeLists.txt
+++ b/source/libs/function/CMakeLists.txt
@@ -14,7 +14,14 @@ target_include_directories(
 
 target_link_libraries(
     function
-    PRIVATE os util common nodes scalar qcom transport stream
+    PRIVATE os 
+    PRIVATE util 
+    PRIVATE common 
+    PRIVATE nodes 
+    PRIVATE qcom 
+    # PRIVATE scalar 
+    # PRIVATE transport 
+    # PRIVATE stream
     PUBLIC uv_a
 )
 
diff --git a/source/libs/qcom/CMakeLists.txt b/source/libs/qcom/CMakeLists.txt
index 6e7b5cb610..715c3b8ef2 100644
--- a/source/libs/qcom/CMakeLists.txt
+++ b/source/libs/qcom/CMakeLists.txt
@@ -8,7 +8,7 @@ target_include_directories(
 
 target_link_libraries(
     qcom
-    PRIVATE os util transport nodes
+    PRIVATE os util transport
 )
 
 if(${BUILD_TEST})
diff --git a/source/libs/scalar/CMakeLists.txt b/source/libs/scalar/CMakeLists.txt
index 776abd93e8..c34c5e2877 100644
--- a/source/libs/scalar/CMakeLists.txt
+++ b/source/libs/scalar/CMakeLists.txt
@@ -8,8 +8,14 @@ target_include_directories(
 )
 
 target_link_libraries(scalar
-        PRIVATE os util common nodes function qcom vnode
-        )
+    PRIVATE os 
+    PRIVATE util 
+    PRIVATE common
+    PRIVATE nodes
+    PRIVATE function
+    PRIVATE qcom
+    PRIVATE vnode
+)
 
 if(${BUILD_TEST})
     ADD_SUBDIRECTORY(test)
diff --git a/source/libs/transport/CMakeLists.txt b/source/libs/transport/CMakeLists.txt
index 62eb1a985b..a48926d2d4 100644
--- a/source/libs/transport/CMakeLists.txt
+++ b/source/libs/transport/CMakeLists.txt
@@ -16,11 +16,6 @@ target_link_libraries(
 )
 if (${BUILD_WITH_UV_TRANS}) 
 if (${BUILD_WITH_UV})
-  target_include_directories(
-    transport    
-    PUBLIC "${TD_SOURCE_DIR}/contrib/libuv/include"
-  )
-  
   target_link_libraries(
     transport    
     PUBLIC uv_a

From 746da9fd2788095338eb023a3539ccc38accd49a Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 12 Oct 2022 13:49:40 +0800
Subject: [PATCH 15/19] make it compile

---
 source/libs/function/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/function/CMakeLists.txt b/source/libs/function/CMakeLists.txt
index 553a2f63b7..913dd24a49 100644
--- a/source/libs/function/CMakeLists.txt
+++ b/source/libs/function/CMakeLists.txt
@@ -19,9 +19,9 @@ target_link_libraries(
     PRIVATE common 
     PRIVATE nodes 
     PRIVATE qcom 
-    # PRIVATE scalar 
-    # PRIVATE transport 
-    # PRIVATE stream
+    PRIVATE scalar 
+    PRIVATE transport 
+    PRIVATE stream
     PUBLIC uv_a
 )
 

From db6b0503a1206bd0ac9db2d6339596f84ee31def Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 12 Oct 2022 14:34:04 +0800
Subject: [PATCH 16/19] refactor(stream): change state table name

---
 source/libs/stream/src/streamState.c | 2 +-
 source/libs/wal/src/walRead.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/libs/stream/src/streamState.c b/source/libs/stream/src/streamState.c
index 24c5defee5..85592881cd 100644
--- a/source/libs/stream/src/streamState.c
+++ b/source/libs/stream/src/streamState.c
@@ -73,7 +73,7 @@ SStreamState* streamStateOpen(char* path, SStreamTask* pTask, bool specPath) {
   }
 
   // todo refactor
-  if (tdbTbOpen("func.state.db", sizeof(SWinKey), -1, winKeyCmpr, pState->db, &pState->pFillStateDb) < 0) {
+  if (tdbTbOpen("fill.state.db", sizeof(SWinKey), -1, winKeyCmpr, pState->db, &pState->pFillStateDb) < 0) {
     goto _err;
   }
 
diff --git a/source/libs/wal/src/walRead.c b/source/libs/wal/src/walRead.c
index 1acaf5e7f3..c4f1a81eeb 100644
--- a/source/libs/wal/src/walRead.c
+++ b/source/libs/wal/src/walRead.c
@@ -279,7 +279,7 @@ static int32_t walFetchBodyNew(SWalReader *pRead) {
       terrno = TSDB_CODE_WAL_OUT_OF_MEMORY;
       return -1;
     }
-    pRead->pHead = ptr;
+    pRead->pHead = (SWalCkHead *)ptr;
     pReadHead = &pRead->pHead->head;
     pRead->capacity = pReadHead->bodyLen;
   }

From 3416ee66d88a9b0126ae341d329164eab076db0b Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 12 Oct 2022 15:35:15 +0800
Subject: [PATCH 17/19] fix(sync): enqueue timer msg

---
 source/dnode/vnode/src/vnd/vnodeSync.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/dnode/vnode/src/vnd/vnodeSync.c b/source/dnode/vnode/src/vnd/vnodeSync.c
index f773de5280..353c3874c0 100644
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@@ -474,6 +474,10 @@ int32_t vnodeProcessSyncMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
 }
 
 static int32_t vnodeSyncEqMsg(const SMsgCb *msgcb, SRpcMsg *pMsg) {
+  if (msgcb == NULL) {
+    return -1;
+  }
+
   int32_t code = tmsgPutToQueue(msgcb, SYNC_QUEUE, pMsg);
   if (code != 0) {
     rpcFreeCont(pMsg->pCont);

From 61160d3f4a3ff7787d5aee41e142ef67b6ae18ba Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 13 Oct 2022 10:49:56 +0800
Subject: [PATCH 18/19] fix: crash while create mnode

---
 source/dnode/mnode/impl/src/mndMnode.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c
index 826e1d2fd0..09eef7b4d6 100644
--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
@@ -239,7 +239,9 @@ void mndGetMnodeEpSet(SMnode *pMnode, SEpSet *pEpSet) {
         pEpSet->inUse = (pEpSet->numOfEps + 1) % totalMnodes;
       }
     }
-    addEpIntoEpSet(pEpSet, pObj->pDnode->fqdn, pObj->pDnode->port);
+    if (pObj->pDnode != NULL) {
+      addEpIntoEpSet(pEpSet, pObj->pDnode->fqdn, pObj->pDnode->port);
+    }
     sdbRelease(pSdb, pObj);
   }
 

From a166882c3e6b9ce4a1717bcce068121cc2a60ebc Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 13 Oct 2022 11:00:59 +0800
Subject: [PATCH 19/19] docs: clarify generated value range of min/max.
 (#17324)

---
 docs/en/14-reference/05-taosbenchmark.md | 6 +++---
 docs/zh/14-reference/05-taosbenchmark.md | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/14-reference/05-taosbenchmark.md b/docs/en/14-reference/05-taosbenchmark.md
index bde5e33034..d95086d4c4 100644
--- a/docs/en/14-reference/05-taosbenchmark.md
+++ b/docs/en/14-reference/05-taosbenchmark.md
@@ -5,7 +5,7 @@ toc_max_heading_level: 4
 description: "taosBenchmark (once called taosdemo ) is a tool for testing the performance of TDengine."
 ---
 
-## Introduction
+# Introduction
 
 taosBenchmark (formerly taosdemo ) is a tool for testing the performance of TDengine products. taosBenchmark can test the performance of TDengine's insert, query, and subscription functions and simulate large amounts of data generated by many devices. taosBenchmark can be configured to generate user defined databases, supertables, subtables, and the time series data to populate these for performance benchmarking. taosBenchmark is highly configurable and some of the configurations include the time interval for inserting data, the number of working threads and the capability to insert disordered data. The installer provides taosdemo as a soft link to taosBenchmark for compatibility with past users.
 
@@ -334,9 +334,9 @@ The configuration parameters for specifying super table tag columns and data col
 
 - **name** : The name of the column, if used together with count, e.g. "name": "current", "count":3, then the names of the 3 columns are current, current_2. current_3.
 
-- **min**: The minimum value of the column/label of the data type.
+- **min**: The minimum value of the column/label of the data type. The generated value will equal or large than the minimum value.
 
-- **max**: The maximum value of the column/label of the data type.
+- **max**: The maximum value of the column/label of the data type. The generated value will less than the maxium value.
 
 - **values**: The value field of the nchar/binary column/label, which will be chosen randomly from the values.
 
diff --git a/docs/zh/14-reference/05-taosbenchmark.md b/docs/zh/14-reference/05-taosbenchmark.md
index 6a6d9e3878..9f4f728f78 100644
--- a/docs/zh/14-reference/05-taosbenchmark.md
+++ b/docs/zh/14-reference/05-taosbenchmark.md
@@ -334,9 +334,9 @@ taosBenchmark -A INT,DOUBLE,NCHAR,BINARY\(16\)
 
 - **name** : 列的名字，若与 count 同时使用，比如 "name"："current", "count":3, 则 3 个列的名字分别为 current, current_2. current_3。
 
-- **min** : 数据类型的 列/标签 的最小值。
+- **min** : 数据类型的 列/标签 的最小值。生成的值将大于或等于最小值。
 
-- **max** : 数据类型的 列/标签 的最大值。
+- **max** : 数据类型的 列/标签 的最大值。生成的值将小于最小值。
 
 - **values** : nchar/binary 列/标签的值域，将从值中随机选择。