From 71940f706c731b883dc5e4ee2176efd9cc08e2bb Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 29 Jun 2020 04:09:21 +0000
Subject: [PATCH 01/48] fix fd leakage

---
 src/tsdb/src/tsdbMemTable.c |  2 ++
 src/tsdb/src/tsdbMeta.c     | 14 ++++++--------
 src/util/src/tkvstore.c     |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
index a8ec3b74b4..12db79182e 100644
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -443,12 +443,14 @@ static int tsdbCommitMeta(STsdbRepo *pRepo) {
         if (tdUpdateKVStoreRecord(pMeta->pStore, pAct->uid, (void *)(pCont->cont), pCont->len) < 0) {
           tsdbError("vgId:%d failed to update meta with uid %" PRIu64 " since %s", REPO_ID(pRepo), pAct->uid,
                     tstrerror(terrno));
+          tdKVStoreEndCommit(pMeta->pStore);
           goto _err;
         }
       } else if (pAct->act == TSDB_DROP_META) {
         if (tdDropKVStoreRecord(pMeta->pStore, pAct->uid) < 0) {
           tsdbError("vgId:%d failed to drop meta with uid %" PRIu64 " since %s", REPO_ID(pRepo), pAct->uid,
                     tstrerror(terrno));
+          tdKVStoreEndCommit(pMeta->pStore);
           goto _err;
         }
       } else {
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index a31cb7efef..b769a87beb 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -480,13 +480,11 @@ int tsdbUpdateTable(STsdbRepo *pRepo, STable *pTable, STableCfg *pCfg) {
   bool       changed = false;
   STsdbMeta *pMeta = pRepo->tsdbMeta;
 
-  if (pTable->type == TSDB_SUPER_TABLE) {
-    if (schemaVersion(pTable->tagSchema) < schemaVersion(pCfg->tagSchema)) {
-      if (tsdbUpdateTableTagSchema(pTable, pCfg->tagSchema) < 0) {
-        tsdbError("vgId:%d failed to update table %s tag schema since %s", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
-                  tstrerror(terrno));
-        return -1;
-      }
+  if ((pTable->type == TSDB_SUPER_TABLE) && (schemaVersion(pTable->tagSchema) < schemaVersion(pCfg->tagSchema))) {
+    if (tsdbUpdateTableTagSchema(pTable, pCfg->tagSchema) < 0) {
+      tsdbError("vgId:%d failed to update table %s tag schema since %s", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+                tstrerror(terrno));
+      return -1;
     }
     changed = true;
   }
@@ -1215,7 +1213,7 @@ static int tsdbRemoveTableFromStore(STsdbRepo *pRepo, STable *pTable) {
     while (tSkipListIterNext(pIter)) {
       STable *tTable = *(STable **)SL_GET_NODE_DATA(tSkipListIterGet(pIter));
       ASSERT(TABLE_TYPE(tTable) == TSDB_CHILD_TABLE);
-      pBuf = tsdbInsertTableAct(pRepo, TSDB_DROP_META, pBuf, pTable);
+      pBuf = tsdbInsertTableAct(pRepo, TSDB_DROP_META, pBuf, tTable);
     }
 
     tSkipListDestroyIter(pIter);
diff --git a/src/util/src/tkvstore.c b/src/util/src/tkvstore.c
index 42deb9494d..f33941376f 100644
--- a/src/util/src/tkvstore.c
+++ b/src/util/src/tkvstore.c
@@ -259,6 +259,7 @@ int tdUpdateKVStoreRecord(SKVStore *pStore, uint64_t uid, void *cont, int contLe
   }
 
   taosHashPut(pStore->map, (void *)(&uid), sizeof(uid), (void *)(&rInfo), sizeof(rInfo));
+  uDebug("put uid %" PRIu64 " into kvStore %s", uid, pStore->fname);
 
   return 0;
 }
@@ -292,6 +293,7 @@ int tdDropKVStoreRecord(SKVStore *pStore, uint64_t uid) {
   pStore->info.tombSize += (rInfo.size + sizeof(SKVRecord) * 2);
 
   taosHashRemove(pStore->map, (void *)(&uid), sizeof(uid));
+  uDebug("drop uid %" PRIu64 " from KV store %s", uid, pStore->fname);
 
   return 0;
 }

From dde667116c4e515371f97046982b1889a0eeb65d Mon Sep 17 00:00:00 2001
From: Ping Xiao <xiaopingcs@outlook.com>
Date: Mon, 29 Jun 2020 13:18:22 +0800
Subject: [PATCH 02/48] TD-775: Remove numpy dependency from sql.py

---
 ...o-Run-Test-And-How-To-Add-New-Test-Case.md |  2 +-
 tests/pytest/query/queryJoin.py               |  6 +--
 tests/pytest/query/querySort.py               | 51 +++++++++++++++++--
 tests/pytest/util/sql.py                      | 43 +---------------
 4 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md b/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md
index b6859827bf..b476c118a7 100644
--- a/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md
+++ b/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md
@@ -11,7 +11,7 @@
 4.  pip install ../src/connector/python/linux/python2 ; pip3 install
     ../src/connector/python/linux/python3
 
-5.  pip install numpy; pip3 install numpy    
+5.  pip install numpy; pip3 install numpy (numpy is required only if you need to run querySort.py)  
 
 >   Note: Both Python2 and Python3 are currently supported by the Python test
 >   framework. Since Python2 is no longer officially supported by Python Software
diff --git a/tests/pytest/query/queryJoin.py b/tests/pytest/query/queryJoin.py
index b1a0aaed6b..bfc493580e 100644
--- a/tests/pytest/query/queryJoin.py
+++ b/tests/pytest/query/queryJoin.py
@@ -77,11 +77,7 @@ class TDTestCase:
         # join queries
         tdSql.query(
             "select * from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
-        tdSql.checkRows(6)
-
-        tdSql.query(
-            "select * from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id order by ts desc")
-        tdSql.checkColumnSorted(0, "desc")
+        tdSql.checkRows(6)        
 
         tdSql.error(
             "select ts, pressure, temperature, id, dscrption from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
diff --git a/tests/pytest/query/querySort.py b/tests/pytest/query/querySort.py
index 3858701379..e5d3c8ce1f 100644
--- a/tests/pytest/query/querySort.py
+++ b/tests/pytest/query/querySort.py
@@ -16,6 +16,7 @@ import taos
 from util.log import *
 from util.cases import *
 from util.sql import *
+import numpy as np
 
 
 class TDTestCase:
@@ -26,6 +27,46 @@ class TDTestCase:
         self.rowNum = 10
         self.ts = 1537146000000
 
+    def checkColumnSorted(self, col, order):
+        frame = inspect.stack()[1]
+        callerModule = inspect.getmodule(frame[0])
+        callerFilename = callerModule.__file__
+
+        if col < 0:
+            tdLog.exit(
+                "%s failed: sql:%s, col:%d is smaller than zero" %
+                (callerFilename, tdSql.sql, col))
+        if col > tdSql.queryCols:
+            tdLog.exit(
+                "%s failed: sql:%s, col:%d is larger than queryCols:%d" %
+                (callerFilename, tdSql.sql, col, tdSql.queryCols))
+
+        matrix = np.array(tdSql.queryResult)
+        list = matrix[:, 0]
+
+        if order == "" or order.upper() == "ASC":
+            if all(sorted(list) == list):
+                tdLog.info(
+                    "sql:%s, column :%d is sorted in accending order as expected" %
+                    (tdSql.sql, col))
+            else:
+                tdLog.exit(
+                    "%s failed: sql:%s, col:%d is not sorted in accesnind order" %
+                    (callerFilename, tdSql.sql, col))
+        elif order.upper() == "DESC":
+            if all(sorted(list, reverse=True) == list):
+                tdLog.info(
+                    "sql:%s, column :%d is sorted in decending order as expected" %
+                    (tdSql.sql, col))
+            else:
+                tdLog.exit(
+                    "%s failed: sql:%s, col:%d is not sorted in decending order" %
+                    (callerFilename, tdSql.sql, col))
+        else:
+            tdLog.exit(
+                "%s failed: sql:%s, the order provided for col:%d is not correct" %
+                (callerFilename, tdSql.sql, col))
+
     def run(self):
         tdSql.prepare()
 
@@ -49,11 +90,11 @@ class TDTestCase:
         print("======= step 2: verify order for each column =========")
         # sort for timestamp in asc order
         tdSql.query("select * from st order by ts asc")
-        tdSql.checkColumnSorted(0, "asc")
+        self.checkColumnSorted(0, "asc")
 
         # sort for timestamp in desc order
         tdSql.query("select * from st order by ts desc")
-        tdSql.checkColumnSorted(0, "desc")
+        self.checkColumnSorted(0, "desc")
 
         for i in range(1, 10):
             tdSql.error("select * from st order by tbcol%d" % i)
@@ -63,17 +104,17 @@ class TDTestCase:
             tdSql.query(
                 "select avg(tbcol1) from st group by tagcol%d order by tagcol%d" %
                 (i, i))
-            tdSql.checkColumnSorted(1, "")
+            self.checkColumnSorted(1, "")
 
             tdSql.query(
                 "select avg(tbcol1) from st group by tagcol%d order by tagcol%d asc" %
                 (i, i))
-            tdSql.checkColumnSorted(1, "asc")
+            self.checkColumnSorted(1, "asc")
 
             tdSql.query(
                 "select avg(tbcol1) from st group by tagcol%d order by tagcol%d desc" %
                 (i, i))
-            tdSql.checkColumnSorted(1, "desc")
+            self.checkColumnSorted(1, "desc")
 
     def stop(self):
         tdSql.close()
diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py
index e282298b7c..dc0366b214 100644
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
@@ -17,7 +17,6 @@ import time
 import datetime
 import inspect
 from util.log import *
-import numpy as np
 
 
 class TDSql:
@@ -199,47 +198,7 @@ class TDSql:
                 "%s failed: sql:%s, affectedRows:%d != expect:%d" %
                 (callerFilename, self.sql, self.affectedRows, expectAffectedRows))
         tdLog.info("sql:%s, affectedRows:%d == expect:%d" %
-                   (self.sql, self.affectedRows, expectAffectedRows))
-
-    def checkColumnSorted(self, col, order):
-        frame = inspect.stack()[1]
-        callerModule = inspect.getmodule(frame[0])
-        callerFilename = callerModule.__file__
-
-        if col < 0:
-            tdLog.exit(
-                "%s failed: sql:%s, col:%d is smaller than zero" %
-                (callerFilename, self.sql, col))
-        if col > self.queryCols:
-            tdLog.exit(
-                "%s failed: sql:%s, col:%d is larger than queryCols:%d" %
-                (callerFilename, self.sql, col, self.queryCols))
-
-        matrix = np.array(self.queryResult)
-        list = matrix[:, 0]
-
-        if order == "" or order.upper() == "ASC":
-            if all(sorted(list) == list):
-                tdLog.info(
-                    "sql:%s, column :%d is sorted in accending order as expected" %
-                    (self.sql, col))
-            else:
-                tdLog.exit(
-                    "%s failed: sql:%s, col:%d is not sorted in accesnind order" %
-                    (callerFilename, self.sql, col))
-        elif order.upper() == "DESC":
-            if all(sorted(list, reverse=True) == list):
-                tdLog.info(
-                    "sql:%s, column :%d is sorted in decending order as expected" %
-                    (self.sql, col))
-            else:
-                tdLog.exit(
-                    "%s failed: sql:%s, col:%d is not sorted in decending order" %
-                    (callerFilename, self.sql, col))
-        else:
-            tdLog.exit(
-                "%s failed: sql:%s, the order provided for col:%d is not correct" %
-                (callerFilename, self.sql, col))
+                   (self.sql, self.affectedRows, expectAffectedRows))    
 
 
 tdSql = TDSql()

From 0102f0a165cda548770e9231f225d2eab4c365a4 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 29 Jun 2020 06:02:00 +0000
Subject: [PATCH 03/48] scripts

---
 tests/script/basicSuite.sim                   |  7 +++----
 tests/script/jenkins/simple.txt               | 21 -------------------
 tests/script/jenkins/unique.txt               |  7 ++++---
 tests/script/unique/vnode/replica2_repeat.sim |  2 +-
 tests/script/unique/vnode/replica3_repeat.sim |  2 +-
 5 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index de6ed85b09..3701a33d27 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -2,17 +2,16 @@ run general/cache/new_metrics.sim
 run general/column/commit.sim
 run general/compress/compress.sim
 run general/compute/interval.sim
-run general/db/basic4.sim
-run general/field/binary.sim
 run general/http/restful_insert.sim
 run general/import/commit.sim
 run general/import/replica1.sim
 run general/parser/auto_create_tb_drop_tb.sim
 run general/parser/binary_escapeCharacter.sim
 run general/parser/select_from_cache_disk.sim
+run general/parser/join.sim
+run general/parser/where.sim
+run general/parser/projection_limit_offset.sim
 run general/stable/vnode3.sim
-run general/table/autocreate.sim
-run general/table/fill.sim
 run general/table/vgroup.sim
 run general/tag/filter.sim
 run general/user/authority.sim
diff --git a/tests/script/jenkins/simple.txt b/tests/script/jenkins/simple.txt
index b3716585a9..135326af9e 100644
--- a/tests/script/jenkins/simple.txt
+++ b/tests/script/jenkins/simple.txt
@@ -232,24 +232,3 @@ cd ../../../debug; make
 ./test.sh -f general/vector/table_mix.sim
 ./test.sh -f general/vector/table_query.sim
 ./test.sh -f general/vector/table_time.sim
-
-./test.sh -f unique/account/account_create.sim
-./test.sh -f unique/account/account_delete.sim
-./test.sh -f unique/account/account_len.sim
-./test.sh -f unique/account/authority.sim
-./test.sh -f unique/account/basic.sim
-./test.sh -f unique/account/paras.sim
-./test.sh -f unique/account/pass_alter.sim
-./test.sh -f unique/account/pass_len.sim
-./test.sh -f unique/account/usage.sim
-./test.sh -f unique/account/user_create.sim
-./test.sh -f unique/account/user_len.sim
-
-./test.sh -f unique/cluster/balance1.sim
-./test.sh -f unique/cluster/balance2.sim
-./test.sh -f unique/dnode/balance1.sim
-./test.sh -f unique/dnode/balance2.sim
-./test.sh -f unique/stable/dnode3.sim
-./test.sh -f unique/mnode/mgmt22.sim
-./test.sh -f unique/mnode/mgmt33.sim
-./test.sh -f unique/vnode/many.sim
\ No newline at end of file
diff --git a/tests/script/jenkins/unique.txt b/tests/script/jenkins/unique.txt
index da0aee3d34..afd0ea55c0 100644
--- a/tests/script/jenkins/unique.txt
+++ b/tests/script/jenkins/unique.txt
@@ -102,9 +102,10 @@ cd ../../../debug; make
 ./test.sh -f unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
 ./test.sh -f unique/arbitrator/dn3_mn1_replica_change.sim
 ./test.sh -f unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
-./test.sh -f unique/arbitrator/dn3_mn1_vnode_change.sim
-./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
-./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_change.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
 ./test.sh -f unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
 ./test.sh -f unique/arbitrator/dn3_mn1_vnode_delDir.sim
 ./test.sh -f unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim
index 44a86763ed..e862d745d4 100644
--- a/tests/script/unique/vnode/replica2_repeat.sim
+++ b/tests/script/unique/vnode/replica2_repeat.sim
@@ -64,7 +64,7 @@ print ======== step7
 $lastRows = $data00
 print ======== loop Times $x
 
-if $x < 2 then
+if $x < 5 then
   $x = $x + 1
   goto loop
 endi
diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim
index 9c3d5bbf09..4b5c852de8 100644
--- a/tests/script/unique/vnode/replica3_repeat.sim
+++ b/tests/script/unique/vnode/replica3_repeat.sim
@@ -75,7 +75,7 @@ print ======== step8
 $lastRows = $data00
 print ======== loop Times $x
 
-if $x < 2 then
+if $x < 5 then
   $x = $x + 1
   goto loop
 endi

From 19299f27c57dfbc6a42d8f946c52eca66648a4b2 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 29 Jun 2020 06:08:24 +0000
Subject: [PATCH 04/48] adjust script for CI

---
 tests/script/basicSuite.sim | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index 3701a33d27..0d82f96586 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -1,20 +1,18 @@
 run general/cache/new_metrics.sim
-run general/column/commit.sim
-run general/compress/compress.sim
 run general/compute/interval.sim
-run general/http/restful_insert.sim
+run general/http/restful_full.sim 
 run general/import/commit.sim
 run general/import/replica1.sim
 run general/parser/auto_create_tb_drop_tb.sim
 run general/parser/binary_escapeCharacter.sim
 run general/parser/select_from_cache_disk.sim
+run general/parser/projection_limit_offset.sim
 run general/parser/join.sim
 run general/parser/where.sim
 run general/parser/projection_limit_offset.sim
 run general/stable/vnode3.sim
-run general/table/vgroup.sim
 run general/tag/filter.sim
+run general/table/vgroup.sim
 run general/user/authority.sim
-run general/user/pass_alter.sim
 run general/vector/metrics_mix.sim
 run general/vector/table_field.sim

From bee633127c7acdb4cd68092ef10fcde6b2a60fe2 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 29 Jun 2020 14:35:43 +0800
Subject: [PATCH 05/48] remove some pytest cases from smoke test.

[TD-786]
---
 tests/pytest/smoketest.sh | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh
index c56a4726dd..6b21912dd5 100755
--- a/tests/pytest/smoketest.sh
+++ b/tests/pytest/smoketest.sh
@@ -8,24 +8,8 @@ python3 ./test.py $1 -s && sleep 1
 # insert
 python3 ./test.py $1 -f insert/basic.py
 python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/int.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/float.py
-python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/bigint.py
 python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/bool.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/double.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/smallint.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/tinyint.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/binary.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/date.py
-python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/nchar.py
 python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/multi.py
@@ -42,18 +26,6 @@ python3 ./test.py $1 -s && sleep 1
 # import
 python3 ./test.py $1 -f import_merge/importDataLastSub.py
 python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importHead.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importLastT.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importSpan.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importTail.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importTRestart.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importInsertThenImport.py
-python3 ./test.py $1 -s && sleep 1
 
 #tag 
 python3 ./test.py $1 -f tag_lite/filter.py

From dc5ce545f28384c2cb793822fae33104f2564eee Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 29 Jun 2020 15:40:40 +0800
Subject: [PATCH 06/48] move more cases to regression.

---
 tests/pytest/regressiontest.sh   |  5 +++--
 tests/script/regressionSuite.sim | 18 +++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/pytest/regressiontest.sh b/tests/pytest/regressiontest.sh
index 14b18e1acc..8ce1fd1294 100755
--- a/tests/pytest/regressiontest.sh
+++ b/tests/pytest/regressiontest.sh
@@ -43,7 +43,7 @@ python3 ./test.py -f tag_lite/commit.py
 python3 ./test.py -f tag_lite/create.py
 python3 ./test.py -f tag_lite/datatype.py
 python3 ./test.py -f tag_lite/datatype-without-alter.py
-# python3 ./test.py -f tag_lite/delete.py
+python3 ./test.py -f tag_lite/delete.py
 python3 ./test.py -f tag_lite/double.py
 python3 ./test.py -f tag_lite/float.py
 python3 ./test.py -f tag_lite/int_binary.py
@@ -134,9 +134,10 @@ python3 ./test.py -f table/del_stable.py
 python3 ./test.py -f query/filter.py
 python3 ./test.py -f query/filterAllIntTypes.py
 python3 ./test.py -f query/filterFloatAndDouble.py
+python3 ./test.py -f query/filterOtherTypes.py
+python3 ./test.py -f query/queryError.py
 python3 ./test.py -f query/querySort.py
 
-
 #stream
 python3 ./test.py -f stream/stream1.py
 python3 ./test.py -f stream/stream2.py
diff --git a/tests/script/regressionSuite.sim b/tests/script/regressionSuite.sim
index 0fbec7ebd8..c671cf47c6 100644
--- a/tests/script/regressionSuite.sim
+++ b/tests/script/regressionSuite.sim
@@ -1,10 +1,10 @@
 ##unsupport run general/alter/cached_schema_after_alter.sim
-unsupport run general/alter/count.sim
-unsupport run general/alter/import.sim
+run general/alter/count.sim
+run general/alter/import.sim
 ##unsupport run general/alter/insert1.sim
-unsupport run general/alter/insert2.sim
-unsupport run general/alter/metrics.sim
-unsupport run general/alter/table.sim
+run general/alter/insert2.sim
+run general/alter/metrics.sim
+run general/alter/table.sim
 run general/cache/new_metrics.sim
 run general/cache/restart_metrics.sim
 run general/cache/restart_table.sim
@@ -86,14 +86,14 @@ run general/insert/query_block2_file.sim
 run general/insert/query_file_memory.sim
 run general/insert/query_multi_file.sim
 run general/insert/tcp.sim
-##unsupport run general/parser/alter.sim
+run general/parser/alter.sim
 run general/parser/alter1.sim
 run general/parser/alter_stable.sim
 run general/parser/auto_create_tb.sim
 run general/parser/auto_create_tb_drop_tb.sim
 run general/parser/col_arithmetic_operation.sim
 run general/parser/columnValue.sim
-#run general/parser/commit.sim
+run general/parser/commit.sim
 run general/parser/create_db.sim
 run general/parser/create_mt.sim
 run general/parser/create_tb.sim
@@ -106,7 +106,7 @@ run general/parser/first_last.sim
 ##unsupport run general/parser/import_file.sim
 run general/parser/lastrow.sim
 run general/parser/nchar.sim
-##unsupport run general/parser/null_char.sim
+run general/parser/null_char.sim
 run general/parser/single_row_in_tb.sim
 run general/parser/select_from_cache_disk.sim
 run general/parser/limit.sim
@@ -132,7 +132,7 @@ run general/parser/groupby.sim
 run general/parser/bug.sim
 run general/parser/tags_dynamically_specifiy.sim
 run general/parser/set_tag_vals.sim
-##unsupport run general/parser/repeatAlter.sim
+run general/parser/repeatAlter.sim
 ##unsupport run general/parser/slimit_alter_tags.sim
 ##unsupport run general/parser/stream_on_sys.sim
 run general/parser/stream.sim

From b0713a1d7bbf0dfc3c879cc16005e6287c761372 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 29 Jun 2020 15:46:39 +0800
Subject: [PATCH 07/48] scripts

---
 tests/script/basicSuite.sim | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index 0d82f96586..f6b45949fb 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -6,10 +6,8 @@ run general/import/replica1.sim
 run general/parser/auto_create_tb_drop_tb.sim
 run general/parser/binary_escapeCharacter.sim
 run general/parser/select_from_cache_disk.sim
-run general/parser/projection_limit_offset.sim
-run general/parser/join.sim
-run general/parser/where.sim
-run general/parser/projection_limit_offset.sim
+run general/parser/null_char.sim
+run general/parser/alter.sim
 run general/stable/vnode3.sim
 run general/tag/filter.sim
 run general/table/vgroup.sim

From d026efa9ca8a9b50d0037e17b1c38a5a3b79b242 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 29 Jun 2020 17:03:32 +0800
Subject: [PATCH 08/48] fix tag_filter invalid read

---
 src/common/src/tdataformat.c | 2 +-
 src/query/src/qExecutor.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 5610f0f75e..d7b2af8706 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -259,7 +259,7 @@ bool isNEleNull(SDataCol *pCol, int nEle) {
     case TSDB_DATA_TYPE_BINARY:
     case TSDB_DATA_TYPE_NCHAR:
       for (int i = 0; i < nEle; i++) {
-        if (!isNull(varDataVal(tdGetColDataOfRow(pCol, i)), pCol->type)) return false;
+        if (!isNull(tdGetColDataOfRow(pCol, i), pCol->type)) return false;
       }
       return true;
     default:
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 8f565cd9c6..aeacdd2351 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -2219,7 +2219,7 @@ static void doSetTagValueInParam(void *tsdb, void* pTable, int32_t tagColId, tVa
     }
     
     if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-      if (isNull(varDataVal(val), type)) {
+      if (isNull(val, type)) {
         tag->nType = TSDB_DATA_TYPE_NULL;
         return;
       }

From d7397bce19008f83d5a29a219aafc3f6a759ed26 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 29 Jun 2020 17:11:26 +0800
Subject: [PATCH 09/48] change VM timezone to GMT+8 to satisfy some test cases.

[TD-788]
---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index bb9ee5d430..48845c1f86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,8 @@ matrix:
           - psmisc
 
     before_script:
+      - echo 'Asia/Harbin' | sudo tee /etc/timezone
+      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -150,6 +152,8 @@ matrix:
       - DESC="trusty/gcc-4.8 build"
 
     before_script:
+      - echo 'Asia/Harbin' | sudo tee /etc/timezone
+      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -173,6 +177,8 @@ matrix:
           - cmake
 
     before_script:
+      - echo 'Asia/Harbin' | sudo tee /etc/timezone
+      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -197,6 +203,8 @@ matrix:
           - cmake
 
     before_script:
+      - echo 'Asia/Harbin' | sudo tee /etc/timezone
+      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -225,6 +233,8 @@ matrix:
       - DESC="trusty/gcc-4.8 build"
 
     before_script:
+      - echo 'Asia/Harbin' | sudo tee /etc/timezone
+      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug

From 97340bbdf5a500637fa7712d6e4596903f08f48b Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 29 Jun 2020 09:19:32 +0000
Subject: [PATCH 10/48] definite lost while open vnodes

---
 src/dnode/src/dnodeMgmt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c
index 3706f3b6b3..9cf024ba83 100644
--- a/src/dnode/src/dnodeMgmt.c
+++ b/src/dnode/src/dnodeMgmt.c
@@ -328,6 +328,7 @@ static int32_t dnodeOpenVnodes() {
   }
 
   free(vnodeList);
+  free(threads);
   dInfo("there are total vnodes:%d, openned:%d failed:%d", numOfVnodes, openVnodes, failedVnodes);
 
   return TSDB_CODE_SUCCESS;

From 9fce5542e73a30a150bc9e9717a427cd15425372 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 29 Jun 2020 17:39:41 +0800
Subject: [PATCH 11/48] fix commit bug

---
 src/tsdb/src/tsdbFile.c     | 2 +-
 src/tsdb/src/tsdbRWHelper.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c
index ed5f62d3da..33eae639b8 100644
--- a/src/tsdb/src/tsdbFile.c
+++ b/src/tsdb/src/tsdbFile.c
@@ -29,7 +29,7 @@
 #include "tutil.h"
 #include "ttime.h"
 
-const char *tsdbFileSuffix[] = {".head", ".data", ".last", "", ".h", ".h"};
+const char *tsdbFileSuffix[] = {".head", ".data", ".last", "", ".h", ".l"};
 
 static int   tsdbInitFile(SFile *pFile, STsdbRepo *pRepo, int fid, int type);
 static void  tsdbDestroyFile(SFile *pFile);
diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c
index 41725433eb..934fa8e733 100644
--- a/src/tsdb/src/tsdbRWHelper.c
+++ b/src/tsdb/src/tsdbRWHelper.c
@@ -128,11 +128,12 @@ int tsdbSetAndOpenHelperFile(SRWHelper *pHelper, SFileGroup *pGroup) {
     // Create and open .l file if should
     if (tsdbShouldCreateNewLast(pHelper)) {
       if (tsdbOpenFile(&(pHelper->files.nLastF), O_WRONLY | O_CREAT) < 0) goto _err;
-      if (tsendfile(pHelper->files.nLastF.fd, pHelper->files.lastF.fd, NULL, TSDB_FILE_HEAD_SIZE) < TSDB_FILE_HEAD_SIZE)
+      if (tsendfile(pHelper->files.nLastF.fd, pHelper->files.lastF.fd, NULL, TSDB_FILE_HEAD_SIZE) < TSDB_FILE_HEAD_SIZE) {
         tsdbError("vgId:%d failed to sendfile %d bytes from file %s to %s since %s", REPO_ID(pHelper->pRepo),
                   TSDB_FILE_HEAD_SIZE, pHelper->files.lastF.fname, pHelper->files.nLastF.fname, strerror(errno));
-      terrno = TAOS_SYSTEM_ERROR(errno);
-      goto _err;
+        terrno = TAOS_SYSTEM_ERROR(errno);
+        goto _err;
+      }
     }
   } else {
     if (tsdbOpenFile(&(pHelper->files.dataF), O_RDONLY) < 0) goto _err;
@@ -144,7 +145,7 @@ int tsdbSetAndOpenHelperFile(SRWHelper *pHelper, SFileGroup *pGroup) {
   return tsdbLoadCompIdx(pHelper, NULL);
 
 _err:
-  return terrno;
+  return -1;
 }
 
 int tsdbCloseHelperFile(SRWHelper *pHelper, bool hasError) {

From 12eb25514847b2c5954152a73226e6261e878c9d Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 29 Jun 2020 17:54:32 +0800
Subject: [PATCH 12/48] fix return code

---
 src/vnode/src/vnodeMain.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index 4693dc02d3..cbd7953072 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -123,9 +123,8 @@ int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg) {
 
   char tsdbDir[TSDB_FILENAME_LEN] = {0};
   sprintf(tsdbDir, "%s/vnode%d/tsdb", tsVnodeDir, pVnodeCfg->cfg.vgId);
-  code = tsdbCreateRepo(tsdbDir, &tsdbCfg);
-  if (code != TSDB_CODE_SUCCESS) {
-    vError("vgId:%d, failed to create tsdb in vnode, reason:%s", pVnodeCfg->cfg.vgId, tstrerror(code));
+  if (tsdbCreateRepo(tsdbDir, &tsdbCfg) < 0) {
+    vError("vgId:%d, failed to create tsdb in vnode, reason:%s", pVnodeCfg->cfg.vgId, tstrerror(terrno));
     return TSDB_CODE_VND_INIT_FAILED;
   }
 

From 92a18381726d9a0f5d7344cbb63480ac6068b3a8 Mon Sep 17 00:00:00 2001
From: dengyihao <luomoxyz@126.com>
Date: Mon, 29 Jun 2020 18:16:36 +0800
Subject: [PATCH 13/48] change ref-count type

---
 src/query/src/qExecutor.c | 2 +-
 src/tsdb/src/tsdbMeta.c   | 6 +++---
 src/util/inc/tref.h       | 8 ++++----
 src/util/src/tcache.c     | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 94fefa16f3..ff9cff54bf 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -6009,7 +6009,7 @@ void qDestroyQueryInfo(qinfo_t qHandle, void (*fp)(void*), void* param) {
     return;
   }
 
-  int16_t ref = T_REF_DEC(pQInfo);
+  int32_t ref = T_REF_DEC(pQInfo);
   qDebug("QInfo:%p dec refCount, value:%d", pQInfo, ref);
 
   if (ref == 0) {
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 3b25d68896..13b676ee1d 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -550,13 +550,13 @@ int tsdbUnlockRepoMeta(STsdbRepo *pRepo) {
 }
 
 void tsdbRefTable(STable *pTable) {
-  int16_t ref = T_REF_INC(pTable);
+  int32_t ref = T_REF_INC(pTable);
   UNUSED(ref);
   // tsdbDebug("ref table %"PRIu64", tid:%d, refCount:%d", TABLE_UID(pTable), TABLE_TID(pTable), ref);
 }
 
 void tsdbUnRefTable(STable *pTable) {
-  int16_t ref = T_REF_DEC(pTable);
+  int32_t ref = T_REF_DEC(pTable);
   tsdbDebug("unref table uid:%"PRIu64", tid:%d, refCount:%d", TABLE_UID(pTable), TABLE_TID(pTable), ref);
 
   if (ref == 0) {
@@ -1252,4 +1252,4 @@ static int tsdbRmTableFromMeta(STsdbRepo *pRepo, STable *pTable) {
   }
 
   return 0;
-}
\ No newline at end of file
+}
diff --git a/src/util/inc/tref.h b/src/util/inc/tref.h
index fa2517e19a..0503325326 100644
--- a/src/util/inc/tref.h
+++ b/src/util/inc/tref.h
@@ -22,7 +22,7 @@ typedef void (*_ref_fn_t)(const void* pObj);
 
 #define T_REF_DECLARE() \
   struct {              \
-    int16_t val;        \
+    int32_t val;        \
   } _ref;
 
 #define T_REF_REGISTER_FUNC(s, e) \
@@ -31,7 +31,7 @@ typedef void (*_ref_fn_t)(const void* pObj);
     _ref_fn_t end;                \
   } _ref_func = {.begin = (s), .end = (e)};
 
-#define T_REF_INC(x) (atomic_add_fetch_16(&((x)->_ref.val), 1))
+#define T_REF_INC(x) (atomic_add_fetch_32(&((x)->_ref.val), 1))
 
 #define T_REF_INC_WITH_CB(x, p)                           \
   do {                                                    \
@@ -41,11 +41,11 @@ typedef void (*_ref_fn_t)(const void* pObj);
     }                                                     \
   } while (0)
 
-#define T_REF_DEC(x) (atomic_sub_fetch_16(&((x)->_ref.val), 1))
+#define T_REF_DEC(x) (atomic_sub_fetch_32(&((x)->_ref.val), 1))
 
 #define T_REF_DEC_WITH_CB(x, p)                           \
   do {                                                    \
-    int32_t v = atomic_sub_fetch_16(&((x)->_ref.val), 1); \
+    int32_t v = atomic_sub_fetch_32(&((x)->_ref.val), 1); \
     if (v == 0 && (p)->_ref_func.end != NULL) {           \
       (p)->_ref_func.end((x));                            \
     }                                                     \
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 2dd641731c..2e57ad83ae 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -415,7 +415,7 @@ void taosCacheRelease(SCacheObj *pCacheObj, void **data, bool _remove) {
   }
   
   *data = NULL;
-  int16_t ref = T_REF_DEC(pNode);
+  int32_t ref = T_REF_DEC(pNode);
   uDebug("%p data released, refcnt:%d", pNode, ref);
   
   if (_remove) {

From a2bf3af34b1b3e9dc2956d2028ea3b8678f18e98 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 29 Jun 2020 19:33:50 +0800
Subject: [PATCH 14/48] change way to set timezone.

---
 .travis.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 48845c1f86..0256df7907 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,8 +36,7 @@ matrix:
           - psmisc
 
     before_script:
-      - echo 'Asia/Harbin' | sudo tee /etc/timezone
-      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
+      - sudo timedatectl set-timezone Asia/Harbin
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -152,8 +151,7 @@ matrix:
       - DESC="trusty/gcc-4.8 build"
 
     before_script:
-      - echo 'Asia/Harbin' | sudo tee /etc/timezone
-      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
+      - sudo timedatectl set-timezone Asia/Harbin
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -177,8 +175,7 @@ matrix:
           - cmake
 
     before_script:
-      - echo 'Asia/Harbin' | sudo tee /etc/timezone
-      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
+      - sudo timedatectl set-timezone Asia/Harbin
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -203,8 +200,7 @@ matrix:
           - cmake
 
     before_script:
-      - echo 'Asia/Harbin' | sudo tee /etc/timezone
-      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
+      - sudo timedatectl set-timezone Asia/Harbin
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -233,8 +229,7 @@ matrix:
       - DESC="trusty/gcc-4.8 build"
 
     before_script:
-      - echo 'Asia/Harbin' | sudo tee /etc/timezone
-      - sudo dpkg-reconfigure --frontend --noninteractive tzdata
+      - sudo timedatectl set-timezone Asia/Harbin
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug

From ebf8d765d34050d2c06d605140d84b77fbdbee90 Mon Sep 17 00:00:00 2001
From: Hui Li <huili@taosdata.com>
Date: Mon, 29 Jun 2020 19:34:24 +0800
Subject: [PATCH 15/48] [support maxSqlLen]

---
 src/kit/shell/src/shellEngine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 044e167af7..0da01d9258 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -790,7 +790,7 @@ int isCommentLine(char *line) {
 void source_file(TAOS *con, char *fptr) {
   wordexp_t full_path;
   int       read_len = 0;
-  char *    cmd = calloc(1, MAX_COMMAND_SIZE);
+  char *    cmd = calloc(1, tsMaxSQLStringLen+1);
   size_t    cmd_len = 0;
   char *    line = NULL;
   size_t    line_len = 0;
@@ -822,7 +822,7 @@ void source_file(TAOS *con, char *fptr) {
   }
 
   while ((read_len = getline(&line, &line_len, f)) != -1) {
-    if (read_len >= MAX_COMMAND_SIZE) continue;
+    if (read_len >= tsMaxSQLStringLen) continue;
     line[--read_len] = '\0';
 
     if (read_len == 0 || isCommentLine(line)) {  // line starts with #

From 3588f00c8e3c206bf8f8dd2ba0071079319e7509 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 29 Jun 2020 19:39:37 +0800
Subject: [PATCH 16/48] show date

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0256df7907..95fc398486 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,7 @@ matrix:
 
     before_script:
       - sudo timedatectl set-timezone Asia/Harbin
+      - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -152,6 +153,7 @@ matrix:
 
     before_script:
       - sudo timedatectl set-timezone Asia/Harbin
+      - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -176,6 +178,7 @@ matrix:
 
     before_script:
       - sudo timedatectl set-timezone Asia/Harbin
+      - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -201,6 +204,7 @@ matrix:
 
     before_script:
       - sudo timedatectl set-timezone Asia/Harbin
+      - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug
@@ -230,6 +234,7 @@ matrix:
 
     before_script:
       - sudo timedatectl set-timezone Asia/Harbin
+      - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
       - cd debug

From 700acfbe8526ee7a8d9f4ac1dc793587a6d878df Mon Sep 17 00:00:00 2001
From: Hui Li <huili@taosdata.com>
Date: Mon, 29 Jun 2020 19:40:06 +0800
Subject: [PATCH 17/48] [TD-794]

---
 src/kit/shell/src/shellEngine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 0da01d9258..01dcc73ef6 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -839,7 +839,7 @@ void source_file(TAOS *con, char *fptr) {
     memcpy(cmd + cmd_len, line, read_len);
     printf("%s%s\n", PROMPT_HEADER, cmd);
     shellRunCommand(con, cmd);
-    memset(cmd, 0, MAX_COMMAND_SIZE);
+    memset(cmd, 0, tsMaxSQLStringLen);
     cmd_len = 0;
   }
 

From 0d205a866320e477c037ec6d4a57eba7c26a6ccb Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 29 Jun 2020 20:05:19 +0800
Subject: [PATCH 18/48] another way to set timezone

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95fc398486..2a0aa6372b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ matrix:
           - psmisc
 
     before_script:
-      - sudo timedatectl set-timezone Asia/Harbin
+      - export TZ=Asia/Harbin
       - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
@@ -152,7 +152,7 @@ matrix:
       - DESC="trusty/gcc-4.8 build"
 
     before_script:
-      - sudo timedatectl set-timezone Asia/Harbin
+      - export TZ=Asia/Harbin
       - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
@@ -177,7 +177,7 @@ matrix:
           - cmake
 
     before_script:
-      - sudo timedatectl set-timezone Asia/Harbin
+      - export TZ=Asia/Harbin
       - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
@@ -203,7 +203,7 @@ matrix:
           - cmake
 
     before_script:
-      - sudo timedatectl set-timezone Asia/Harbin
+      - export TZ=Asia/Harbin
       - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug
@@ -233,7 +233,7 @@ matrix:
       - DESC="trusty/gcc-4.8 build"
 
     before_script:
-      - sudo timedatectl set-timezone Asia/Harbin
+      - export TZ=Asia/Harbin
       - date
       - cd ${TRAVIS_BUILD_DIR}
       - mkdir debug

From 617d3519376e93c12443c60703d273249222253b Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 29 Jun 2020 12:59:41 +0000
Subject: [PATCH 19/48] scripts

---
 tests/script/basicSuite.sim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index 0d82f96586..e498d517c7 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -6,10 +6,11 @@ run general/import/replica1.sim
 run general/parser/auto_create_tb_drop_tb.sim
 run general/parser/binary_escapeCharacter.sim
 run general/parser/select_from_cache_disk.sim
+run general/parser/null_char.sim
+run general/parser/alter.sim
 run general/parser/projection_limit_offset.sim
 run general/parser/join.sim
 run general/parser/where.sim
-run general/parser/projection_limit_offset.sim
 run general/stable/vnode3.sim
 run general/tag/filter.sim
 run general/table/vgroup.sim

From 357b7eabf90789a38b1bc9f1adb298d29cf4dbc3 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 29 Jun 2020 13:17:35 +0000
Subject: [PATCH 20/48] for CI

---
 tests/script/basicSuite.sim | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index e498d517c7..61a9d68d26 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -8,12 +8,13 @@ run general/parser/binary_escapeCharacter.sim
 run general/parser/select_from_cache_disk.sim
 run general/parser/null_char.sim
 run general/parser/alter.sim
-run general/parser/projection_limit_offset.sim
-run general/parser/join.sim
-run general/parser/where.sim
 run general/stable/vnode3.sim
 run general/tag/filter.sim
 run general/table/vgroup.sim
 run general/user/authority.sim
 run general/vector/metrics_mix.sim
 run general/vector/table_field.sim
+run general/user/authority.sim
+run general/tag/set.sim
+run general/table/delete_writing.sim
+run general/stable/disk.sim

From 13cc896cf5899b753e9bd1fec8612ea5f2c5f443 Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Mon, 29 Jun 2020 13:41:31 +0000
Subject: [PATCH 21/48] rpc did not handle simeple request head in right way if
 its session is already closed in server coverity scan defect for tqueue.c

---
 src/common/src/tglobal.c | 2 +-
 src/rpc/src/rpcMain.c    | 6 ++++++
 src/rpc/src/rpcTcp.c     | 2 +-
 src/rpc/src/rpcUdp.c     | 2 +-
 src/util/src/tqueue.c    | 7 ++++++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index 6dc6a82d09..f70bcb936a 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -43,7 +43,7 @@ int16_t  tsNumOfTotalVnodes = TSDB_INVALID_VNODE_NUM;
 int32_t  tsNumOfMnodes = 3;
 
 // common
-int32_t tsRpcTimer = 300;
+int32_t tsRpcTimer = 1000;
 int32_t tsRpcMaxTime = 600;  // seconds;
 int32_t tsMaxShellConns = 5000;
 int32_t tsMaxConnections = 5000;
diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 3ab0dddb5c..ad1e971453 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -665,6 +665,12 @@ static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv) {
     return pConn;
   }
 
+  // if code is not 0, it means it is simple reqhead, just ignore
+  if (pHead->code != 0) {
+    terrno = TSDB_CODE_RPC_ALREADY_PROCESSED;
+    return NULL;
+  }
+
   int sid = taosAllocateId(pRpc->idPool);
   if (sid <= 0) {
     tError("%s maximum number of sessions:%d is reached", pRpc->label, pRpc->sessions);
diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index ff8d055fd4..def1fd9383 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -419,7 +419,7 @@ static int taosReadTcpData(SFdObj *pFdObj, SRecvInfo *pInfo) {
     tError("%s %p TCP malloc(size:%d) fail", pThreadObj->label, pFdObj->thandle, msgLen);
     return -1;
   } else {
-    // tDebug("malloc mem: %p", buffer);
+    tDebug("TCP malloc mem: %p", buffer);
   }
 
   msg = buffer + tsRpcOverhead;
diff --git a/src/rpc/src/rpcUdp.c b/src/rpc/src/rpcUdp.c
index 91324da474..decd7a8307 100644
--- a/src/rpc/src/rpcUdp.c
+++ b/src/rpc/src/rpcUdp.c
@@ -212,7 +212,7 @@ static void *taosRecvUdpData(void *param) {
       tError("%s failed to allocate memory, size:%ld", pConn->label, dataLen);
       continue;
     } else {
-      // tTrace("malloc mem: %p", tmsg);
+      tDebug("UDP malloc mem: %p", tmsg);
     }
 
     tmsg += tsRpcOverhead;  // overhead for SRpcReqContext
diff --git a/src/util/src/tqueue.c b/src/util/src/tqueue.c
index 34396c9c29..b499f34060 100644
--- a/src/util/src/tqueue.c
+++ b/src/util/src/tqueue.c
@@ -68,10 +68,15 @@ void taosCloseQueue(taos_queue param) {
   if (param == NULL) return;
   STaosQueue *queue = (STaosQueue *)param;
   STaosQnode *pTemp;
+  STaosQset  *qset;
+
+  pthread_mutex_lock(&queue->mutex);
   STaosQnode *pNode = queue->head;  
   queue->head = NULL;
+  qset = queue->qset;
+  pthread_mutex_unlock(&queue->mutex);
 
-  if (queue->qset) taosRemoveFromQset(queue->qset, queue); 
+  if (queue->qset) taosRemoveFromQset(qset, queue); 
 
   pthread_mutex_lock(&queue->mutex);
 

From 607959a0825c48d96072d3c8c95f6500ab8bf662 Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Mon, 29 Jun 2020 15:32:35 +0000
Subject: [PATCH 22/48] check the application message length before passing it
 to server

---
 src/rpc/src/rpcMain.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index ad1e971453..a59024f8db 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -1034,15 +1034,20 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead) {
   rpcMsg.ahandle = pConn->ahandle;
    
   if ( rpcIsReq(pHead->msgType) ) {
-    rpcMsg.handle = pConn;
-    rpcAddRef(pRpc);  // add the refCount for requests
+    if (rpcMsg.contLen > 0) {
+      rpcMsg.handle = pConn;
+      rpcAddRef(pRpc);  // add the refCount for requests
 
-    // start the progress timer to monitor the response from server app
-    if (pConn->connType != RPC_CONN_TCPS) 
-      pConn->pTimer = taosTmrStart(rpcProcessProgressTimer, tsProgressTimer, pConn, pRpc->tmrCtrl);
+      // start the progress timer to monitor the response from server app
+      if (pConn->connType != RPC_CONN_TCPS) 
+        pConn->pTimer = taosTmrStart(rpcProcessProgressTimer, tsProgressTimer, pConn, pRpc->tmrCtrl);
  
-    // notify the server app
-    (*(pRpc->cfp))(&rpcMsg, NULL);
+      // notify the server app
+      (*(pRpc->cfp))(&rpcMsg, NULL);
+    } else {
+      tDebug("%s, message body is empty, ignore", pConn->info);
+      rpcFreeCont(rpcMsg.pCont);
+    }
   } else {
     // it's a response
     SRpcReqContext *pContext = pConn->pContext;

From 28219a84c1182712dbe07da25792b3c48f91afc2 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Tue, 30 Jun 2020 09:23:21 +0800
Subject: [PATCH 23/48] fix td-779

---
 src/mnode/src/mnodeTable.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 2d9892cf01..7dc0c5dfa5 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -2374,6 +2374,17 @@ static int32_t mnodeRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows
   strcat(prefix, TS_PATH_DELIMITER);
   int32_t prefixLen = strlen(prefix);
 
+  char* pattern = NULL;
+  if (pShow->payloadLen > 0) {
+    pattern = (char*)malloc(pShow->payloadLen + 1);
+    if (pattern == NULL) {
+      terrno = TSDB_CODE_QRY_OUT_OF_MEMORY;
+      return 0;
+    }
+    memcpy(pattern, pShow->payload, pShow->payloadLen);
+    pattern[pShow->payloadLen] = 0;
+  }
+
   while (numOfRows < rows) {
     pShow->pIter = mnodeGetNextChildTable(pShow->pIter, &pTable);
     if (pTable == NULL) break;
@@ -2389,7 +2400,7 @@ static int32_t mnodeRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows
     // pattern compare for table name
     mnodeExtractTableName(pTable->info.tableId, tableName);
 
-    if (pShow->payloadLen > 0 && patternMatch(pShow->payload, tableName, sizeof(tableName) - 1, &info) != TSDB_PATTERN_MATCH) {
+    if (pattern != NULL && patternMatch(pattern, tableName, sizeof(tableName) - 1, &info) != TSDB_PATTERN_MATCH) {
       mnodeDecTableRef(pTable);
       continue;
     }
@@ -2433,6 +2444,7 @@ static int32_t mnodeRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows
 
   mnodeVacuumResult(data, NUM_OF_COLUMNS, numOfRows, rows, pShow);
   mnodeDecDbRef(pDb);
+  free(pattern);
 
   return numOfRows;
 }

From c024afe67f64f45e1e682563c93a36736a3c6c79 Mon Sep 17 00:00:00 2001
From: Hui Li <huili@taosdata.com>
Date: Tue, 30 Jun 2020 09:34:30 +0800
Subject: [PATCH 24/48] [TD-795]

---
 src/inc/taosmsg.h           | 2 +-
 src/mnode/inc/mnodeDef.h    | 2 +-
 src/mnode/src/mnodeVgroup.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 78255a45d5..c8bd2c6076 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -618,7 +618,7 @@ typedef struct {
 } SMDVnodeDesc;
 
 typedef struct {
-  char db[TSDB_DB_NAME_LEN];
+  char db[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
   SMDVnodeCfg  cfg;
   SMDVnodeDesc nodes[TSDB_MAX_REPLICA];
 } SMDCreateVnodeMsg;
diff --git a/src/mnode/inc/mnodeDef.h b/src/mnode/inc/mnodeDef.h
index ae1ba98a0f..46d2675705 100644
--- a/src/mnode/inc/mnodeDef.h
+++ b/src/mnode/inc/mnodeDef.h
@@ -132,7 +132,7 @@ typedef struct SVgObj {
   int64_t        createdTime;
   int32_t        lbDnodeId;
   int32_t        lbTime;
-  char           dbName[TSDB_DB_NAME_LEN];
+  char           dbName[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
   int8_t         inUse;
   int8_t         accessState;
   int8_t         reserved0[5];
diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c
index 36fa306c9f..b314bfc8d0 100644
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@@ -358,7 +358,7 @@ int32_t mnodeCreateVgroup(SMnodeMsg *pMsg, SDbObj *pDb) {
   if (pMsg == NULL) return TSDB_CODE_MND_APP_ERROR;
 
   SVgObj *pVgroup = (SVgObj *)calloc(1, sizeof(SVgObj));
-  tstrncpy(pVgroup->dbName, pDb->name, TSDB_DB_NAME_LEN);
+  tstrncpy(pVgroup->dbName, pDb->name, TSDB_ACCT_LEN + TSDB_DB_NAME_LEN);
   pVgroup->numOfVnodes = pDb->cfg.replications;
   pVgroup->createdTime = taosGetTimestampMs();
   pVgroup->accessState = TSDB_VN_ALL_ACCCESS;

From ee4e4aaa9cb76283968d156824ff785af0e2c97c Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 30 Jun 2020 02:31:23 +0000
Subject: [PATCH 25/48] change some logs from debug to trace

---
 src/mnode/src/mnodeSdb.c    | 1 +
 src/tsdb/src/tsdbMemTable.c | 2 +-
 src/tsdb/src/tsdbMeta.c     | 4 ++--
 src/util/src/tqueue.c       | 8 ++++----
 src/vnode/src/vnodeWrite.c  | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/mnode/src/mnodeSdb.c b/src/mnode/src/mnodeSdb.c
index e1d255ee76..761dce6720 100644
--- a/src/mnode/src/mnodeSdb.c
+++ b/src/mnode/src/mnodeSdb.c
@@ -367,6 +367,7 @@ void sdbCleanUp() {
   tsSdbObj.status = SDB_STATUS_CLOSING;
   
   sdbCleanupWriteWorker();
+  sdbDebug("sdb will be closed, version:%" PRId64, tsSdbObj.version);
 
   if (tsSdbObj.sync) {
     syncStop(tsSdbObj.sync);
diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
index 12db79182e..d3b9081a36 100644
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -111,7 +111,7 @@ int tsdbInsertRowToMem(STsdbRepo *pRepo, SDataRow row, STable *pTable) {
     ASSERT(pTableData->numOfRows == tSkipListGetSize(pTableData->pData));
   }
 
-  tsdbDebug("vgId:%d a row is inserted to table %s tid %d uid %" PRIu64 " key %" PRIu64, REPO_ID(pRepo),
+  tsdbTrace("vgId:%d a row is inserted to table %s tid %d uid %" PRIu64 " key %" PRIu64, REPO_ID(pRepo),
             TABLE_CHAR_NAME(pTable), TABLE_TID(pTable), TABLE_UID(pTable), key);
 
   return 0;
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index b769a87beb..3b25d68896 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -596,7 +596,7 @@ static int tsdbRestoreTable(void *pHandle, void *cont, int contLen) {
     return -1;
   }
 
-  tsdbDebug("vgId:%d table %s tid %d uid %" PRIu64 " is restored from file", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+  tsdbTrace("vgId:%d table %s tid %d uid %" PRIu64 " is restored from file", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
             TABLE_TID(pTable), TABLE_UID(pTable));
   return 0;
 }
@@ -797,7 +797,7 @@ static int tsdbAddTableToMeta(STsdbRepo *pRepo, STable *pTable, bool addIdx) {
     pTable->cqhandle = (*pRepo->appH.cqCreateFunc)(pRepo->appH.cqH, TABLE_UID(pTable), TABLE_TID(pTable), pTable->sql, tsdbGetTableSchema(pTable));
   }
 
-  tsdbDebug("vgId:%d table %s tid %d uid %" PRIu64 " is added to meta", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+  tsdbTrace("vgId:%d table %s tid %d uid %" PRIu64 " is added to meta", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
             TABLE_TID(pTable), TABLE_UID(pTable));
   return 0;
 
diff --git a/src/util/src/tqueue.c b/src/util/src/tqueue.c
index 34396c9c29..0dabcdcff7 100644
--- a/src/util/src/tqueue.c
+++ b/src/util/src/tqueue.c
@@ -95,7 +95,7 @@ void *taosAllocateQitem(int size) {
 void taosFreeQitem(void *param) {
   if (param == NULL) return;
 
-  uDebug("item:%p is freed", param);
+  uTrace("item:%p is freed", param);
   char *temp = (char *)param;
   temp -= sizeof(STaosQnode);
   free(temp);
@@ -119,7 +119,7 @@ int taosWriteQitem(taos_queue param, int type, void *item) {
 
   queue->numOfItems++;
   if (queue->qset) atomic_add_fetch_32(&queue->qset->numOfItems, 1);
-  uDebug("item:%p is put into queue:%p, type:%d items:%d", item, queue, type, queue->numOfItems);
+  uTrace("item:%p is put into queue:%p, type:%d items:%d", item, queue, type, queue->numOfItems);
 
   pthread_mutex_unlock(&queue->mutex);
 
@@ -201,7 +201,7 @@ int taosGetQitem(taos_qall param, int *type, void **pitem) {
     *pitem = pNode->item;
     *type = pNode->type;
     num = 1;
-    uDebug("item:%p is fetched, type:%d", *pitem, *type);
+    uTrace("item:%p is fetched, type:%d", *pitem, *type);
   }
 
   return num;
@@ -339,7 +339,7 @@ int taosReadQitemFromQset(taos_qset param, int *type, void **pitem, void **phand
         queue->numOfItems--;
         atomic_sub_fetch_32(&qset->numOfItems, 1);
         code = 1;
-        uDebug("item:%p is read out from queue:%p, type:%d items:%d", *pitem, queue, *type, queue->numOfItems);
+        uTrace("item:%p is read out from queue:%p, type:%d items:%d", *pitem, queue, *type, queue->numOfItems);
     } 
 
     pthread_mutex_unlock(&queue->mutex);
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index f43d10a7a3..171557acb6 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -94,7 +94,7 @@ static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pR
 
   // save insert result into item
 
-  vDebug("vgId:%d, submit msg is processed", pVnode->vgId);
+  vTrace("vgId:%d, submit msg is processed", pVnode->vgId);
   
   pRet->len = sizeof(SShellSubmitRspMsg);
   pRet->rsp = rpcMallocCont(pRet->len);

From d2948b9170cf8b1e0f733fe9214ab1da23e1a88c Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Tue, 30 Jun 2020 10:56:32 +0800
Subject: [PATCH 26/48] add two more cases to regression.

---
 tests/script/regressionSuite.sim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/script/regressionSuite.sim b/tests/script/regressionSuite.sim
index c671cf47c6..f4ffb5ea9e 100644
--- a/tests/script/regressionSuite.sim
+++ b/tests/script/regressionSuite.sim
@@ -142,6 +142,8 @@ run general/stable/dnode3.sim
 run general/stable/metrics.sim
 run general/stable/values.sim
 run general/stable/vnode3.sim
+run general/stable/refcount.sim
+run general/stable/show.sim
 run general/table/autocreate.sim
 run general/table/basic1.sim
 run general/table/basic2.sim

From 555206e9b1bc01718be284ee171cf32b9d8ab828 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 30 Jun 2020 04:35:21 +0000
Subject: [PATCH 27/48] [TD-800] crash while connect failed

---
 src/mnode/src/mnodeShow.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mnode/src/mnodeShow.c b/src/mnode/src/mnodeShow.c
index 6f5216dfa3..06ef2cb452 100644
--- a/src/mnode/src/mnodeShow.c
+++ b/src/mnode/src/mnodeShow.c
@@ -281,6 +281,7 @@ static int32_t mnodeProcessHeartBeatMsg(SMnodeMsg *pMsg) {
 
 static int32_t mnodeProcessConnectMsg(SMnodeMsg *pMsg) {
   SCMConnectMsg *pConnectMsg = pMsg->rpcMsg.pCont;
+  SCMConnectRsp *pConnectRsp = NULL;
   int32_t code = TSDB_CODE_SUCCESS;
 
   SRpcConnInfo connInfo;
@@ -309,7 +310,7 @@ static int32_t mnodeProcessConnectMsg(SMnodeMsg *pMsg) {
     mnodeDecDbRef(pDb);
   }
 
-  SCMConnectRsp *pConnectRsp = rpcMallocCont(sizeof(SCMConnectRsp));
+  pConnectRsp = rpcMallocCont(sizeof(SCMConnectRsp));
   if (pConnectRsp == NULL) {
     code = TSDB_CODE_MND_OUT_OF_MEMORY;
     goto connect_over;
@@ -332,7 +333,7 @@ static int32_t mnodeProcessConnectMsg(SMnodeMsg *pMsg) {
 
 connect_over:
   if (code != TSDB_CODE_SUCCESS) {
-    rpcFreeCont(pConnectRsp);
+    if (pConnectRsp) rpcFreeCont(pConnectRsp);
     mLError("user:%s login from %s, result:%s", connInfo.user, taosIpStr(connInfo.clientIp), tstrerror(code));
   } else {
     mLInfo("user:%s login from %s, result:%s", connInfo.user, taosIpStr(connInfo.clientIp), tstrerror(code));

From cdee839a776d0f764b8f51937300ba8b0d372d98 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 30 Jun 2020 07:03:24 +0000
Subject: [PATCH 28/48] ref count error

---
 src/mnode/src/mnodeTable.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 7dc0c5dfa5..65900a60db 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -457,10 +457,9 @@ static int32_t mnodeSuperTableActionUpdate(SSdbOper *pOper) {
     free(pNew);
     free(oldTableId);
     free(oldSchema);
-  
-    mnodeDecTableRef(pTable);
   }
 
+  mnodeDecTableRef(pTable);
   return TSDB_CODE_SUCCESS;
 }
 

From 65f3a7ef8dfb3d5cfc9d5242aa25c43b9c02d9dd Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Tue, 30 Jun 2020 11:26:10 +0000
Subject: [PATCH 29/48] change the rpcMsg definition

---
 src/client/src/tscServer.c  |  7 ++++---
 src/inc/trpc.h              |  8 ++++----
 src/mnode/src/mnodeDnode.c  |  2 +-
 src/mnode/src/mnodeTable.c  | 18 +++++++++---------
 src/mnode/src/mnodeVgroup.c | 18 +++++++++---------
 src/rpc/src/rpcMain.c       |  7 ++++---
 src/rpc/test/rclient.c      |  6 +++---
 7 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 470a829805..0ffe50c8f4 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -191,7 +191,8 @@ int tscSendMsgToServer(SSqlObj *pSql) {
       .msgType = pSql->cmd.msgType,
       .pCont   = pMsg,
       .contLen = pSql->cmd.payloadLen,
-      .handle  = pSql,
+      .ahandle = pSql,
+      .handle  = &pSql->pRpcCtx,
       .code    = 0
   };
 
@@ -199,12 +200,12 @@ int tscSendMsgToServer(SSqlObj *pSql) {
   // Otherwise, the pSql object may have been released already during the response function, which is
   // processMsgFromServer function. In the meanwhile, the assignment of the rpc context to sql object will absolutely
   // cause crash.
-  /*pSql->pRpcCtx = */rpcSendRequest(pObj->pDnodeConn, &pSql->ipList, &rpcMsg);
+  rpcSendRequest(pObj->pDnodeConn, &pSql->ipList, &rpcMsg);
   return TSDB_CODE_SUCCESS;
 }
 
 void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) {
-  SSqlObj *pSql = (SSqlObj *)rpcMsg->handle;
+  SSqlObj *pSql = (SSqlObj *)rpcMsg->ahandle;
   if (pSql == NULL || pSql->signature != pSql) {
     tscError("%p sql is already released", pSql);
     return;
diff --git a/src/inc/trpc.h b/src/inc/trpc.h
index 30e0f9eee1..59362d669c 100644
--- a/src/inc/trpc.h
+++ b/src/inc/trpc.h
@@ -47,8 +47,8 @@ typedef struct SRpcMsg {
   void   *pCont;
   int     contLen;
   int32_t code;
-  void   *handle;
-  void   *ahandle;  //app handle set by client, for debug purpose
+  void   *handle;   // rpc handle returned to app
+  void   *ahandle;  // app handle set by client
 } SRpcMsg;
 
 typedef struct SRpcInit {
@@ -78,11 +78,11 @@ void  rpcClose(void *);
 void *rpcMallocCont(int contLen);
 void  rpcFreeCont(void *pCont);
 void *rpcReallocCont(void *ptr, int contLen);
-void *rpcSendRequest(void *thandle, const SRpcIpSet *pIpSet, const SRpcMsg *pMsg);
+void *rpcSendRequest(void *thandle, const SRpcIpSet *pIpSet, SRpcMsg *pMsg);
 void  rpcSendResponse(const SRpcMsg *pMsg);
 void  rpcSendRedirectRsp(void *pConn, const SRpcIpSet *pIpSet); 
 int   rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo);
-void  rpcSendRecv(void *shandle, SRpcIpSet *pIpSet, const SRpcMsg *pReq, SRpcMsg *pRsp);
+void  rpcSendRecv(void *shandle, SRpcIpSet *pIpSet, SRpcMsg *pReq, SRpcMsg *pRsp);
 int   rpcReportProgress(void *pConn, char *pCont, int contLen);
 void  rpcCancelRequest(void *pContext);
 
diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c
index dbe9185d8e..7e7c12cf08 100644
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
@@ -264,7 +264,7 @@ static int32_t mnodeProcessCfgDnodeMsg(SMnodeMsg *pMsg) {
   strcpy(pMdCfgDnode->config, pCmCfgDnode->config);
 
   SRpcMsg rpcMdCfgDnodeMsg = {
-    .handle = 0,
+    .ahandle = 0,
     .code = 0,
     .msgType = TSDB_MSG_TYPE_MD_CONFIG_DNODE,
     .pCont = pMdCfgDnode,
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 7dc0c5dfa5..1f1035887c 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1573,7 +1573,7 @@ static int32_t mnodeDoCreateChildTableCb(SMnodeMsg *pMsg, int32_t code) {
 
   SRpcIpSet ipSet = mnodeGetIpSetFromVgroup(pMsg->pVgroup);
   SRpcMsg rpcMsg = {
-      .handle  = pMsg,
+      .ahandle = pMsg,
       .pCont   = pMDCreate,
       .contLen = htonl(pMDCreate->contLen),
       .code    = 0,
@@ -1750,7 +1750,7 @@ static int32_t mnodeProcessDropChildTableMsg(SMnodeMsg *pMsg) {
 
   mInfo("app:%p:%p, table:%s, send drop ctable msg", pMsg->rpcMsg.ahandle, pMsg, pDrop->tableId);
   SRpcMsg rpcMsg = {
-    .handle  = pMsg,
+    .ahandle = pMsg,
     .pCont   = pDrop,
     .contLen = sizeof(SMDDropTableMsg),
     .code    = 0,
@@ -1798,7 +1798,7 @@ static int32_t mnodeAlterNormalTableColumnCb(SMnodeMsg *pMsg, int32_t code) {
 
   SRpcIpSet ipSet = mnodeGetIpSetFromVgroup(pMsg->pVgroup);
   SRpcMsg rpcMsg = {
-      .handle  = pMsg,
+      .ahandle = pMsg,
       .pCont   = pMDCreate,
       .contLen = htonl(pMDCreate->contLen),
       .code    = 0,
@@ -2137,9 +2137,9 @@ static int32_t mnodeProcessTableCfgMsg(SMnodeMsg *pMsg) {
 
 // handle drop child response
 static void mnodeProcessDropChildTableRsp(SRpcMsg *rpcMsg) {
-  if (rpcMsg->handle == NULL) return;
+  if (rpcMsg->ahandle == NULL) return;
 
-  SMnodeMsg *mnodeMsg = rpcMsg->handle;
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
   mnodeMsg->received++;
 
   SChildTableObj *pTable = (SChildTableObj *)mnodeMsg->pTable;
@@ -2188,9 +2188,9 @@ static void mnodeProcessDropChildTableRsp(SRpcMsg *rpcMsg) {
  *   if failed, drop the table cached
  */
 static void mnodeProcessCreateChildTableRsp(SRpcMsg *rpcMsg) {
-  if (rpcMsg->handle == NULL) return;
+  if (rpcMsg->ahandle == NULL) return;
 
-  SMnodeMsg *mnodeMsg = rpcMsg->handle;
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
   mnodeMsg->received++;
 
   SChildTableObj *pTable = (SChildTableObj *)mnodeMsg->pTable;
@@ -2231,9 +2231,9 @@ static void mnodeProcessCreateChildTableRsp(SRpcMsg *rpcMsg) {
 }
 
 static void mnodeProcessAlterTableRsp(SRpcMsg *rpcMsg) {
-  if (rpcMsg->handle == NULL) return;
+  if (rpcMsg->ahandle == NULL) return;
 
-  SMnodeMsg *mnodeMsg = rpcMsg->handle;
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
   mnodeMsg->received++;
 
   SChildTableObj *pTable = (SChildTableObj *)mnodeMsg->pTable;
diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c
index b314bfc8d0..3855de4101 100644
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@@ -652,7 +652,7 @@ SRpcIpSet mnodeGetIpSetFromIp(char *ep) {
 void mnodeSendCreateVnodeMsg(SVgObj *pVgroup, SRpcIpSet *ipSet, void *ahandle) {
   SMDCreateVnodeMsg *pCreate = mnodeBuildCreateVnodeMsg(pVgroup);
   SRpcMsg rpcMsg = {
-    .handle  = ahandle,
+    .ahandle = ahandle,
     .pCont   = pCreate,
     .contLen = pCreate ? sizeof(SMDCreateVnodeMsg) : 0,
     .code    = 0,
@@ -673,9 +673,9 @@ void mnodeSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) {
 }
 
 static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
-  if (rpcMsg->handle == NULL) return;
+  if (rpcMsg->ahandle == NULL) return;
 
-  SMnodeMsg *mnodeMsg = rpcMsg->handle;
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
   mnodeMsg->received++;
   if (rpcMsg->code == TSDB_CODE_SUCCESS) {
     mnodeMsg->successed++;
@@ -686,7 +686,7 @@ static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
   SVgObj *pVgroup = mnodeMsg->pVgroup;
   mDebug("vgId:%d, create vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p",
          pVgroup->vgId, tstrerror(rpcMsg->code), mnodeMsg->received, mnodeMsg->successed, mnodeMsg->expected,
-         mnodeMsg->rpcMsg.handle, rpcMsg->handle);
+         mnodeMsg->rpcMsg.handle, rpcMsg->ahandle);
 
   if (mnodeMsg->received != mnodeMsg->expected) return;
 
@@ -718,7 +718,7 @@ static SMDDropVnodeMsg *mnodeBuildDropVnodeMsg(int32_t vgId) {
 void mnodeSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle) {
   SMDDropVnodeMsg *pDrop = mnodeBuildDropVnodeMsg(vgId);
   SRpcMsg rpcMsg = {
-      .handle  = ahandle,
+      .ahandle = ahandle,
       .pCont   = pDrop,
       .contLen = pDrop ? sizeof(SMDDropVnodeMsg) : 0,
       .code    = 0,
@@ -737,10 +737,10 @@ static void mnodeSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) {
 }
 
 static void mnodeProcessDropVnodeRsp(SRpcMsg *rpcMsg) {
-  mDebug("drop vnode rsp is received, handle:%p", rpcMsg->handle);
-  if (rpcMsg->handle == NULL) return;
+  mDebug("drop vnode rsp is received, handle:%p", rpcMsg->ahandle);
+  if (rpcMsg->ahandle == NULL) return;
 
-  SMnodeMsg *mnodeMsg = rpcMsg->handle;
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
   mnodeMsg->received++;
   if (rpcMsg->code == TSDB_CODE_SUCCESS) {
     mnodeMsg->code = rpcMsg->code;
@@ -750,7 +750,7 @@ static void mnodeProcessDropVnodeRsp(SRpcMsg *rpcMsg) {
   SVgObj *pVgroup = mnodeMsg->pVgroup;
   mDebug("vgId:%d, drop vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p",
          pVgroup->vgId, tstrerror(rpcMsg->code), mnodeMsg->received, mnodeMsg->successed, mnodeMsg->expected,
-         mnodeMsg->rpcMsg.handle, rpcMsg->handle);
+         mnodeMsg->rpcMsg.handle, rpcMsg->ahandle);
 
   if (mnodeMsg->received != mnodeMsg->expected) return;
 
diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index a59024f8db..26ea93416d 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -354,13 +354,13 @@ void *rpcReallocCont(void *ptr, int contLen) {
   return start + sizeof(SRpcReqContext) + sizeof(SRpcHead);
 }
 
-void *rpcSendRequest(void *shandle, const SRpcIpSet *pIpSet, const SRpcMsg *pMsg) {
+void *rpcSendRequest(void *shandle, const SRpcIpSet *pIpSet, SRpcMsg *pMsg) {
   SRpcInfo       *pRpc = (SRpcInfo *)shandle;
   SRpcReqContext *pContext;
 
   int contLen = rpcCompressRpcMsg(pMsg->pCont, pMsg->contLen);
   pContext = (SRpcReqContext *) (pMsg->pCont-sizeof(SRpcHead)-sizeof(SRpcReqContext));
-  pContext->ahandle = pMsg->handle;
+  pContext->ahandle = pMsg->ahandle;
   pContext->pRpc = (SRpcInfo *)shandle;
   pContext->ipSet = *pIpSet;
   pContext->contLen = contLen;
@@ -380,6 +380,7 @@ void *rpcSendRequest(void *shandle, const SRpcIpSet *pIpSet, const SRpcMsg *pMsg
     || type == TSDB_MSG_TYPE_CM_SHOW )
     pContext->connType = RPC_CONN_TCPC;
   
+  if (pMsg->handle) *((void **)pMsg->handle) = pContext;
   rpcSendReqToServer(pRpc, pContext);
 
   return pContext;
@@ -483,7 +484,7 @@ int rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo) {
   return 0;
 }
 
-void rpcSendRecv(void *shandle, SRpcIpSet *pIpSet, const SRpcMsg *pMsg, SRpcMsg *pRsp) {
+void rpcSendRecv(void *shandle, SRpcIpSet *pIpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
   SRpcReqContext *pContext;
   pContext = (SRpcReqContext *) (pMsg->pCont-sizeof(SRpcHead)-sizeof(SRpcReqContext));
 
diff --git a/src/rpc/test/rclient.c b/src/rpc/test/rclient.c
index 1bc64b0825..e51b54e299 100644
--- a/src/rpc/test/rclient.c
+++ b/src/rpc/test/rclient.c
@@ -33,7 +33,7 @@ typedef struct {
 } SInfo;
 
 static void processResponse(SRpcMsg *pMsg, SRpcIpSet *pIpSet) {
-  SInfo *pInfo = (SInfo *)pMsg->handle;
+  SInfo *pInfo = (SInfo *)pMsg->ahandle;
   tDebug("thread:%d, response is received, type:%d contLen:%d code:0x%x", pInfo->index, pMsg->msgType, pMsg->contLen, pMsg->code);
 
   if (pIpSet) pInfo->ipSet = *pIpSet;
@@ -46,7 +46,7 @@ static int tcount = 0;
 
 static void *sendRequest(void *param) {
   SInfo  *pInfo = (SInfo *)param;
-  SRpcMsg rpcMsg; 
+  SRpcMsg rpcMsg = {0}; 
   
   tDebug("thread:%d, start to send request", pInfo->index);
 
@@ -54,7 +54,7 @@ static void *sendRequest(void *param) {
     pInfo->num++;
     rpcMsg.pCont = rpcMallocCont(pInfo->msgSize);
     rpcMsg.contLen = pInfo->msgSize;
-    rpcMsg.handle = pInfo;
+    rpcMsg.ahandle = pInfo;
     rpcMsg.msgType = 1;
     tDebug("thread:%d, send request, contLen:%d num:%d", pInfo->index, pInfo->msgSize, pInfo->num);
     rpcSendRequest(pInfo->pRpc, &pInfo->ipSet, &rpcMsg);

From 10eabebfbcd495701478337a012f46423b94ba2a Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Tue, 30 Jun 2020 11:57:08 +0000
Subject: [PATCH 30/48] change the return type

---
 src/inc/trpc.h        | 2 +-
 src/rpc/src/rpcMain.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/inc/trpc.h b/src/inc/trpc.h
index 59362d669c..d1adfb7494 100644
--- a/src/inc/trpc.h
+++ b/src/inc/trpc.h
@@ -78,7 +78,7 @@ void  rpcClose(void *);
 void *rpcMallocCont(int contLen);
 void  rpcFreeCont(void *pCont);
 void *rpcReallocCont(void *ptr, int contLen);
-void *rpcSendRequest(void *thandle, const SRpcIpSet *pIpSet, SRpcMsg *pMsg);
+void  rpcSendRequest(void *thandle, const SRpcIpSet *pIpSet, SRpcMsg *pMsg);
 void  rpcSendResponse(const SRpcMsg *pMsg);
 void  rpcSendRedirectRsp(void *pConn, const SRpcIpSet *pIpSet); 
 int   rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo);
diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 26ea93416d..dbdfa28a1a 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -354,7 +354,7 @@ void *rpcReallocCont(void *ptr, int contLen) {
   return start + sizeof(SRpcReqContext) + sizeof(SRpcHead);
 }
 
-void *rpcSendRequest(void *shandle, const SRpcIpSet *pIpSet, SRpcMsg *pMsg) {
+void rpcSendRequest(void *shandle, const SRpcIpSet *pIpSet, SRpcMsg *pMsg) {
   SRpcInfo       *pRpc = (SRpcInfo *)shandle;
   SRpcReqContext *pContext;
 
@@ -380,10 +380,12 @@ void *rpcSendRequest(void *shandle, const SRpcIpSet *pIpSet, SRpcMsg *pMsg) {
     || type == TSDB_MSG_TYPE_CM_SHOW )
     pContext->connType = RPC_CONN_TCPC;
   
+  // set the handle to pContext, so app can cancel the request
   if (pMsg->handle) *((void **)pMsg->handle) = pContext;
+
   rpcSendReqToServer(pRpc, pContext);
 
-  return pContext;
+  return;
 }
 
 void rpcSendResponse(const SRpcMsg *pRsp) {

From a43544ea266eab6a2e9321fffb663e1a647cd275 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 30 Jun 2020 14:31:06 +0000
Subject: [PATCH 31/48] invalid read while auto create table

---
 src/inc/taoserror.h        |  1 +
 src/mnode/src/mnodeTable.c | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 33e0aa24b6..4a7d86c434 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -153,6 +153,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_TAG_ALREAY_EXIST,         0, 0x0369, "mnode tag
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_TAG_NOT_EXIST,            0, 0x036A, "mnode tag not exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_FIELD_ALREAY_EXIST,       0, 0x036B, "mnode field already exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_FIELD_NOT_EXIST,          0, 0x036C, "mnode field not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_STABLE_NAME,      0, 0x036D, "mnode invalid stable name")
 
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_NOT_SELECTED,          0, 0x0380, "mnode db not selected")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_ALREADY_EXIST,         0, 0x0381, "mnode database aleady exist")
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 65900a60db..23b62f1aa3 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1964,9 +1964,15 @@ static int32_t mnodeDoGetChildTableMeta(SMnodeMsg *pMsg, STableMetaMsg *pMeta) {
 
 static int32_t mnodeAutoCreateChildTable(SMnodeMsg *pMsg) {
   SCMTableInfoMsg *pInfo = pMsg->rpcMsg.pCont;
-  STagData *pTag = (STagData *)pInfo->tags;
+  STagData *pTags = (STagData *)pInfo->tags;
+  int32_t tagLen = htonl(pTags->dataLen);
+  if (pTags->name[0] == 0) {
+    mError("app:%p:%p, table:%s, failed to create table on demand for stable is empty, tagLen:%d", pMsg->rpcMsg.ahandle,
+           pMsg, pInfo->tableId, tagLen);
+    return TSDB_CODE_MND_INVALID_STABLE_NAME; 
+  }
 
-  int32_t contLen = sizeof(SCMCreateTableMsg) + offsetof(STagData, data) + htonl(pTag->dataLen);
+  int32_t contLen = sizeof(SCMCreateTableMsg) + offsetof(STagData, data) + tagLen;
   SCMCreateTableMsg *pCreateMsg = rpcMallocCont(contLen);
   if (pCreateMsg == NULL) {
     mError("app:%p:%p, table:%s, failed to create table while get meta info, no enough memory", pMsg->rpcMsg.ahandle,
@@ -1981,9 +1987,9 @@ static int32_t mnodeAutoCreateChildTable(SMnodeMsg *pMsg) {
   pCreateMsg->getMeta = 1;
   pCreateMsg->contLen = htonl(contLen);
 
-  memcpy(pCreateMsg->schema, pInfo->tags, contLen - sizeof(SCMCreateTableMsg));
-  mDebug("app:%p:%p, table:%s, start to create on demand, stable:%s", pMsg->rpcMsg.ahandle, pMsg, pInfo->tableId,
-         ((STagData *)(pCreateMsg->schema))->name);
+  memcpy(pCreateMsg->schema, pTags, contLen);
+  mDebug("app:%p:%p, table:%s, start to create on demand, tagLen:%d stable:%s",
+         pMsg->rpcMsg.ahandle, pMsg, pInfo->tableId, tagLen, pTags->name);
 
   rpcFreeCont(pMsg->rpcMsg.pCont);
   pMsg->rpcMsg.msgType = TSDB_MSG_TYPE_CM_CREATE_TABLE;

From 24eae824ecec5b7239a9cbf2346000929593745c Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 30 Jun 2020 23:19:00 +0800
Subject: [PATCH 32/48] Invalid write while create child ctable

---
 src/mnode/src/mnodeTable.c     | 6 ++++--
 src/plugins/http/src/httpSql.c | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 23b62f1aa3..82322d43b8 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -382,11 +382,13 @@ static void mnodeAddTableIntoStable(SSuperTableObj *pStable, SChildTableObj *pCt
   pStable->numOfTables++;
 
   if (pStable->vgHash == NULL) {
-    pStable->vgHash = taosHashInit(100000, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false);
+    pStable->vgHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false);
   }
 
   if (pStable->vgHash != NULL) {
-    taosHashPut(pStable->vgHash, (char *)&pCtable->vgId, sizeof(pCtable->vgId), &pCtable->vgId, sizeof(pCtable->vgId));
+    if (taosHashGet(pStable->vgHash, &pCtable->vgId, sizeof(pCtable->vgId)) == NULL) {
+      taosHashPut(pStable->vgHash, &pCtable->vgId, sizeof(pCtable->vgId), &pCtable->vgId, sizeof(pCtable->vgId));
+    }
   }
 }
 
diff --git a/src/plugins/http/src/httpSql.c b/src/plugins/http/src/httpSql.c
index d0e9b005fd..9d3efca01d 100644
--- a/src/plugins/http/src/httpSql.c
+++ b/src/plugins/http/src/httpSql.c
@@ -359,6 +359,8 @@ void httpExecCmd(HttpContext *pContext) {
 
 void httpProcessRequestCb(void *param, TAOS_RES *result, int code) {
   HttpContext *pContext = param;
+  taos_free_result(result);
+  
   if (pContext == NULL) return;
 
   if (code < 0) {

From 096b624340babe5bf5d03ce8d118b356395ca3b9 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 30 Jun 2020 15:20:27 +0000
Subject: [PATCH 33/48] crash while calc tagLen

---
 src/mnode/src/mnodeTable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 23b62f1aa3..5ebfb164df 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1987,7 +1987,7 @@ static int32_t mnodeAutoCreateChildTable(SMnodeMsg *pMsg) {
   pCreateMsg->getMeta = 1;
   pCreateMsg->contLen = htonl(contLen);
 
-  memcpy(pCreateMsg->schema, pTags, contLen);
+  memcpy(pCreateMsg->schema, pTags, contLen - sizeof(SCMCreateTableMsg));
   mDebug("app:%p:%p, table:%s, start to create on demand, tagLen:%d stable:%s",
          pMsg->rpcMsg.ahandle, pMsg, pInfo->tableId, tagLen, pTags->name);
 

From 505b9a909161aef7f016f5def3a9e15700c75b5f Mon Sep 17 00:00:00 2001
From: dengyihao <luomoxyz@126.com>
Date: Wed, 1 Jul 2020 02:38:17 +0800
Subject: [PATCH 34/48] fix test case

---
 tests/pytest/query/queryJoin.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/pytest/query/queryJoin.py b/tests/pytest/query/queryJoin.py
index bfc493580e..6d135e1006 100644
--- a/tests/pytest/query/queryJoin.py
+++ b/tests/pytest/query/queryJoin.py
@@ -112,8 +112,7 @@ class TDTestCase:
         tdSql.query("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
         tdSql.checkRows(6)
 
-        tdSql.query("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.pid, stb_p.id, stb_p.dscrption, stb_p.pressure,stb_v.velocity from stb_p, stb_t, stb_v where stb_p.ts=stb_t.ts and stb_p.ts=stb_v.ts and stb_p.id = stb_t.id")
-        tdSql.checkRows(2)
+        tdSql.error("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.pid, stb_p.id, stb_p.dscrption, stb_p.pressure,stb_v.velocity from stb_p, stb_t, stb_v where stb_p.ts=stb_t.ts and stb_p.ts=stb_v.ts and stb_p.id = stb_t.id")
 
     def stop(self):
         tdSql.close()

From 37743a1fbf841b2732a9278bf684968eb7152b80 Mon Sep 17 00:00:00 2001
From: Hui Li <huili@taosdata.com>
Date: Wed, 1 Jul 2020 10:08:11 +0800
Subject: [PATCH 35/48] [TD-811]

---
 src/kit/taosdemo/taosdemo.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 3e802c9566..3265285cca 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -808,27 +808,31 @@ void *readMetric(void *sarg) {
 }
 
 void queryDB(TAOS *taos, char *command) {
-  int i = 5;
+  int i;
   TAOS_RES *pSql = NULL;
-  int32_t code = -1;
-  while (i > 0 && code != 0) {
+  int32_t   code = -1;
+
+  for (i = 0; i < 5; i++) {
+    if (NULL != pSql) {
+      taos_free_result(pSql);
+      pSql = NULL;
+    }
+    
     pSql = taos_query(taos, command);
     code = taos_errno(pSql);
-    taos_free_result(pSql);
-    pSql = NULL;
-    if (code == 0) {
+    if (0 == code) {
       break;
-    }
-    i--; 
+    }    
   }
 
   if (code != 0) {
     fprintf(stderr, "Failed to run %s, reason: %s\n", command, taos_errstr(pSql));
     taos_free_result(pSql);
-
     taos_close(taos);
     exit(EXIT_FAILURE);
   }
+
+  taos_free_result(pSql);
 }
 
 // sync insertion

From c1252c2dbee0349290dda7e8aeaddaec1390d78a Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Wed, 1 Jul 2020 11:08:19 +0800
Subject: [PATCH 36/48] TD-803: use KV to transfer tags

---
 src/client/src/tscParseInsert.c | 43 +++++++++++++--------------------
 src/client/src/tscSQLParser.c   | 25 +++++++++++++------
 src/tsdb/src/tsdbMeta.c         | 22 +++--------------
 3 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index f0c8ffebc2..fd2a9f5a8c 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -891,11 +891,15 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
       return tscInvalidSQLErrMsg(pCmd->payload, "keyword TAGS expected", sToken.z);
     }
 
+    SKVRowBuilder kvRowBuilder = {0};
+    if (tdInitKVRowBuilder(&kvRowBuilder) < 0) {
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
+    }
+
     uint32_t ignoreTokenTypes = TK_LP;
     uint32_t numOfIgnoreToken = 1;
     for (int i = 0; i < spd.numOfAssignedCols; ++i) {
-      char *  tagVal = pTag->data + spd.elems[i].offset;
-      int16_t colIndex = spd.elems[i].colIndex;
+      SSchema* pSchema = pTagSchema + spd.elems[i].colIndex;
 
       index = 0;
       sToken = tStrGetToken(sql, &index, true, numOfIgnoreToken, &ignoreTokenTypes);
@@ -911,12 +915,21 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
         sToken.n -= 2;
       }
 
-      code = tsParseOneColumnData(&pTagSchema[colIndex], &sToken, tagVal, pCmd->payload, &sql, false, tinfo.precision);
+      char tagVal[TSDB_MAX_TAGS_LEN];
+      code = tsParseOneColumnData(pSchema, &sToken, tagVal, pCmd->payload, &sql, false, tinfo.precision);
       if (code != TSDB_CODE_SUCCESS) {
         return code;
       }
+
+      tdAddColToKVRow(&kvRowBuilder, pSchema->colId, pSchema->type, tagVal);
     }
 
+    SKVRow row = tdGetKVRowFromBuilder(&kvRowBuilder);
+    pTag->dataLen = kvRowLen(row);
+    memcpy(pTag->data, row, pTag->dataLen);
+    free(row);
+    tdDestroyKVRowBuilder(&kvRowBuilder);
+
     index = 0;
     sToken = tStrGetToken(sql, &index, false, 0, NULL);
     sql += index;
@@ -924,29 +937,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
       return tscInvalidSQLErrMsg(pCmd->payload, ") expected", sToken.z);
     }
 
-    // 2. set the null value for the columns that do not assign values
-    if (spd.numOfAssignedCols < spd.numOfCols) {
-      char *ptr = pTag->data;
-
-      for (int32_t i = 0; i < spd.numOfCols; ++i) {
-        if (!spd.hasVal[i]) {  // current tag column do not have any value to insert, set it to null
-          if (pTagSchema[i].type == TSDB_DATA_TYPE_BINARY || pTagSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
-            setVardataNull(ptr, pTagSchema[i].type);
-          } else {
-            setNull(ptr, pTagSchema[i].type, pTagSchema[i].bytes);
-          }
-        }
-
-        ptr += pTagSchema[i].bytes;
-      }
-    }
-
-    // 3. calculate the actual data size of STagData
-    pCmd->payloadLen = sizeof(pTag->name) + sizeof(pTag->dataLen);
-    for (int32_t t = 0; t < numOfTags; ++t) {
-      pTag->dataLen += pTagSchema[t].bytes;
-      pCmd->payloadLen += pTagSchema[t].bytes;
-    }
+    pCmd->payloadLen = sizeof(pTag->name) + sizeof(pTag->dataLen) + pTag->dataLen;
     pTag->dataLen = htonl(pTag->dataLen);
 
     if (tscValidateName(&tableToken) != TSDB_CODE_SUCCESS) {
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index df18d7a56b..25fb2968f7 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5623,25 +5623,36 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
   SSchema* pTagSchema = tscGetTableTagSchema(pStableMeterMetaInfo->pTableMeta);
 
   STagData* pTag = &pCreateTable->usingInfo.tagdata;
-  char* tagVal = pTag->data;
+  SKVRowBuilder kvRowBuilder = {0};
+  if (tdInitKVRowBuilder(&kvRowBuilder) < 0) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+
   int32_t ret = TSDB_CODE_SUCCESS;
-  
   for (int32_t i = 0; i < pList->nExpr; ++i) {
-    if (pTagSchema[i].type == TSDB_DATA_TYPE_BINARY || pTagSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
+    SSchema* pSchema = pTagSchema + i;
+    if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) {
       // validate the length of binary
-      if (pList->a[i].pVar.nLen + VARSTR_HEADER_SIZE > pTagSchema[i].bytes) {
+      if (pList->a[i].pVar.nLen + VARSTR_HEADER_SIZE > pSchema->bytes) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
     }
     
-    ret = tVariantDump(&(pList->a[i].pVar), tagVal, pTagSchema[i].type, true);
+    char tagVal[TSDB_MAX_TAGS_LEN];
+    ret = tVariantDump(&(pList->a[i].pVar), tagVal, pSchema->type, true);
     if (ret != TSDB_CODE_SUCCESS) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
     }
 
-    tagVal += pTagSchema[i].bytes;
+    tdAddColToKVRow(&kvRowBuilder, pSchema->colId, pSchema->type, tagVal);
   }
 
+  SKVRow row = tdGetKVRowFromBuilder(&kvRowBuilder);
+  pTag->dataLen = kvRowLen(row);
+  memcpy(pTag->data, row, pTag->dataLen);
+  free(row);
+  tdDestroyKVRowBuilder(&kvRowBuilder);
+
   // table name
   if (tscValidateName(&pInfo->pCreateTableInfo->name) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
@@ -5653,7 +5664,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
     return ret;
   }
 
-  pTag->dataLen = tagVal - pTag->data;
+  //pTag->dataLen = tagVal - pTag->data;
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 13b676ee1d..7851329c47 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -233,26 +233,10 @@ STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg) {
     if (tsdbTableSetSName(pCfg, pMsg->superTableId, true) < 0) goto _err;
     if (tsdbTableSetSuperUid(pCfg, htobe64(pMsg->superTableUid)) < 0) goto _err;
 
-    // Decode tag values
-    if (pMsg->tagDataLen) {
-      int   accBytes = 0;
+    int32_t tagDataLen = htonl(pMsg->tagDataLen);
+    if (tagDataLen) {
       char *pTagData = pMsg->data + (numOfCols + numOfTags) * sizeof(SSchema);
-
-      SKVRowBuilder kvRowBuilder = {0};
-      if (tdInitKVRowBuilder(&kvRowBuilder) < 0) {
-        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
-        goto _err;
-      }
-      for (int i = numOfCols; i < numOfCols + numOfTags; i++) {
-        if (tdAddColToKVRow(&kvRowBuilder, htons(pSchema[i].colId), pSchema[i].type, pTagData + accBytes) < 0) {
-          terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
-          goto _err;
-        }
-        accBytes += htons(pSchema[i].bytes);
-      }
-
-      tsdbTableSetTagValue(pCfg, tdGetKVRowFromBuilder(&kvRowBuilder), false);
-      tdDestroyKVRowBuilder(&kvRowBuilder);
+      tsdbTableSetTagValue(pCfg, pTagData, true);
     }
   }
 

From 29adf9c752a0935a840d703549807a68805117d7 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Wed, 1 Jul 2020 11:17:48 +0800
Subject: [PATCH 37/48] TD-803: increase bufsize

---
 src/common/inc/tdataformat.h | 2 +-
 src/inc/taosmsg.h            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 1cd72eafde..da2f07da04 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -272,7 +272,7 @@ typedef struct {
   int16_t offset;
 } SColIdx;
 
-#define TD_KV_ROW_HEAD_SIZE 2 * sizeof(int16_t)
+#define TD_KV_ROW_HEAD_SIZE (2 * sizeof(int16_t))
 
 #define kvRowLen(r) (*(int16_t *)(r))
 #define kvRowNCols(r) (*(int16_t *)POINTER_SHIFT(r, sizeof(int16_t)))
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 13fa799b3f..cb25242d27 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -26,6 +26,7 @@ extern "C" {
 #include "taosdef.h"
 #include "taoserror.h"
 #include "trpc.h"
+#include "tdataformat.h"
 
 // message type
 
@@ -674,7 +675,7 @@ typedef struct SMultiTableMeta {
 typedef struct {
   int32_t dataLen;
   char name[TSDB_TABLE_ID_LEN];
-  char data[TSDB_MAX_TAGS_LEN];
+  char data[TSDB_MAX_TAGS_LEN + TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * TSDB_MAX_TAGS];
 } STagData;
 
 /*

From c14562506c6f72d84de94b4dc7bd37cc18eb9d85 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Wed, 1 Jul 2020 11:33:46 +0800
Subject: [PATCH 38/48] update perf-test script.

---
 tests/perftest-scripts/perftest-daily.sh      | 127 +++++---
 tests/perftest-scripts/perftest-taosdemo.sh   |  73 +++--
 .../perftest-tsdb-compare-13d.sh              |  52 +++-
 .../perftest-tsdb-compare-1d.sh               |  56 +++-
 .../perftest-tsdb-compare-var10k-int100s.sh   |  84 ++++++
 .../perftest-tsdb-compare-var10k-int10s.sh    |  84 ++++++
 tests/perftest-scripts/runInfluxdb.sh         | 251 ++++++++++++++++
 tests/perftest-scripts/runTDengine.sh         | 283 ++++++++++++++++++
 .../taosdemo-rps-csv2png.gnuplot              |  24 ++
 9 files changed, 947 insertions(+), 87 deletions(-)
 create mode 100755 tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
 create mode 100755 tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
 create mode 100755 tests/perftest-scripts/runInfluxdb.sh
 create mode 100755 tests/perftest-scripts/runTDengine.sh
 create mode 100644 tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot

diff --git a/tests/perftest-scripts/perftest-daily.sh b/tests/perftest-scripts/perftest-daily.sh
index b44387047c..beac8de15a 100755
--- a/tests/perftest-scripts/perftest-daily.sh
+++ b/tests/perftest-scripts/perftest-daily.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+WORK_DIR=/mnt/root
+
 # Coloured Echoes                                                                                                       #
 function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
 function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
@@ -16,6 +18,17 @@ function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") &&
 function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
 function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
 
+function setMaxTablesPerVnode {
+	echo "/etc/taos/taos.cfg maxTablesPerVnode will be set to $1"
+
+	hasText=`grep "maxTablesPerVnode" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "maxTablesPerVnode $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^maxTablesPerVnode.*$/maxTablesPerVnode '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
 function setMaxConnections {
 	echo "/etc/taos/taos.cfg maxConnection will be set to $1"
 
@@ -27,6 +40,28 @@ function setMaxConnections {
 	fi
 }
 
+function setQDebugFlag {
+	echo "/etc/taos/taos.cfg qDebugFlag will be set to $1"
+
+	hasText=`grep -w "qDebugFlag" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "qDebugFlag $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^qDebugFlag.*$/qDebugFlag '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
+function setDebugFlag {
+	echo "/etc/taos/taos.cfg DebugFlag will be set to $1"
+
+	hasText=`grep -w "DebugFlag" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "DebugFlag $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^DebugFlag.*$/DebugFlag '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
 function setWal {
 	echo "/etc/taos/taos.cfg walLevel will be set to $1"
 
@@ -47,9 +82,10 @@ function collectSysInfo {
 }
 
 function buildTDengine {
-	cd /root/TDengine
+	echoInfo "Build TDengine"
+	cd $WORK_DIR/TDengine
 
-	git remote update
+	git remote update > /dev/null
 	REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
 	LOCAL_COMMIT=`git rev-parse --short @`
 
@@ -59,29 +95,17 @@ function buildTDengine {
 		echo "repo up-to-date"
 	else
 		echo "repo need to pull"
-		git pull
+		git pull > /dev/null
 
 		LOCAL_COMMIT=`git rev-parse --short @`
 		cd debug
 		rm -rf *
-		cmake ..
+		cmake .. > /dev/null
 		make > /dev/null
 		make install
 	fi
 }
 
-function restartTaosd {
-	systemctl stop taosd
-	pkill -KILL -x taosd
-	sleep 10
-	
-	rm -rf /mnt/var/log/taos/*
-	rm -rf /mnt/var/lib/taos/*
-	
-	taosd 2>&1 > /dev/null &
-	sleep 10
-}
-
 function sendReport {
 	receiver="sdsang@taosdata.com, sangshuduo@gmail.com"
 	mimebody="MIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\n"
@@ -93,57 +117,90 @@ function sendReport {
 		(cat - && uuencode perftest-13d-wal1-$today.log perftest-13d-wal1-$today.log)| \
 		(cat - && uuencode perftest-13d-wal1-report.csv perftest-13d-wal1-report-$today.csv) | \
 		(cat - && uuencode perftest-13d-wal1-report.png perftest-13d-wal1-report-$today.png) | \
+		(cat - && uuencode perftest-var10k-int10s-wal1-$today.log perftest-var10k-int10s-wal1-$today.log)| \
+		(cat - && uuencode perftest-var10k-int10s-wal1-report.csv perftest-var10k-int10s-wal1-report-$today.csv) | \
+		(cat - && uuencode perftest-var10k-int10s-wal1-report.png perftest-var10k-int10s-wal1-report-$today.png) | \
 		(cat - && uuencode taosdemo-wal1-$today.log taosdemo-wal1-$today.log) | \
 		(cat - && uuencode taosdemo-wal1-report.csv taosdemo-wal1-report-$today.csv) | \
-		(cat - && uuencode taosdemo-rps-wal1-report.csv taosdemo-rps-wal1-report-$today.csv) | \
 		(cat - && uuencode taosdemo-wal1-report.png taosdemo-wal1-report-$today.png) | \
+		(cat - && uuencode taosdemo-rps-wal1-report.csv taosdemo-rps-wal1-report-$today.csv) | \
+		(cat - && uuencode taosdemo-rps-wal1-report.png taosdemo-rps-wal1-report-$today.png) | \
 		(cat - && uuencode perftest-1d-wal2-$today.log perftest-1d-wal2-$today.log)| \
 		(cat - && uuencode perftest-1d-wal2-report.csv perftest-1d-wal2-report-$today.csv) | \
 		(cat - && uuencode perftest-1d-wal2-report.png perftest-1d-wal2-report-$today.png) | \
 		(cat - && uuencode perftest-13d-wal2-$today.log perftest-13d-wal2-$today.log)| \
 		(cat - && uuencode perftest-13d-wal2-report.csv perftest-13d-wal2-report-$today.csv) | \
 		(cat - && uuencode perftest-13d-wal2-report.png perftest-13d-wal2-report-$today.png) | \
+		(cat - && uuencode perftest-var10k-int10s-wal2-$today.log perftest-var10k-int10s-wal2-$today.log)| \
+		(cat - && uuencode perftest-var10k-int10s-wal2-report.csv perftest-var10k-int10s-wal2-report-$today.csv) | \
+		(cat - && uuencode perftest-var10k-int10s-wal2-report.png perftest-var10k-int10s-wal2-report-$today.png) | \
 		(cat - && uuencode taosdemo-wal2-$today.log taosdemo-wal2-$today.log) | \
 		(cat - && uuencode taosdemo-wal2-report.csv taosdemo-wal2-report-$today.csv) | \
+		(cat - && uuencode taosdemo-wal2-report.png taosdemo-wal2-report-$today.png) | \
 		(cat - && uuencode taosdemo-rps-wal2-report.csv taosdemo-rps-wal2-report-$today.csv) | \
+		(cat - && uuencode taosdemo-rps-wal2-report.png taosdemo-rps-wal2-report-$today.png) | \
 		(cat - && uuencode sysinfo.log sysinfo.txt) | \
 		(cat - && uuencode taos.cfg taos-cfg-$today.txt) | \
 		ssmtp "${receiver}"
 }
 
 today=`date +"%Y%m%d"`
-cd /root
-echo -e "cron-ran-at-${today}" >> cron.log
+cd $WORK_DIR
+echo -e "cron-ran-at-${today}" >> $WORK_DIR/cron.log
 
-echoInfo "Build TDengine"
 buildTDengine
 
 ############################
-setMaxConnections 100
+setMaxConnections 1000
+setMaxTablesPerVnode 6000
+setDebugFlag 131
+setQDebugFlag 131
 
 ############################
 setWal "2"
 
-cd /root
-./perftest-tsdb-compare-1d.sh "wal2"
-
-cd /root
-./perftest-tsdb-compare-13d.sh "wal2"
-
-cd /root
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
 ./perftest-taosdemo.sh "wal2"
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-1d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-13d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-var10k-int10s.sh
+date >> $WORK_DIR/cron.log
 
 #############################
 setWal "1"
 
-cd /root
-./perftest-tsdb-compare-1d.sh "wal1"
-
-cd /root
-./perftest-tsdb-compare-13d.sh "wal1"
-
-cd /root
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
 ./perftest-taosdemo.sh "wal1"
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-1d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-13d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-var10k-int10s.sh
+date >> $WORK_DIR/cron.log
 
 #############################
 collectSysInfo
diff --git a/tests/perftest-scripts/perftest-taosdemo.sh b/tests/perftest-scripts/perftest-taosdemo.sh
index 0dd9a0572a..e459769512 100755
--- a/tests/perftest-scripts/perftest-taosdemo.sh
+++ b/tests/perftest-scripts/perftest-taosdemo.sh
@@ -1,5 +1,20 @@
 #!/bin/bash
 
+WORK_DIR=/mnt/root
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
 # Coloured Echoes 
 function red_echo      { echo -e "\033[31m$@\033[0m";   }
 function green_echo    { echo -e "\033[32m$@\033[0m";   }
@@ -17,13 +32,20 @@ function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf
 function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }
 
 function restartTaosd {
+        echo "Stop taosd"
 	systemctl stop taosd
-	pkill -KILL -x taosd
-	sleep 10
-	
-	rm -rf /mnt/var/log/taos/*
-	rm -rf /mnt/var/lib/taos/*
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
 	
+        echo "Start taosd"
 	taosd 2>&1 > /dev/null &
 	sleep 10
 }
@@ -32,7 +54,7 @@ function runCreateTableOnly {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -n 0 2>&1 | tee taosdemo-$1-$today.log"
+	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -n 0 2>&1 | tee taosdemo-$walPostfix-$today.log"
 	demoCreateTableOnly=`grep "Total:" totaltime.out|awk '{print $2}'`
 }
 
@@ -40,7 +62,7 @@ function runDeleteTableOnly {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -t 0 -D 1 2>&1 | tee taosdemo-$1-$today.log"
+	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -t 0 -D 1 2>&1 | tee taosdemo-$walPostfix-$today.log"
 	demoDeleteTableOnly=`grep "Total:" totaltime.out|awk '{print $2}'`
 }
 
@@ -48,41 +70,44 @@ function runCreateTableThenInsert {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo 2>&1 | tee -a taosdemo-$1-$today.log"
+	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo 2>&1 | tee -a taosdemo-$walPostfix-$today.log"
 	demoTableAndInsert=`grep "Total:" totaltime.out|awk '{print $2}'`
-	demoRPS=`grep "records\/second" taosdemo-$1-$today.log | tail -n1 | awk '{print $13}'`
+	demoRPS=`grep "records\/second" taosdemo-$walPostfix-$today.log | tail -n1 | awk '{print $13}'`
 }	
 
 function generateTaosdemoPlot {
-	echo "${today} $1, demoCreateTableOnly: ${demoCreateTableOnly}, demoDeleteTableOnly: ${demoDeleteTableOnly}, demoTableAndInsert: ${demoTableAndInsert}" | tee -a taosdemo-$today.log
-	echo "${today}, ${demoCreateTableOnly}, ${demoDeleteTableOnly}, ${demoTableAndInsert}">> taosdemo-$1-report.csv
-	echo "${today}, ${demoRPS}" >> taosdemo-rps-$1-report.csv
+	echo "${today} $walPostfix, demoCreateTableOnly: ${demoCreateTableOnly}, demoDeleteTableOnly: ${demoDeleteTableOnly}, demoTableAndInsert: ${demoTableAndInsert}" | tee -a taosdemo-$today.log
+	echo "${today}, ${demoCreateTableOnly}, ${demoDeleteTableOnly}, ${demoTableAndInsert}">> taosdemo-$walPostfix-report.csv
+	echo "${today}, ${demoRPS}" >> taosdemo-rps-$walPostfix-report.csv
 	
-	csvLines=`cat taosdemo-$1-report.csv | wc -l`
+	csvLines=`cat taosdemo-$walPostfix-report.csv | wc -l`
 
 	if [ "$csvLines" -gt "10" ]; then
-		sed -i '1d' taosdemo-$1-report.csv
+		sed -i '1d' taosdemo-$walPostfix-report.csv
 	fi
 
-	csvLines=`cat taosdemo-rps-$1-report.csv | wc -l`
+	csvLines=`cat taosdemo-rps-$walPostfix-report.csv | wc -l`
 
 	if [ "$csvLines" -gt "10" ]; then
-		sed -i '1d' taosdemo-rps-$1-report.csv
+		sed -i '1d' taosdemo-rps-$walPostfix-report.csv
 	fi
 
-	gnuplot -e "filename='taosdemo-$1-report'" -p taosdemo-csv2png.gnuplot
-	gnuplot -e "filename='taosdemo-rps-$1-report'" -p taosdemo-rps-csv2png.gnuplot
+	gnuplot -e "filename='taosdemo-$walPostfix-report'" -p taosdemo-csv2png.gnuplot
+	gnuplot -e "filename='taosdemo-rps-$walPostfix-report'" -p taosdemo-rps-csv2png.gnuplot
 }
 
 today=`date +"%Y%m%d"`
 
-cd /root
+cd $WORK_DIR
 echoInfo "Test Create Table Only "
-runCreateTableOnly $1
+runCreateTableOnly
 echoInfo "Test Create Table then Insert data"
-runDeleteTableOnly $1
+runDeleteTableOnly
 echoInfo "Test Create Table then Insert data"
-runCreateTableThenInsert $1
+runCreateTableThenInsert
 echoInfo "Generate plot for taosdemo"
-generateTaosdemoPlot $1
-echoInfo "End of TaosDemo Test"
+generateTaosdemoPlot
+
+tar czf $WORK_DIR/taos-log-taosdemo-$today.tar.gz $logDir/*
+
+echoInfo "End of TaosDemo Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-13d.sh b/tests/perftest-scripts/perftest-tsdb-compare-13d.sh
index 8b326d2d41..110ab9e5fa 100755
--- a/tests/perftest-scripts/perftest-tsdb-compare-13d.sh
+++ b/tests/perftest-scripts/perftest-tsdb-compare-13d.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
 # Coloured Echoes                                                                                                       #
 function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
 function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
@@ -17,13 +33,20 @@ function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf
 function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
 
 function restartTaosd {
+        echo "Stop taosd"
 	systemctl stop taosd
-	pkill -KILL -x taosd
-	sleep 10
-	
-	rm -rf /mnt/var/log/taos/*
-	rm -rf /mnt/var/lib/taos/*
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
 	
+        echo "Start taosd"
 	taosd 2>&1 > /dev/null &
 	sleep 10
 }
@@ -32,27 +55,30 @@ function runPerfTest13d {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	cd /home/taos/tliu/timeseriesdatabase-comparisons/build/tsdbcompare
-	./runreal-13d-csv.sh $1 2>&1 | tee /root/perftest-13d-$1-$today.log
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -d 13 -w -q 2>&1 | tee $WORK_DIR/perftest-13d-$walPostfix-$today.log
 }
 
 function generatePerfPlot13d {
-	cd /root
+	cd $WORK_DIR
 
-	csvLines=`cat perftest-13d-$1-report.csv | wc -l`
+	csvLines=`cat perftest-13d-$walPostfix-report.csv | wc -l`
 
 	if [ "$csvLines" -gt "10" ]; then
-		sed -i '1d' perftest-13d-$1-report.csv
+		sed -i '1d' perftest-13d-$walPostfix-report.csv
 	fi
 
-	gnuplot -e "filename='perftest-13d-$1-report'" -p perftest-csv2png.gnuplot
+	gnuplot -e "filename='perftest-13d-$walPostfix-report'" -p perftest-csv2png.gnuplot
 }
 
 today=`date +"%Y%m%d"`
-cd /root
+cd $WORK_DIR
 
 echoInfo "run Performance Test with 13 days data"
 runPerfTest13d $1
 echoInfo "Generate plot of 13 days data"
 generatePerfPlot13d $1
-echoInfo "End of TSDB-Compare 13-days-data Test"
+
+tar czf $WORK_DIR/taos-log-13d-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare 13-days-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-1d.sh b/tests/perftest-scripts/perftest-tsdb-compare-1d.sh
index 0931480e21..9e8bc697bc 100755
--- a/tests/perftest-scripts/perftest-tsdb-compare-1d.sh
+++ b/tests/perftest-scripts/perftest-tsdb-compare-1d.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
 # Coloured Echoes                                                                                                       #
 function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
 function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
@@ -17,13 +33,20 @@ function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf
 function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
 
 function restartTaosd {
+        echo "Stop taosd"
 	systemctl stop taosd
-	pkill -KILL -x taosd
-	sleep 10
-	
-	rm -rf /mnt/var/log/taos/*
-	rm -rf /mnt/var/lib/taos/*
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
 	
+        echo "Start taosd"
 	taosd 2>&1 > /dev/null &
 	sleep 10
 }
@@ -32,27 +55,30 @@ function runPerfTest1d {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	cd /home/taos/tliu/timeseriesdatabase-comparisons/build/tsdbcompare
-	./runreal-1d-csv.sh $1 2>&1 | tee /root/perftest-1d-$1-$today.log
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -d 1 -w -q 2>&1 | tee $WORK_DIR/perftest-1d-$walPostfix-$today.log
 }
 
 function generatePerfPlot1d {
-	cd /root
+	cd $WORK_DIR
 
-	csvLines=`cat perftest-1d-$1-report.csv | wc -l`
+	csvLines=`cat perftest-1d-$walPostfix-report.csv | wc -l`
 
 	if [ "$csvLines" -gt "10" ]; then
-		sed -i '2d' perftest-1d-$1-report.csv
+		sed -i '1d' perftest-1d-$walPostfix-report.csv
 	fi
 
-	gnuplot -e "filename='perftest-1d-$1-report'" -p perftest-csv2png.gnuplot
+	gnuplot -e "filename='perftest-1d-$walPostfix-report'" -p perftest-csv2png.gnuplot
 }
 
 today=`date +"%Y%m%d"`
-cd /root
+cd $WORK_DIR
 
 echoInfo "run Performance Test with 1 day data"
-runPerfTest1d $1
+runPerfTest1d
 echoInfo "Generate plot of 1 day data"
-generatePerfPlot1d $1
-echoInfo "End of TSDB-Compare 1-day-data Test"
+generatePerfPlot1d
+
+tar czf $WORK_DIR/taos-log-1d-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare 1-day-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
new file mode 100755
index 0000000000..5fc5b9d03a
--- /dev/null
+++ b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
+# Coloured Echoes                                                                                                       #
+function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
+function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }                                                               #
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }                                                               #
+# Coloured Printfs                                                                                                      #
+function red_printf    { printf "\033[31m$@\033[0m";    }                                                               #
+function green_printf  { printf "\033[32m$@\033[0m";    }                                                               #
+function yellow_printf { printf "\033[33m$@\033[0m";    }                                                               #
+function white_printf  { printf "\033[1;37m$@\033[0m";  }                                                               #
+# Debugging Outputs                                                                                                     #
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }                      #
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }                      #
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
+
+function restartTaosd {
+        echo "Stop taosd"
+	systemctl stop taosd
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
+	
+        echo "Start taosd"
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+function runPerfTestVar10K {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -v 10000 -i 100 -w -q 2>&1 | tee $WORK_DIR/perftest-var10k-int100s-$walPostfix-$today.log
+}
+
+function generatePerfPlotVar10K {
+	cd $WORK_DIR
+
+	csvLines=`cat perftest-var10k-int100s-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' perftest-var10k-int100s-$walPostfix-report.csv
+	fi
+
+	gnuplot -e "filename='perftest-var10k-int100s-$walPostfix-report'" -p perftest-csv2png.gnuplot
+}
+
+today=`date +"%Y%m%d"`
+cd $WORK_DIR
+
+echoInfo "run Performance Test with 10K tables data"
+runPerfTestVar10K
+echoInfo "Generate plot of 10K tables data"
+generatePerfPlotVar10K
+
+tar czf $WORK_DIR/taos-log-var10k-int100s-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare var10k-int100s-tables-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
new file mode 100755
index 0000000000..bafa04f174
--- /dev/null
+++ b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
+# Coloured Echoes                                                                                                       #
+function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
+function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }                                                               #
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }                                                               #
+# Coloured Printfs                                                                                                      #
+function red_printf    { printf "\033[31m$@\033[0m";    }                                                               #
+function green_printf  { printf "\033[32m$@\033[0m";    }                                                               #
+function yellow_printf { printf "\033[33m$@\033[0m";    }                                                               #
+function white_printf  { printf "\033[1;37m$@\033[0m";  }                                                               #
+# Debugging Outputs                                                                                                     #
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }                      #
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }                      #
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
+
+function restartTaosd {
+        echo "Stop taosd"
+	systemctl stop taosd
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
+	
+        echo "Start taosd"
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+function runPerfTestVar10K {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -v 10000 -w -q 2>&1 | tee $WORK_DIR/perftest-var10k-int10s-$walPostfix-$today.log
+}
+
+function generatePerfPlotVar10K {
+	cd $WORK_DIR
+
+	csvLines=`cat perftest-var10k-int10s-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' perftest-var10k-int10s-$walPostfix-report.csv
+	fi
+
+	gnuplot -e "filename='perftest-var10k-int10s-$walPostfix-report'" -p perftest-csv2png.gnuplot
+}
+
+today=`date +"%Y%m%d"`
+cd $WORK_DIR
+
+echoInfo "run Performance Test with 10K tables data"
+runPerfTestVar10K
+echoInfo "Generate plot of 10K tables data"
+generatePerfPlotVar10K
+
+tar czf $WORK_DIR/taos-log-var10k-int10s-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare var10k-int10s-tables-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/runInfluxdb.sh b/tests/perftest-scripts/runInfluxdb.sh
new file mode 100755
index 0000000000..e8975b05cf
--- /dev/null
+++ b/tests/perftest-scripts/runInfluxdb.sh
@@ -0,0 +1,251 @@
+#!/bin/bash
+#set -x
+
+WORK_DIR=/mnt/root
+DATA_DIR=/mnt/data
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+# default value
+DEFAULT_BATCH=5000
+DEFAULT_DAYS=1
+DEFAULT_INTERVAL=1
+DEFAULT_SCALEVAR=10
+DEFAULT_DOPREPARE=false
+DEFAULT_DOWRITE=false
+DEFAULT_DOQUERY=false
+
+# function 
+function do_prepare {
+	echo
+	echo "---------------Generating Data-----------------"
+	echo
+
+	echo 
+	echo "Prepare data for InfluxDB...."
+
+	echo "bin/bulk_data_gen -seed 123 -format influx-bulk -sampling-interval $interval_s \
+		-scale-var $scalevar -use-case devops -timestamp-start $TIME_START \
+		-timestamp-end $TIME_END > $DATA_FILE"
+
+	bin/bulk_data_gen -seed 123 -format influx-bulk -sampling-interval $interval_s \
+		-scale-var $scalevar -use-case devops -timestamp-start $TIME_START \
+		-timestamp-end $TIME_END > $DATA_FILE
+}
+
+function do_write {
+	echo "cat $DATA_FILE | bin/bulk_load_influx \
+		--batch-size=$batch --workers=20 --urls=http://172.15.1.5:8086 | grep loaded"
+	INFLUXRES=`cat $DATA_FILE | bin/bulk_load_influx \
+		--batch-size=$batch --workers=20 --urls="http://172.15.1.5:8086" | grep loaded`
+
+	echo -e "${GREEN}InfluxDB writing result:${NC}"
+	echo -e "${GREEN}$INFLUXRES${NC}"
+	DATA=`echo $INFLUXRES|awk '{print($2)}'`
+	TMP=`echo $INFLUXRES|awk '{print($5)}'`
+	IFWTM=`echo ${TMP%s*}`
+}
+
+function do_query {
+
+	echo
+	echo "------------------Querying Data-----------------"
+	echo
+
+	echo 
+	echo  "start query test, query max from 8 hosts group by 1 hour, InfluxDB"
+	echo
+
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+	echo "IFQS1=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-all -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall"
+
+	IFQS1=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-all -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 1 result:${NC}"
+	echo -e "${GREEN}$IFQS1${NC}"
+	TMP=`echo $IFQS1|awk '{print($4)}'`
+	IFQ1=`echo ${TMP%s*}`
+
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+	echo "IFQS2=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-allbyhr -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls=http://172.15.1.5:8086  -workers 50 -print-interval 0|grep wall"
+
+	IFQS2=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-allbyhr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  \
+		-urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 2 result:${NC}"
+	echo -e "${GREEN}$IFQS2${NC}"
+	TMP=`echo $IFQS2|awk '{print($4)}'`
+	IFQ2=`echo ${TMP%s*}`
+
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+	echo "IFQS3=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-12-hr -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls=http://172.15.1.5:8086  -workers 50 -print-interval 0|grep wall"
+
+	IFQS3=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-12-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  \
+		-urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 3 result:${NC}"
+	echo -e "${GREEN}$IFQS3${NC}"
+	TMP=`echo $IFQS3|awk '{print($4)}'`
+	IFQ3=`echo ${TMP%s*}`
+
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+	echo "IFQS4=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-1-hr -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls=http://172.15.1.5:8086  -workers 50 -print-interval 0|grep wall"
+
+	IFQS4=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-1-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  \
+		-urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 4 result:${NC}"
+	echo -e "${GREEN}$IFQS4${NC}"
+	TMP=`echo $IFQS4|awk '{print($4)}'`
+	IFQ4=`echo ${TMP%s*}`
+
+}
+
+batch=$DEFAULT_BATCH
+days=$DEFAULT_DAYS
+interval=$DEFAULT_INTERVAL
+scalevar=$DEFAULT_SCALEVAR
+doprepare=$DEFAULT_DOPREPARE
+dowrite=$DEFAULT_DOWRITE
+doquery=$DEFAULT_DOQUERY
+
+help="$(basename "$0") [-h] [-b batchsize] [-d data-of-days] [-i interval] [-v scalevar] [-p false for don't prepare] [-w false for don't do write] [-q false for don't do query]"
+
+while getopts ':b:d:i:v:pwqh' flag; do
+	case "${flag}" in
+		b) batch=${OPTARG};;
+		d) days=${OPTARG};;
+		i) interval=${OPTARG};;
+		v) scalevar=${OPTARG};;
+		p) doprepare=${OPTARG};;
+		w) dowrite=${OPTARG};;
+		q) doquery=${OPTARG};;
+		:) echo -e "{RED}Missing argument!{NC}"
+			echo "$help"
+			exit 1
+			;;
+		h) echo "$help"
+			exit 1
+			;;
+	esac
+done
+
+if [[ $scalevar -eq 10000 ]]
+then
+	TIME_START="2018-01-01T00:00:00Z"
+	TIME_END="2018-01-02T00:00:00Z"
+
+	if [[ $interval -eq 100 ]]
+	then
+		interval_s=100s
+		DATA_FILE=$DATA_DIR/influxdb-var10k-int100s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-var10k-int100s.csv
+	else
+		interval_s=10s
+		DATA_FILE=$DATA_DIR/influxdb-var10k-int10s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-var10k-int10s.csv
+	fi
+else
+	if [[ $days -eq 1 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-02T00:00:00Z"
+		DATA_FILE=$DATA_DIR/influxdb-1d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-1d.csv
+	elif [[ $days -eq 13 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-14T00:00:00Z"
+		DATA_FILE=$DATA_DIR/influxdb-13d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-13d.csv
+	else
+		echo -e "{RED} don't support input $days{NC}"
+		exit 1
+	fi
+	interval_s=${interval}s
+fi
+
+echo "TIME_START: $TIME_START, TIME_END: $TIME_END, DATA_FILE: $DATA_FILE"
+echo "doprepare: $doprepare, dowrite: $dowrite, doquery: $doquery"
+
+if $doprepare;
+then
+	do_prepare
+fi
+
+docker network create --ip-range 172.15.1.255/24 --subnet 172.15.1.1/16 tsdbcomp >>/dev/null 2>&1
+INFLUX=`docker run -d -p 8086:8086 --net tsdbcomp --ip 172.15.1.5 influxdb` >>/dev/null 2>&1
+sleep 10
+
+if $dowrite;
+then
+	echo -e "Start test InfluxDB writting, result in ${GREEN}Green line${NC}"
+	do_write
+fi
+
+if $doquery;
+then
+	echo -e "Start test InfluxDB query, result in ${GREEN}Green line${NC}"
+	do_query
+fi
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+if $dowrite;
+then
+	echo -e "       Writing $DATA records test takes:          "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFWTM
+	echo    "------------------------------------------------------"
+fi
+
+if $doquery;
+then
+	echo    "                   Query test cases:                "
+	echo    " case 1: select the max(value) from all data    "
+	echo    " filtered out 8 hosts                                 "
+	echo    "       Query test case 1 takes:                      "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ1
+	echo    "------------------------------------------------------"
+	echo    " case 2: select the max(value) from all data          "
+	echo    " filtered out 8 hosts with an interval of 1 hour     "
+	echo    " case 2 takes:                                       "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ2
+	echo    "------------------------------------------------------"
+	echo    " case 3: select the max(value) from random 12 hours"
+	echo    " data filtered out 8 hosts with an interval of 10 min         "
+	echo    " filtered out 8 hosts interval(1h)                   "
+	echo    " case 3 takes:                                       "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ3
+	echo    "------------------------------------------------------"
+	echo    " case 4: select the max(value) from random 1 hour data  "
+	echo    " data filtered out 8 hosts with an interval of 1 min         "
+	echo    " case 4 takes:                                        "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ4
+	echo    "------------------------------------------------------"
+fi
+
+docker stop $INFLUX >>/dev/null 2>&1
+docker container rm -f $INFLUX >>/dev/null 2>&1
+docker network rm tsdbcomp >>/dev/null 2>&1
+
+today=`date +"%Y%m%d"`
+echo "${today}, ${IFWTM}, ${IFQ1}, ${IFQ2}, ${IFQ3}, ${IFQ4}" >> $RECORD_CSV_FILE
diff --git a/tests/perftest-scripts/runTDengine.sh b/tests/perftest-scripts/runTDengine.sh
new file mode 100755
index 0000000000..6c5cf4e55e
--- /dev/null
+++ b/tests/perftest-scripts/runTDengine.sh
@@ -0,0 +1,283 @@
+#!/bin/bash
+#set -x
+
+WORK_DIR=/mnt/root
+DATA_DIR=/mnt/data
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+# default value
+DEFAULT_BATCH=5000
+DEFAULT_DAYS=1
+DEFAULT_INTERVAL=1
+DEFAULT_SCALEVAR=10
+DEFAULT_DOPREPARE=false
+DEFAULT_DOWRITE=false
+DEFAULT_DOQUERY=false
+
+# function 
+function do_prepare {
+	echo
+	echo "---------------Generating Data-----------------"
+	echo
+
+	echo 
+	echo "Prepare data for TDengine...."
+
+	# bin/bulk_data_gen -seed 123 -format tdengine -tdschema-file config/TDengineSchema.toml -scale-var 100 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z"  > $DATA_DIR/tdengine.dat
+	echo "bin/bulk_data_gen -seed 123 -format tdengine -sampling-interval $interval_s \
+		-tdschema-file config/TDengineSchema.toml -scale-var $scalevar \
+		-use-case devops -timestamp-start $TIME_START \ 
+		-timestamp-end $TIME_END \ 
+	       	> $DATA_FILE"
+
+	bin/bulk_data_gen -seed 123 -format tdengine -sampling-interval $interval_s \
+		-tdschema-file config/TDengineSchema.toml -scale-var $scalevar \
+		-use-case devops -timestamp-start $TIME_START \
+		-timestamp-end $TIME_END  \
+		> $DATA_FILE
+}
+
+function do_write {
+	echo "TDENGINERES=cat $DATA_FILE |bin/bulk_load_tdengine --url 127.0.0.1:0 \
+		--batch-size $batch -do-load -report-tags n1 -workers 20 -fileout=false| grep loaded"
+
+	TDENGINERES=`cat $DATA_FILE |bin/bulk_load_tdengine --url 127.0.0.1:0 \
+		--batch-size $batch -do-load -report-tags n1 -workers 20 -fileout=false| grep loaded`
+
+	echo
+	echo -e "${GREEN}TDengine writing result:${NC}"
+	echo -e "${GREEN}$TDENGINERES${NC}"
+	DATA=`echo $TDENGINERES|awk '{print($2)}'`
+	TMP=`echo $TDENGINERES|awk '{print($5)}'`
+	TDWTM=`echo ${TMP%s*}`
+
+}
+
+function do_query {
+
+	echo
+	echo "------------------Querying Data-----------------"
+	echo
+
+	echo 
+	echo  "start query test, query max from 8 hosts group by 1 hour, TDengine"
+	echo
+
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+	echo "TDQS1=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-all \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS1=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-all \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 1 result:${NC}"
+	echo -e "${GREEN}$TDQS1${NC}"
+	TMP=`echo $TDQS1|awk '{print($4)}'`
+	TDQ1=`echo ${TMP%s*}`
+
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+	echo "TDQS2=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-allbyhr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS2=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-allbyhr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+
+	echo
+	echo -e "${GREEN}TDengine query test case 2 result:${NC}"
+	echo -e "${GREEN}$TDQS2${NC}"
+	TMP=`echo $TDQS2|awk '{print($4)}'`
+	TDQ2=`echo ${TMP%s*}`
+
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+	echo "TDQS3=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-12-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS3=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-12-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 3 result:${NC}"
+	echo -e "${GREEN}$TDQS3${NC}"
+	TMP=`echo $TDQS3|awk '{print($4)}'`
+	TDQ3=`echo ${TMP%s*}`
+
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+	echo "TDQS4=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-1-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS4=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-1-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 4 result:${NC}"
+	echo -e "${GREEN}$TDQS4${NC}"
+	TMP=`echo $TDQS4|awk '{print($4)}'`
+	TDQ4=`echo ${TMP%s*}`
+
+}
+
+batch=$DEFAULT_BATCH
+days=$DEFAULT_DAYS
+interval=$DEFAULT_INTERVAL
+scalevar=$DEFAULT_SCALEVAR
+doprepare=$DEFAULT_DOPREPARE
+dowrite=$DEFAULT_DOWRITE
+doquery=$DEFAULT_DOQUERY
+
+help="$(basename "$0") [-h] [-b batchsize] [-d data-of-days] [-i interval] [-v scalevar] [-p false for don't prepare] [-w false for don't do write] [-q false for don't do query]"
+
+while getopts ':b:d:i:v:pwqh' flag; do
+	case "${flag}" in
+		b) batch=${OPTARG};;
+		d) days=${OPTARG};;
+		i) interval=${OPTARG};;
+		v) scalevar=${OPTARG};;
+		p) doprepare=${OPTARG};;
+		w) dowrite=${OPTARG};;
+		q) doquery=${OPTARG};;
+		:) echo -e "{RED}Missing argument!{NC}"
+			echo "$help"
+			exit 1
+			;;
+		h) echo "$help"
+			exit 1
+			;;
+	esac
+done
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+echo -e "${GREEN} $walPostfix found! ${NC}"
+
+if [[ $scalevar -eq 10000 ]]
+then
+	TIME_START="2018-01-01T00:00:00Z"
+	TIME_END="2018-01-02T00:00:00Z"
+
+	if [[ $interval -eq 100 ]]
+	then
+		interval_s=100s
+		DATA_FILE=$DATA_DIR/tdengine-var10k-int100s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-var10k-int100s-$walPostfix-report.csv
+	else
+		interval_s=10s
+		DATA_FILE=$DATA_DIR/tdengine-var10k-int10s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-var10k-int10s-$walPostfix-report.csv
+	fi
+else
+	if [[ $days -eq 1 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-02T00:00:00Z"
+		DATA_FILE=$DATA_DIR/tdengine-1d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-1d-$walPostfix-report.csv
+	elif [[ $days -eq 13 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-14T00:00:00Z"
+		DATA_FILE=$DATA_DIR/tdengine-13d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-13d-$walPostfix-report.csv
+	else
+		echo -e "{RED} don't support input $days{NC}"
+		exit 1
+	fi
+
+	interval_s=${interval}s
+fi
+
+echo "TIME_START: $TIME_START, TIME_END: $TIME_END, DATA_FILE: $DATA_FILE"
+echo "doprepare: $doprepare, dowrite: $dowrite, doquery: $doquery"
+
+if $doprepare;
+then
+	do_prepare
+fi
+
+echo
+
+if $dowrite;
+then
+	echo -e "Start test TDengine writting, result in ${GREEN}Green line${NC}"
+	do_write
+fi
+
+if $doquery;
+then
+	echo -e "Start test TDengine query, result in ${GREEN}Green line${NC}"
+	do_query
+fi
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+if $dowrite;
+then
+	echo -e "       Writing $DATA records test takes:          "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDWTM
+	echo    "------------------------------------------------------"
+fi
+
+if $doquery;
+then
+	echo    "                   Query test cases:                "
+	echo    " case 1: select the max(value) from all data    "
+	echo    " filtered out 8 hosts                                 "
+	echo    "       Query test case 1 takes:                      "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ1
+	echo    "------------------------------------------------------"
+	echo    " case 2: select the max(value) from all data          "
+	echo    " filtered out 8 hosts with an interval of 1 hour     "
+	echo    " case 2 takes:                                       "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ2
+	echo    "------------------------------------------------------"
+	echo    " case 3: select the max(value) from random 12 hours"
+	echo    " data filtered out 8 hosts with an interval of 10 min         "
+	echo    " filtered out 8 hosts interval(1h)                   "
+	echo    " case 3 takes:                                       "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ3
+	echo    "------------------------------------------------------"
+	echo    " case 4: select the max(value) from random 1 hour data  "
+	echo    " data filtered out 8 hosts with an interval of 1 min         "
+	echo    " case 4 takes:                                        "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ4
+	echo    "------------------------------------------------------"
+fi
+
+#bulk_query_gen/bulk_query_gen  -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_influxdb/query_benchmarker_influxdb  -urls="http://172.26.89.231:8086" 
+#bulk_query_gen/bulk_query_gen  -format tdengine -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_tdengine/query_benchmarker_tdengine  -urls="http://172.26.89.231:6020" 
+today=`date +"%Y%m%d"`
+echo "${today}, ${TDWTM}, ${TDQ1}, ${TDQ2}, ${TDQ3}, ${TDQ4}" >> $RECORD_CSV_FILE
diff --git a/tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot b/tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot
new file mode 100644
index 0000000000..a7fcb4bd43
--- /dev/null
+++ b/tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot
@@ -0,0 +1,24 @@
+#!/user/bin/gnuplot
+reset
+set terminal png
+
+set title filename font ",20"
+
+set ylabel "Time in Seconds"
+
+set xdata time
+set timefmt "%Y%m%d"
+set format x "%Y-%m-%d"
+set xlabel "Date"
+
+set style data linespoints
+
+set terminal pngcairo size 1024,768 enhanced font 'Segoe UI, 10'
+set output filename . '.png'
+set datafile separator ','
+
+set key reverse Left outside
+set grid
+
+
+plot filename . '.csv' 	using 1:2  title "Request Per Second"

From 13f8b063e5090ebad8547b3defbcb9cfb560ef93 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Wed, 1 Jul 2020 11:49:41 +0800
Subject: [PATCH 39/48] fix crash when there are 2 or more binary columns

---
 src/client/src/tscUtil.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 259bcd4cbd..26a81c597f 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -625,18 +625,31 @@ static int trimDataBlock(void* pDataBlock, STableDataBlocks* pTableDataBlock, bo
   return len;
 }
 
+static int32_t getRowExpandSize(STableMeta* pTableMeta) {
+  int32_t result = TD_DATA_ROW_HEAD_SIZE;
+  int32_t columns = tscGetNumOfColumns(pTableMeta);
+  SSchema* pSchema = tscGetTableSchema(pTableMeta);
+  for(int32_t i = 0; i < columns; i++) {
+    if (IS_VAR_DATA_TYPE((pSchema + i)->type)) {
+      result += TYPE_BYTES[TSDB_DATA_TYPE_BINARY];
+    }
+  }
+  return result;
+}
+
 int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SArray* pTableDataBlockList) {
   SSqlCmd* pCmd = &pSql->cmd;
 
   // the maximum expanded size in byte when a row-wise data is converted to SDataRow format
-  const int32_t MAX_EXPAND_SIZE = TD_DATA_ROW_HEAD_SIZE + TYPE_BYTES[TSDB_DATA_TYPE_BINARY];
+  STableDataBlocks* pOneTableBlock = taosArrayGetP(pTableDataBlockList, 0);
+  int32_t expandSize = getRowExpandSize(pOneTableBlock->pTableMeta);
 
   void* pVnodeDataBlockHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false);
   SArray* pVnodeDataBlockList = taosArrayInit(8, POINTER_BYTES);
 
   size_t total = taosArrayGetSize(pTableDataBlockList);
   for (int32_t i = 0; i < total; ++i) {
-    STableDataBlocks* pOneTableBlock = taosArrayGetP(pTableDataBlockList, i);
+    pOneTableBlock = taosArrayGetP(pTableDataBlockList, i);
     STableDataBlocks* dataBuf = NULL;
     
     int32_t ret =
@@ -650,7 +663,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SArray* pTableDataBlockList) {
     }
 
     SSubmitBlk* pBlocks = (SSubmitBlk*) pOneTableBlock->pData;
-    int64_t destSize = dataBuf->size + pOneTableBlock->size + pBlocks->numOfRows * MAX_EXPAND_SIZE;
+    int64_t destSize = dataBuf->size + pOneTableBlock->size + pBlocks->numOfRows * expandSize;
 
     if (dataBuf->nAllocSize < destSize) {
       while (dataBuf->nAllocSize < destSize) {
@@ -678,8 +691,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SArray* pTableDataBlockList) {
     tscDebug("%p tableId:%s, sid:%d rows:%d sversion:%d skey:%" PRId64 ", ekey:%" PRId64, pSql, pOneTableBlock->tableId,
         pBlocks->tid, pBlocks->numOfRows, pBlocks->sversion, GET_INT64_VAL(pBlocks->data), GET_INT64_VAL(ekey));
 
-
-    int32_t len = pBlocks->numOfRows * (pOneTableBlock->rowSize + MAX_EXPAND_SIZE);
+    int32_t len = pBlocks->numOfRows * (pOneTableBlock->rowSize + expandSize);
 
     pBlocks->tid = htonl(pBlocks->tid);
     pBlocks->uid = htobe64(pBlocks->uid);

From c43321fceafcf0a358fca0af9506e2a3a67f0e63 Mon Sep 17 00:00:00 2001
From: Ping Xiao <xiaopingcs@outlook.com>
Date: Wed, 1 Jul 2020 11:53:48 +0800
Subject: [PATCH 40/48] fix a runtime error

---
 tests/pytest/query/queryMetaData.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/pytest/query/queryMetaData.py b/tests/pytest/query/queryMetaData.py
index 01c63c3f4a..8fb9d9bf3a 100755
--- a/tests/pytest/query/queryMetaData.py
+++ b/tests/pytest/query/queryMetaData.py
@@ -58,7 +58,7 @@ class MetadataQuery:
         cursor.execute("use test")
         base = threadID * self.tables
 
-        tablesPerThread = (int) self.tables / self.numOfTherads
+        tablesPerThread = int (self.tables / self.numOfTherads)
         for i in range(tablesPerThread):
             cursor.execute(
                 '''create table t%d using meters tags(

From e0acd602e0c4f3af87ba34cbad85ca85594705f5 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 1 Jul 2020 13:31:26 +0800
Subject: [PATCH 41/48] [TD-814] invalid read while close http connect

---
 src/plugins/http/src/httpContext.c |  9 +++++++--
 src/plugins/http/src/httpHandle.c  | 24 +++++++++++------------
 src/plugins/http/src/httpJson.c    | 16 +++++++--------
 src/plugins/http/src/httpServer.c  |  2 --
 src/plugins/http/src/httpSystem.c  |  6 ++++--
 src/util/src/tcache.c              | 31 ++++++++++++++++--------------
 6 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/src/plugins/http/src/httpContext.c b/src/plugins/http/src/httpContext.c
index b078be5930..b09f34b562 100644
--- a/src/plugins/http/src/httpContext.c
+++ b/src/plugins/http/src/httpContext.c
@@ -141,10 +141,15 @@ HttpContext *httpGetContext(void *ptr) {
 void httpReleaseContext(HttpContext *pContext) {
   int32_t refCount = atomic_sub_fetch_32(&pContext->refCount, 1);
   assert(refCount >= 0);
-  httpDebug("context:%p, fd:%d, is releasd, refCount:%d", pContext, pContext->fd, refCount);
+  httpDebug("context:%p, is releasd, refCount:%d", pContext, refCount);
 
   HttpContext **ppContext = pContext->ppContext;
-  taosCacheRelease(tsHttpServer.contextCache, (void **)(&ppContext), false);
+  if (tsHttpServer.contextCache != NULL) {
+    taosCacheRelease(tsHttpServer.contextCache, (void **)(&ppContext), false);
+  } else {
+    httpDebug("context:%p, won't be destroyed for cache is already released", pContext);
+    // httpDestroyContext((void **)(&ppContext));
+  }
 }
 
 bool httpInitContext(HttpContext *pContext) {
diff --git a/src/plugins/http/src/httpHandle.c b/src/plugins/http/src/httpHandle.c
index 758286344a..056fe425d4 100644
--- a/src/plugins/http/src/httpHandle.c
+++ b/src/plugins/http/src/httpHandle.c
@@ -157,7 +157,7 @@ bool httpGetHttpMethod(HttpContext* pContext) {
   pParser->method.pos[pParser->method.len] = 0;
   pParser->pLast = pSeek + 1;
 
-  httpDebug("context:%p, fd:%d, ip:%s, httpMethod:%s", pContext, pContext->fd, pContext->ipstr, pParser->method.pos);
+  httpTrace("context:%p, fd:%d, ip:%s, httpMethod:%s", pContext, pContext->fd, pContext->ipstr, pParser->method.pos);
   return true;
 }
 
@@ -186,23 +186,23 @@ bool httpParseHead(HttpContext* pContext) {
   HttpParser* pParser = &pContext->parser;
   if (strncasecmp(pParser->pLast, "Content-Length: ", 16) == 0) {
     pParser->data.len = (int32_t)atoi(pParser->pLast + 16);
-    httpDebug("context:%p, fd:%d, ip:%s, Content-Length:%d", pContext, pContext->fd, pContext->ipstr,
+    httpTrace("context:%p, fd:%d, ip:%s, Content-Length:%d", pContext, pContext->fd, pContext->ipstr,
               pParser->data.len);
   } else if (strncasecmp(pParser->pLast, "Accept-Encoding: ", 17) == 0) {
     if (tsHttpEnableCompress && strstr(pParser->pLast + 17, "gzip") != NULL) {
       pContext->acceptEncoding = HTTP_COMPRESS_GZIP;
-      httpDebug("context:%p, fd:%d, ip:%s, Accept-Encoding:gzip", pContext, pContext->fd, pContext->ipstr);
+      httpTrace("context:%p, fd:%d, ip:%s, Accept-Encoding:gzip", pContext, pContext->fd, pContext->ipstr);
     } else {
       pContext->acceptEncoding = HTTP_COMPRESS_IDENTITY;
-      httpDebug("context:%p, fd:%d, ip:%s, Accept-Encoding:identity", pContext, pContext->fd, pContext->ipstr);
+      httpTrace("context:%p, fd:%d, ip:%s, Accept-Encoding:identity", pContext, pContext->fd, pContext->ipstr);
     }
   } else if (strncasecmp(pParser->pLast, "Content-Encoding: ", 18) == 0) {
     if (strstr(pParser->pLast + 18, "gzip") != NULL) {
       pContext->contentEncoding = HTTP_COMPRESS_GZIP;
-      httpDebug("context:%p, fd:%d, ip:%s, Content-Encoding:gzip", pContext, pContext->fd, pContext->ipstr);
+      httpTrace("context:%p, fd:%d, ip:%s, Content-Encoding:gzip", pContext, pContext->fd, pContext->ipstr);
     } else {
       pContext->contentEncoding = HTTP_COMPRESS_IDENTITY;
-      httpDebug("context:%p, fd:%d, ip:%s, Content-Encoding:identity", pContext, pContext->fd, pContext->ipstr);
+      httpTrace("context:%p, fd:%d, ip:%s, Content-Encoding:identity", pContext, pContext->fd, pContext->ipstr);
     }
   } else if (strncasecmp(pParser->pLast, "Connection: ", 12) == 0) {
     if (strncasecmp(pParser->pLast + 12, "Keep-Alive", 10) == 0) {
@@ -210,7 +210,7 @@ bool httpParseHead(HttpContext* pContext) {
     } else {
       pContext->httpKeepAlive = HTTP_KEEPALIVE_DISABLE;
     }
-    httpDebug("context:%p, fd:%d, ip:%s, keepAlive:%d", pContext, pContext->fd, pContext->ipstr,
+    httpTrace("context:%p, fd:%d, ip:%s, keepAlive:%d", pContext, pContext->fd, pContext->ipstr,
               pContext->httpKeepAlive);
   } else if (strncasecmp(pParser->pLast, "Transfer-Encoding: ", 19) == 0) {
     if (strncasecmp(pParser->pLast + 19, "chunked", 7) == 0) {
@@ -281,7 +281,7 @@ bool httpReadChunkedBody(HttpContext* pContext, HttpParser* pParser) {
     httpParseChunkedBody(pContext, pParser, false);
     return HTTP_CHECK_BODY_SUCCESS;
   } else {
-    httpDebug("context:%p, fd:%d, ip:%s, chunked body not finished, continue read", pContext, pContext->fd, pContext->ipstr);
+    httpTrace("context:%p, fd:%d, ip:%s, chunked body not finished, continue read", pContext, pContext->fd, pContext->ipstr);
     if (!httpReadDataImp(pContext)) {
       httpError("context:%p, fd:%d, ip:%s, read chunked request error", pContext, pContext->fd, pContext->ipstr);
       return HTTP_CHECK_BODY_ERROR;
@@ -299,7 +299,7 @@ int httpReadUnChunkedBody(HttpContext* pContext, HttpParser* pParser) {
     httpSendErrorResp(pContext, HTTP_PARSE_BODY_ERROR);
     return HTTP_CHECK_BODY_ERROR;
   } else if (dataReadLen < pParser->data.len) {
-    httpDebug("context:%p, fd:%d, ip:%s, un-chunked body not finished, read size:%d dataReadLen:%d < pContext->data.len:%d, continue read",
+    httpTrace("context:%p, fd:%d, ip:%s, un-chunked body not finished, read size:%d dataReadLen:%d < pContext->data.len:%d, continue read",
               pContext, pContext->fd, pContext->ipstr, pContext->parser.bufsize, dataReadLen, pParser->data.len);
     return HTTP_CHECK_BODY_CONTINUE;
   } else {
@@ -313,9 +313,9 @@ bool httpParseRequest(HttpContext* pContext) {
     return true;
   }
 
-  httpDebug("context:%p, fd:%d, ip:%s, thread:%s, numOfFds:%d, read size:%d, raw data:\n%s",
-           pContext, pContext->fd, pContext->ipstr, pContext->pThread->label, pContext->pThread->numOfFds,
-           pContext->parser.bufsize, pContext->parser.buffer);
+  httpTraceDump("context:%p, fd:%d, ip:%s, thread:%s, numOfFds:%d, read size:%d, raw data:\n%s", pContext, pContext->fd,
+                pContext->ipstr, pContext->pThread->label, pContext->pThread->numOfFds, pContext->parser.bufsize,
+                pContext->parser.buffer);
 
   if (!httpGetHttpMethod(pContext)) {
     return false;
diff --git a/src/plugins/http/src/httpJson.c b/src/plugins/http/src/httpJson.c
index 319d87d496..9276637d0e 100644
--- a/src/plugins/http/src/httpJson.c
+++ b/src/plugins/http/src/httpJson.c
@@ -76,8 +76,8 @@ int httpWriteBuf(struct HttpContext *pContext, const char *buf, int sz) {
     httpError("context:%p, fd:%d, ip:%s, dataSize:%d, writeSize:%d, failed to send response:\n%s",
               pContext, pContext->fd, pContext->ipstr, sz, writeSz, buf);
   } else {
-    httpDebug("context:%p, fd:%d, ip:%s, dataSize:%d, writeSize:%d, response:\n%s",
-              pContext, pContext->fd, pContext->ipstr, sz, writeSz, buf);
+    httpTrace("context:%p, fd:%d, ip:%s, dataSize:%d, writeSize:%d, response:\n%s", pContext, pContext->fd,
+              pContext->ipstr, sz, writeSz, buf);
   }
 
   return writeSz;
@@ -99,7 +99,7 @@ int httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) {
   uint64_t srcLen = (uint64_t) (buf->lst - buf->buf);
 
   if (buf->pContext->fd <= 0) {
-    httpDebug("context:%p, fd:%d, ip:%s, write json body error", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
+    httpTrace("context:%p, fd:%d, ip:%s, write json body error", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
     buf->pContext->fd = -1;
   }
 
@@ -113,11 +113,11 @@ int httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) {
 
   if (buf->pContext->acceptEncoding == HTTP_COMPRESS_IDENTITY) {
     if (buf->lst == buf->buf) {
-      httpDebug("context:%p, fd:%d, ip:%s, no data need dump", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
+      httpTrace("context:%p, fd:%d, ip:%s, no data need dump", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
       return 0;  // there is no data to dump.
     } else {
       int len = sprintf(sLen, "%lx\r\n", srcLen);
-      httpDebug("context:%p, fd:%d, ip:%s, write body, chunkSize:%" PRIu64 ", response:\n%s",
+      httpTrace("context:%p, fd:%d, ip:%s, write body, chunkSize:%" PRIu64 ", response:\n%s",
                 buf->pContext, buf->pContext->fd, buf->pContext->ipstr, srcLen, buf->buf);
       httpWriteBufNoTrace(buf->pContext, sLen, len);
       remain = httpWriteBufNoTrace(buf->pContext, buf->buf, (int) srcLen);
@@ -129,12 +129,12 @@ int httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) {
     if (ret == 0) {
       if (compressBufLen > 0) {
         int len = sprintf(sLen, "%x\r\n", compressBufLen);
-        httpDebug("context:%p, fd:%d, ip:%s, write body, chunkSize:%" PRIu64 ", compressSize:%d, last:%d, response:\n%s",
+        httpTrace("context:%p, fd:%d, ip:%s, write body, chunkSize:%" PRIu64 ", compressSize:%d, last:%d, response:\n%s",
                   buf->pContext, buf->pContext->fd, buf->pContext->ipstr, srcLen, compressBufLen, isTheLast, buf->buf);
         httpWriteBufNoTrace(buf->pContext, sLen, len);
         remain = httpWriteBufNoTrace(buf->pContext, (const char *) compressBuf, (int) compressBufLen);
       } else {
-        httpDebug("context:%p, fd:%d, ip:%s, last:%d, compress already dumped, response:\n%s",
+        httpTrace("context:%p, fd:%d, ip:%s, last:%d, compress already dumped, response:\n%s",
                 buf->pContext, buf->pContext->fd, buf->pContext->ipstr, isTheLast, buf->buf);
         return 0;  // there is no data to dump.
       }
@@ -173,7 +173,7 @@ void httpWriteJsonBufHead(JsonBuf* buf) {
 
 void httpWriteJsonBufEnd(JsonBuf* buf) {
   if (buf->pContext->fd <= 0) {
-    httpDebug("context:%p, fd:%d, ip:%s, json buf fd is 0", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
+    httpTrace("context:%p, fd:%d, ip:%s, json buf fd is 0", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
     buf->pContext->fd = -1;
   }
 
diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c
index cef0e80690..6c82386d81 100644
--- a/src/plugins/http/src/httpServer.c
+++ b/src/plugins/http/src/httpServer.c
@@ -66,8 +66,6 @@ void httpCleanUpConnect() {
     }
   }
 
-  tfree(pServer->pThreads);
-  pServer->pThreads = NULL;
   httpDebug("http server:%s is cleaned up", pServer->label);
 }
 
diff --git a/src/plugins/http/src/httpSystem.c b/src/plugins/http/src/httpSystem.c
index a93e7cd7ad..3a0998f2e8 100644
--- a/src/plugins/http/src/httpSystem.c
+++ b/src/plugins/http/src/httpSystem.c
@@ -95,11 +95,13 @@ void httpCleanUpSystem() {
   httpInfo("http server cleanup");
   httpStopSystem();
 
+  httpCleanUpConnect();
   httpCleanupContexts();
   httpCleanUpSessions();
-  httpCleanUpConnect();
   pthread_mutex_destroy(&tsHttpServer.serverMutex);
-
+  tfree(tsHttpServer.pThreads);
+  tsHttpServer.pThreads = NULL;
+  
   tsHttpServer.status = HTTP_SERVER_CLOSED;
 }
 
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 2e57ad83ae..720741f089 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -119,7 +119,7 @@ static FORCE_INLINE void taosCacheReleaseNode(SCacheObj *pCacheObj, SCacheDataNo
   int32_t size = pNode->size;
   taosHashRemove(pCacheObj->pHashTable, pNode->key, pNode->keySize);
   
-  uDebug("key:%s is removed from cache,total:%" PRId64 ",size:%dbytes", pNode->key, pCacheObj->totalSize, size);  
+  uDebug("key:%s, is removed from cache, total:%" PRId64 " size:%d bytes", pNode->key, pCacheObj->totalSize, size);  
   if (pCacheObj->freeFp) pCacheObj->freeFp(pNode->data);
   free(pNode);
 }
@@ -288,14 +288,14 @@ void *taosCachePut(SCacheObj *pCacheObj, const char *key, const void *pData, siz
     if (NULL != pNode) {
       pCacheObj->totalSize += pNode->size;
       
-      uDebug("key:%s %p added into cache, added:%" PRIu64 ", expire:%" PRIu64 ", total:%" PRId64 ", size:%" PRId64 " bytes",
+      uDebug("key:%s, %p added into cache, added:%" PRIu64 ", expire:%" PRIu64 ", total:%" PRId64 ", size:%" PRId64 " bytes",
              key, pNode, pNode->addedTime, pNode->expiredTime, pCacheObj->totalSize, dataSize);
     } else {
-      uError("key:%s failed to added into cache, out of memory", key);
+      uError("key:%s, failed to added into cache, out of memory", key);
     }
   } else {  // old data exists, update the node
     pNode = taosUpdateCacheImpl(pCacheObj, pOld, key, keyLen, pData, dataSize, duration * 1000L);
-    uDebug("key:%s %p exist in cache, updated", key, pNode);
+    uDebug("key:%s, %p exist in cache, updated", key, pNode);
   }
   
   __cache_unlock(pCacheObj);
@@ -321,10 +321,10 @@ void *taosCacheAcquireByName(SCacheObj *pCacheObj, const char *key) {
   
   if (ptNode != NULL) {
     atomic_add_fetch_32(&pCacheObj->statistics.hitCount, 1);
-    uDebug("key:%s is retrieved from cache, %p refcnt:%d", key, (*ptNode), T_REF_VAL_GET(*ptNode));
+    uDebug("key:%s, is retrieved from cache, %p refcnt:%d", key, (*ptNode), T_REF_VAL_GET(*ptNode));
   } else {
     atomic_add_fetch_32(&pCacheObj->statistics.missCount, 1);
-    uDebug("key:%s not in cache, retrieved failed", key);
+    uDebug("key:%s, not in cache, retrieved failed", key);
   }
   
   atomic_add_fetch_32(&pCacheObj->statistics.totalAccess, 1);
@@ -350,10 +350,10 @@ void* taosCacheUpdateExpireTimeByName(SCacheObj *pCacheObj, const char *key, uin
   
   if (ptNode != NULL) {
     atomic_add_fetch_32(&pCacheObj->statistics.hitCount, 1);
-    uDebug("key:%s expireTime is updated in cache, %p refcnt:%d", key, (*ptNode), T_REF_VAL_GET(*ptNode));
+    uDebug("key:%s, expireTime is updated in cache, %p refcnt:%d", key, (*ptNode), T_REF_VAL_GET(*ptNode));
   } else {
     atomic_add_fetch_32(&pCacheObj->statistics.missCount, 1);
-    uDebug("key:%s not in cache, retrieved failed", key);
+    uDebug("key:%s, not in cache, retrieved failed", key);
   }
   
   atomic_add_fetch_32(&pCacheObj->statistics.totalAccess, 1);
@@ -410,13 +410,13 @@ void taosCacheRelease(SCacheObj *pCacheObj, void **data, bool _remove) {
   SCacheDataNode *pNode = (SCacheDataNode *)((char *)(*data) - offset);
   
   if (pNode->signature != (uint64_t)pNode) {
-    uError("key: %p release invalid cache data", pNode);
+    uError("%p release invalid cache data", pNode);
     return;
   }
   
   *data = NULL;
   int32_t ref = T_REF_DEC(pNode);
-  uDebug("%p data released, refcnt:%d", pNode, ref);
+  uDebug("key:%s, is released, %p refcnt:%d", pNode->key, pNode, ref);
   
   if (_remove) {
     __cache_wr_lock(pCacheObj);
@@ -501,7 +501,7 @@ void taosAddToTrash(SCacheObj *pCacheObj, SCacheDataNode *pNode) {
   pNode->inTrashCan = true;
   pCacheObj->numOfElemsInTrash++;
 
-  uDebug("key:%s %p move to trash, numOfElem in trash:%d", pNode->key, pNode, pCacheObj->numOfElemsInTrash);
+  uDebug("key:%s, %p move to trash, numOfElem in trash:%d", pNode->key, pNode, pCacheObj->numOfElemsInTrash);
 }
 
 void taosRemoveFromTrashCan(SCacheObj *pCacheObj, STrashElem *pElem) {
@@ -549,7 +549,7 @@ void taosTrashCanEmpty(SCacheObj *pCacheObj, bool force) {
     }
 
     if (force || (T_REF_VAL_GET(pElem->pData) == 0)) {
-      uDebug("key:%s %p removed from trash. numOfElem in trash:%d", pElem->pData->key, pElem->pData,
+      uDebug("key:%s, %p removed from trash. numOfElem in trash:%d", pElem->pData->key, pElem->pData,
              pCacheObj->numOfElemsInTrash - 1);
       STrashElem *p = pElem;
 
@@ -570,8 +570,11 @@ void doCleanupDataCache(SCacheObj *pCacheObj) {
   while (taosHashIterNext(pIter)) {
     SCacheDataNode *pNode = *(SCacheDataNode **)taosHashIterGet(pIter);
     // if (pNode->expiredTime <= expiredTime && T_REF_VAL_GET(pNode) <= 0) {
-    taosCacheReleaseNode(pCacheObj, pNode);
-    //}
+    if (T_REF_VAL_GET(pNode) <= 0) {
+      taosCacheReleaseNode(pCacheObj, pNode);
+    } else {
+      uDebug("key:%s, will not remove from cache, refcnt:%d", pNode->key, T_REF_VAL_GET(pNode));  
+    }
   }
   taosHashDestroyIter(pIter);
 

From 9516228625c5016e5dd9abcc0c5a952a13c3f1cb Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 1 Jul 2020 14:11:44 +0800
Subject: [PATCH 42/48] deadlock in rpc while taosd stopped

---
 src/rpc/src/rpcMain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index dbdfa28a1a..3a93975022 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -1054,7 +1054,7 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead) {
   } else {
     // it's a response
     SRpcReqContext *pContext = pConn->pContext;
-    rpcMsg.handle = pContext->ahandle;
+    rpcMsg.handle = pContext;
     pConn->pContext = NULL;
 
     // for UDP, port may be changed by server, the port in ipSet shall be used for cache
@@ -1258,7 +1258,7 @@ static void rpcProcessConnError(void *param, void *id) {
 
   if (pContext->numOfTry >= pContext->ipSet.numOfIps) {
     rpcMsg.msgType = pContext->msgType+1;
-    rpcMsg.handle = pContext->ahandle;
+    rpcMsg.ahandle = pContext->ahandle;
     rpcMsg.code = pContext->code;
     rpcMsg.pCont = NULL;
     rpcMsg.contLen = 0;

From 36d7206c390ce2a9a9635d36b1ea8bb770abc7cf Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Wed, 1 Jul 2020 06:13:09 +0000
Subject: [PATCH 43/48] rpcMsg changes

---
 src/rpc/src/rpcMain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index dbdfa28a1a..3a93975022 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -1054,7 +1054,7 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead) {
   } else {
     // it's a response
     SRpcReqContext *pContext = pConn->pContext;
-    rpcMsg.handle = pContext->ahandle;
+    rpcMsg.handle = pContext;
     pConn->pContext = NULL;
 
     // for UDP, port may be changed by server, the port in ipSet shall be used for cache
@@ -1258,7 +1258,7 @@ static void rpcProcessConnError(void *param, void *id) {
 
   if (pContext->numOfTry >= pContext->ipSet.numOfIps) {
     rpcMsg.msgType = pContext->msgType+1;
-    rpcMsg.handle = pContext->ahandle;
+    rpcMsg.ahandle = pContext->ahandle;
     rpcMsg.code = pContext->code;
     rpcMsg.pCont = NULL;
     rpcMsg.contLen = 0;

From b1a4752b9f28724b33a7c25f856ec94ea9d1e83e Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Wed, 1 Jul 2020 15:07:30 +0800
Subject: [PATCH 44/48] TD-803: if non-existing columns as NULL

---
 src/client/src/tscSQLParser.c |  1 -
 src/common/src/ttypes.c       | 22 ++++++++++++++++++++++
 src/inc/taosdef.h             |  1 +
 src/tsdb/src/tsdbMeta.c       |  5 +++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 25fb2968f7..57ae8426ff 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5664,7 +5664,6 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
     return ret;
   }
 
-  //pTag->dataLen = tagVal - pTag->data;
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/src/common/src/ttypes.c b/src/common/src/ttypes.c
index 3c63e2deac..8ea4fe906a 100644
--- a/src/common/src/ttypes.c
+++ b/src/common/src/ttypes.c
@@ -464,6 +464,28 @@ void setNullN(char *val, int32_t type, int32_t bytes, int32_t numOfElems) {
   }
 }
 
+static uint8_t  nullBool = TSDB_DATA_BOOL_NULL;
+static uint8_t  nullTinyInt = TSDB_DATA_TINYINT_NULL;
+static uint16_t nullSmallInt = TSDB_DATA_SMALLINT_NULL;
+static uint32_t nullInt = TSDB_DATA_INT_NULL;
+static uint64_t nullBigInt = TSDB_DATA_BIGINT_NULL;
+static uint32_t nullFloat = TSDB_DATA_FLOAT_NULL;
+static uint64_t nullDouble = TSDB_DATA_DOUBLE_NULL;
+static struct {
+  tstr str;
+  int32_t pad;
+} nullBinary = {.str = {.len = 1}, .pad = 0}, nullNchar = {.str = {.len = 4}, .pad = 0};
+
+static void *nullValues[] = {
+    &nullBool,  &nullTinyInt, &nullSmallInt, &nullInt,    &nullBigInt,
+    &nullFloat, &nullDouble,  &nullBinary,   &nullBigInt, &nullNchar,
+};
+
+void *getNullValue(int32_t type) {
+  assert(type >= TSDB_DATA_TYPE_BOOL && type <= TSDB_DATA_TYPE_NCHAR);
+  return nullValues[type - 1];
+}
+
 void assignVal(char *val, const char *src, int32_t len, int32_t type) {
   switch (type) {
     case TSDB_DATA_TYPE_INT: {
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index ecf78edfd5..76ca99c9ad 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -165,6 +165,7 @@ bool isNull(const char *val, int32_t type);
 void setVardataNull(char* val, int32_t type);
 void setNull(char *val, int32_t type, int32_t bytes);
 void setNullN(char *val, int32_t type, int32_t bytes, int32_t numOfElems);
+void* getNullValue(int32_t type);
 
 void assignVal(char *val, const char *src, int32_t len, int32_t type);
 void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 7851329c47..4f331d8131 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -604,6 +604,10 @@ static char *getTagIndexKey(const void *pData) {
   STSchema *pSchema = tsdbGetTableTagSchema(pTable);
   STColumn *pCol = schemaColAt(pSchema, DEFAULT_TAG_INDEX_COLUMN);
   void *    res = tdGetKVRowValOfCol(pTable->tagVal, pCol->colId);
+  if (res == NULL) {
+    // treat the column as NULL if we cannot find it
+    res = getNullValue(pCol->type);
+  }
   return res;
 }
 
@@ -849,6 +853,7 @@ static int tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable) {
   STable *pSTable = tsdbGetTableByUid(pMeta, TABLE_SUID(pTable));
   ASSERT(pSTable != NULL);
 
+  printf("pTable = %p, pSTable = %p\n", pTable, pSTable);
   pTable->pSuper = pSTable;
 
   int32_t level = 0;

From f4492a175fb4fcc20a9b0ae9b04cef5c6a02dc60 Mon Sep 17 00:00:00 2001
From: Hui Li <huili@taosdata.com>
Date: Wed, 1 Jul 2020 15:35:39 +0800
Subject: [PATCH 45/48] [TD-798]

---
 src/common/inc/tglobal.h         |  1 +
 src/common/src/tglobal.c         |  1 +
 src/dnode/src/dnodeMain.c        |  5 +++++
 src/os/linux/inc/os.h            |  3 +++
 src/os/linux/src/linuxPlatform.c | 29 +++++++++++++++++++++++++++++
 src/util/inc/tutil.h             |  1 +
 src/util/src/tutil.c             | 10 ++++++++++
 src/vnode/src/vnodeMain.c        |  1 +
 8 files changed, 51 insertions(+)

diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index af1d7dd441..e7927605cb 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -117,6 +117,7 @@ extern char    tsDataDir[];
 extern char    tsLogDir[];
 extern char    tsScriptDir[];
 extern int64_t tsMsPerDay[3];
+extern char    tsVnodeBakDir[];
 
 // system info
 extern char    tsOsName[];
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index 0fb63c0476..225f12a210 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -153,6 +153,7 @@ char    tsDnodeDir[TSDB_FILENAME_LEN] = {0};
 char    tsMnodeDir[TSDB_FILENAME_LEN] = {0};
 char    tsDataDir[TSDB_FILENAME_LEN] = "/var/lib/taos";
 char    tsScriptDir[TSDB_FILENAME_LEN] = "/etc/taos";
+char    tsVnodeBakDir[TSDB_FILENAME_LEN] = {0};
 
 /*
  * minimum scale for whole system, millisecond by default
diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
index 2ec87cbdd4..8d1ae0a50e 100644
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -171,6 +171,7 @@ static int32_t dnodeInitStorage() {
   sprintf(tsMnodeDir, "%s/mnode", tsDataDir);
   sprintf(tsVnodeDir, "%s/vnode", tsDataDir);
   sprintf(tsDnodeDir, "%s/dnode", tsDataDir);
+  sprintf(tsVnodeBakDir, "%s/vnode_bak", tsDataDir);
 
   //TODO(dengyihao): no need to init here 
   if (dnodeCreateDir(tsMnodeDir) < 0) {
@@ -186,6 +187,10 @@ static int32_t dnodeInitStorage() {
    dError("failed to create dir: %s, reason: %s", tsDnodeDir, strerror(errno));
    return -1;
   } 
+  if (dnodeCreateDir(tsVnodeBakDir) < 0) {
+   dError("failed to create dir: %s, reason: %s", tsVnodeBakDir, strerror(errno));
+   return -1;
+  }
 
   dnodeCheckDataDirOpenned(tsDnodeDir);
 
diff --git a/src/os/linux/inc/os.h b/src/os/linux/inc/os.h
index 35d2236001..58e255f7bc 100644
--- a/src/os/linux/inc/os.h
+++ b/src/os/linux/inc/os.h
@@ -236,6 +236,9 @@ void taosSetCoreDump();
 
 void taosBlockSIGPIPE();
 
+int tSystem(const char * cmd) ;
+
+
 #ifdef _ALPINE
   typedef int(*__compar_fn_t)(const void *, const void *);
   void  error (int, int, const char *);
diff --git a/src/os/linux/src/linuxPlatform.c b/src/os/linux/src/linuxPlatform.c
index a8ecf43c46..9a38c98f81 100644
--- a/src/os/linux/src/linuxPlatform.c
+++ b/src/os/linux/src/linuxPlatform.c
@@ -241,3 +241,32 @@ void taosBlockSIGPIPE() {
     uError("failed to block SIGPIPE");
   }
 }
+
+int tSystem(const char * cmd) 
+{ 
+  FILE * fp; 
+  int res; 
+  char buf[1024]; 
+  if (cmd == NULL) { 
+    uError("tSystem cmd is NULL!\n");
+    return -1;
+  } 
+  
+  if ((fp = popen(cmd, "r") ) == NULL) { 
+    uError("popen cmd:%s error: %s/n", cmd, strerror(errno)); 
+    return -1; 
+  } else {
+    while(fgets(buf, sizeof(buf), fp))  { 
+      uDebug("popen result:%s", buf); 
+    } 
+
+    if ((res = pclose(fp)) == -1) { 
+      uError("close popen file pointer fp error!\n");
+    } else { 
+      uDebug("popen res is :%d\n", res);
+    } 
+
+    return res;
+  }
+}
+
diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h
index 949e9eb109..1ba57bbaaa 100644
--- a/src/util/inc/tutil.h
+++ b/src/util/inc/tutil.h
@@ -184,6 +184,7 @@ uint32_t ip2uint(const char *const ip_addr);
 
 void taosRemoveDir(char *rootDir);
 int  tmkdir(const char *pathname, mode_t mode); 
+void taosMvDir(char* destDir, char *srcDir);
 
 #define TAOS_ALLOC_MODE_DEFAULT 0
 #define TAOS_ALLOC_MODE_RANDOM_FAIL 1
diff --git a/src/util/src/tutil.c b/src/util/src/tutil.c
index cc720eb5f7..9c5bffef95 100644
--- a/src/util/src/tutil.c
+++ b/src/util/src/tutil.c
@@ -799,3 +799,13 @@ int tmkdir(const char *path, mode_t mode) {
   if (code < 0 && errno == EEXIST) code = 0;
   return code;
 }
+
+void taosMvDir(char* destDir, char *srcDir) {
+  char shellCmd[1024+1] = {0}; 
+  
+  //(void)snprintf(shellCmd, 1024, "cp -rf %s %s", srcDir, destDir);
+  (void)snprintf(shellCmd, 1024, "mv %s %s", srcDir, destDir);
+  tSystem(shellCmd);
+  uInfo("shell cmd:%s is executed", shellCmd);
+}
+
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index cbd7953072..f71f6adefb 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -347,6 +347,7 @@ void vnodeRelease(void *pVnodeRaw) {
   if (pVnode->status == TAOS_VN_STATUS_DELETING) {
     char rootDir[TSDB_FILENAME_LEN] = {0};
     sprintf(rootDir, "%s/vnode%d", tsVnodeDir, vgId);
+    taosMvDir(tsVnodeBakDir, rootDir);
     taosRemoveDir(rootDir);
   }
 

From c9600717ad4dcb7bbaabe041506d4b978ab1516d Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Wed, 1 Jul 2020 15:58:59 +0800
Subject: [PATCH 46/48] fix compile error and reuse getNullValue

---
 src/common/src/ttypes.c |  7 ++++---
 src/cq/src/cqMain.c     | 27 +++++----------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/common/src/ttypes.c b/src/common/src/ttypes.c
index 8ea4fe906a..eff25e8c93 100644
--- a/src/common/src/ttypes.c
+++ b/src/common/src/ttypes.c
@@ -471,10 +471,11 @@ static uint32_t nullInt = TSDB_DATA_INT_NULL;
 static uint64_t nullBigInt = TSDB_DATA_BIGINT_NULL;
 static uint32_t nullFloat = TSDB_DATA_FLOAT_NULL;
 static uint64_t nullDouble = TSDB_DATA_DOUBLE_NULL;
-static struct {
+
+static union {
   tstr str;
-  int32_t pad;
-} nullBinary = {.str = {.len = 1}, .pad = 0}, nullNchar = {.str = {.len = 4}, .pad = 0};
+  char pad[sizeof(tstr) + 4];
+} nullBinary = {.str = {.len = 1}}, nullNchar = {.str = {.len = 4}};
 
 static void *nullValues[] = {
     &nullBool,  &nullTinyInt, &nullSmallInt, &nullInt,    &nullBigInt,
diff --git a/src/cq/src/cqMain.c b/src/cq/src/cqMain.c
index 098d69fcb2..3e7e8525ef 100644
--- a/src/cq/src/cqMain.c
+++ b/src/cq/src/cqMain.c
@@ -256,30 +256,13 @@ static void cqProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row) {
   SDataRow trow = (SDataRow)pBlk->data;
   tdInitDataRow(trow, pSchema);
 
-  union {
-    char buf[sizeof(int64_t)];
-    tstr str;
-  } nullVal;
-
   for (int32_t i = 0; i < pSchema->numOfCols; i++) {
     STColumn *c = pSchema->columns + i;
-    char* val = (char*)row[i];
-    if (IS_VAR_DATA_TYPE(c->type)) {
-      if (val == NULL) {
-        val = nullVal.buf;
-        if (c->type == TSDB_DATA_TYPE_BINARY) {
-          setNull(nullVal.str.data, TSDB_DATA_TYPE_BINARY, 1);
-          nullVal.str.len = 1;
-        } else {
-          setNull(nullVal.str.data, TSDB_DATA_TYPE_NCHAR, 4);
-          nullVal.str.len = 4;
-        }
-      } else {
-        val -= sizeof(VarDataLenT);
-      }
-    } else if (val == NULL) {
-      val = nullVal.buf;
-      setNull(val, c->type, c->bytes);
+    void* val = row[i];
+    if (val == NULL) {
+      val = getNullValue(c->type);
+    } else if (IS_VAR_DATA_TYPE(c->type)) {
+      val = ((char*)val) - sizeof(VarDataLenT);
     }
     tdAppendColVal(trow, val, c->type, c->bytes, c->offset);
   }

From 2ed7cdd35f7a7cf637c36ce94c50fef221dc2eaa Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Wed, 1 Jul 2020 16:57:11 +0800
Subject: [PATCH 47/48] remove debug printf

---
 src/tsdb/src/tsdbMeta.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 4f331d8131..dafc7dbb1b 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -853,7 +853,6 @@ static int tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable) {
   STable *pSTable = tsdbGetTableByUid(pMeta, TABLE_SUID(pTable));
   ASSERT(pSTable != NULL);
 
-  printf("pTable = %p, pSTable = %p\n", pTable, pSTable);
   pTable->pSuper = pSTable;
 
   int32_t level = 0;

From 9f4ce03e8409e3e0d6c0892eb11464d01f69703f Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Wed, 1 Jul 2020 17:41:31 +0800
Subject: [PATCH 48/48] sort KVRow by colId

---
 src/client/src/tscParseInsert.c | 11 ++++++++---
 src/client/src/tscSQLParser.c   | 12 +++++++++---
 src/common/inc/tdataformat.h    |  1 +
 src/common/src/tdataformat.c    | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index fd2a9f5a8c..4400ca2c25 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -918,6 +918,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
       char tagVal[TSDB_MAX_TAGS_LEN];
       code = tsParseOneColumnData(pSchema, &sToken, tagVal, pCmd->payload, &sql, false, tinfo.precision);
       if (code != TSDB_CODE_SUCCESS) {
+        tdDestroyKVRowBuilder(&kvRowBuilder);
         return code;
       }
 
@@ -925,10 +926,14 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
     }
 
     SKVRow row = tdGetKVRowFromBuilder(&kvRowBuilder);
-    pTag->dataLen = kvRowLen(row);
-    memcpy(pTag->data, row, pTag->dataLen);
-    free(row);
     tdDestroyKVRowBuilder(&kvRowBuilder);
+    if (row == NULL) {
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
+    }
+    tdSortKVRowByColIdx(row);
+    pTag->dataLen = kvRowLen(row);
+    kvRowCpy(pTag->data, row);
+    free(row);
 
     index = 0;
     sToken = tStrGetToken(sql, &index, false, 0, NULL);
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 57ae8426ff..9f557f5529 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5634,6 +5634,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
     if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) {
       // validate the length of binary
       if (pList->a[i].pVar.nLen + VARSTR_HEADER_SIZE > pSchema->bytes) {
+        tdDestroyKVRowBuilder(&kvRowBuilder);
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
     }
@@ -5641,6 +5642,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
     char tagVal[TSDB_MAX_TAGS_LEN];
     ret = tVariantDump(&(pList->a[i].pVar), tagVal, pSchema->type, true);
     if (ret != TSDB_CODE_SUCCESS) {
+      tdDestroyKVRowBuilder(&kvRowBuilder);
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
     }
 
@@ -5648,10 +5650,14 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
   }
 
   SKVRow row = tdGetKVRowFromBuilder(&kvRowBuilder);
-  pTag->dataLen = kvRowLen(row);
-  memcpy(pTag->data, row, pTag->dataLen);
-  free(row);
   tdDestroyKVRowBuilder(&kvRowBuilder);
+  if (row == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+  tdSortKVRowByColIdx(row);
+  pTag->dataLen = kvRowLen(row);
+  kvRowCpy(pTag->data, row);
+  free(row);
 
   // table name
   if (tscValidateName(&pInfo->pCreateTableInfo->name) != TSDB_CODE_SUCCESS) {
diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index da2f07da04..baa212d8b7 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -290,6 +290,7 @@ SKVRow tdKVRowDup(SKVRow row);
 int    tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value);
 int    tdEncodeKVRow(void **buf, SKVRow row);
 void * tdDecodeKVRow(void *buf, SKVRow *row);
+void   tdSortKVRowByColIdx(SKVRow row);
 
 static FORCE_INLINE int comparTagId(const void *key1, const void *key2) {
   if (*(int16_t *)key1 > ((SColIdx *)key2)->colId) {
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index d7b2af8706..e5cbcfd143 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -515,6 +515,22 @@ SKVRow tdKVRowDup(SKVRow row) {
   return trow;
 }
 
+static int compareColIdx(const void* a, const void* b) {
+  const SColIdx* x = (const SColIdx*)a;
+  const SColIdx* y = (const SColIdx*)b;
+  if (x->colId > y->colId) {
+    return 1;
+  }
+  if (x->colId < y->colId) {
+    return -1;
+  }
+  return 0;
+}
+
+void tdSortKVRowByColIdx(SKVRow row) {
+  qsort(kvRowColIdx(row), kvRowNCols(row), sizeof(SColIdx), compareColIdx);
+}
+
 int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value) {
   SColIdx *pColIdx = NULL;
   SKVRow   row = *orow;