diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index e7802b3d0d3cf969381b5fa2a99862b3df5aa05f..0000000000000000000000000000000000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-version: 1.0.{build}
-image:
-  - Visual Studio 2015
-  - macos
-environment:
-  matrix:
-    - ARCH: amd64
-    - ARCH: x86
-matrix:
-  exclude:
-    - image: macos
-      ARCH: x86
-for:
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2015
-    clone_folder: c:\dev\TDengine
-    clone_depth: 1
-
-    init:
-      - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
-
-    before_build:
-      - cd c:\dev\TDengine
-      - md build
-
-    build_script:
-      - cd build
-      - cmake -G "NMake Makefiles" .. -DBUILD_JDBC=false
-      - nmake install
-  -
-    matrix:
-      only:
-        - image: macos
-    clone_depth: 1
-
-    build_script:
-      - mkdir debug
-      - cd debug
-      - cmake .. > /dev/null
-      - make > /dev/null
-notifications:
-- provider: Email
-  to:
-  - sangshuduo@gmail.com
-  on_build_success: true
-  on_build_failure: true
-  on_build_status_changed: true
diff --git a/Jenkinsfile b/Jenkinsfile
index e3aa1c7a29214fbbf60871ffa07164c5b2678476..e96455f20d01593b22064b005b0b6be69b89a76a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,7 +38,8 @@ def pre_test(){
     sudo rmtaos || echo "taosd has not installed"
     '''
     sh '''
-    killall -9 taosd ||echo "no taosd running"
+    kill -9 $(pidof taosd) ||echo "no taosd running"
+    kill -9 $(pidof taosadapter) ||echo "no taosadapter running"
     killall -9 gdb || echo "no gdb running"
     killall -9 python3.8 || echo "no python program running"
     cd ${WKC}
diff --git a/packaging/release.sh b/packaging/release.sh
index 79687e91f9d6c69d9b6e2d1021625b1338db8c36..dfa9ae9281445f07a2cdba8a89a0c91a430e0138 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -349,8 +349,16 @@ if [[ "$dbName" == "kh" ]]; then
   sed -i "s/taos\.cfg/kinghistorian\.cfg/g"  ${top_dir}/src/util/src/tconfig.c
   sed -i "s/etc\/taos/etc\/kinghistorian/g"   ${top_dir}/src/util/src/tconfig.c
   # src/kit/taosdemo/taosdemo.c
+  sed -i "s/taosdemo --help/khdemo --help/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
+  sed -i "s/taosdemo --usage/khdemo --usage/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
+  sed -i "s/Usage: taosdemo/Usage: khdemo/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
+  sed -i "s/taosdemo is simulating/khdemo is simulating/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
+  sed -i "s/taosdemo version/khdemo version/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
   sed -i "s/\"taosdata\"/\"khroot\"/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
   sed -i "s/support@taosdata.com/support@wellintech.com/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
+  sed -i "s/taosc, rest, and stmt/khclient, rest, and stmt/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
+  sed -i "s/taosdemo uses/khdemo uses/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
+  sed -i "s/use 'taosc'/use 'khclient'/g" ${top_dir}/src/kit/taosdemo/taosdemo.c
   # src/util/src/tlog.c
   sed -i "s/log\/taos/log\/kinghistorian/g"   ${top_dir}/src/util/src/tlog.c
   # src/dnode/src/dnodeSystem.c
@@ -363,7 +371,7 @@ if [[ "$dbName" == "kh" ]]; then
   sed -i "s/taosinfo/khinfo/g"  ${top_dir}/src/util/src/tnote.c
   # src/dnode/CMakeLists.txt
   sed -i "s/taos\.cfg/kinghistorian\.cfg/g"  ${top_dir}/src/dnode/CMakeLists.txt
-  # src/dnode/CMakeLists.txt
+  # src/kit/taosdump/taosdump.c
   sed -i "s/Default is taosdata/Default is khroot/g" ${top_dir}/src/kit/taosdump/taosdump.c
   sed -i "s/\"taosdata\"/\"khroot\"/g" ${top_dir}/src/kit/taosdump/taosdump.c
   sed -i "s/TDengine/KingHistorian/g" ${top_dir}/src/kit/taosdump/taosdump.c
@@ -372,6 +380,12 @@ if [[ "$dbName" == "kh" ]]; then
   sed -i "s/etc\/taos/etc\/kinghistorian/g" ${top_dir}/src/os/src/linux/linuxEnv.c
   sed -i "s/lib\/taos/lib\/kinghistorian/g" ${top_dir}/src/os/src/linux/linuxEnv.c
   sed -i "s/log\/taos/log\/kinghistorian/g" ${top_dir}/src/os/src/linux/linuxEnv.c
+  # src/kit/shell/src/shellDarwin.c
+  sed -i "s/TDengine shell/KingHistorian shell/g" ${top_dir}/src/kit/shell/src/shellDarwin.c
+  sed -i "s/2020 by TAOS Data/2021 by Wellintech/g" ${top_dir}/src/kit/shell/src/shellDarwin.c
+  # src/kit/shell/src/shellLinux.c
+  sed -i "s/TDengine shell/KingHistorian shell/g" ${top_dir}/src/kit/shell/src/shellLinux.c
+  sed -i "s/2020 by TAOS Data/2021 by Wellintech/g" ${top_dir}/src/kit/shell/src/shellLinux.c
   # src/os/src/windows/wEnv.c
   sed -i "s/TDengine/KingHistorian/g" ${top_dir}/src/os/src/windows/wEnv.c
   # src/kit/shell/src/shellEngine.c
diff --git a/packaging/tools/install_client_jh.sh b/packaging/tools/install_client_jh.sh
index cccf0a97be053796099d5b5f4a2c3db018c24955..a8599812feaea06120aa3391771e7c94523a53c2 100755
--- a/packaging/tools/install_client_jh.sh
+++ b/packaging/tools/install_client_jh.sh
@@ -188,9 +188,6 @@ function update() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -215,9 +212,6 @@ function install() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
diff --git a/packaging/tools/install_client_kh.sh b/packaging/tools/install_client_kh.sh
index 210fd27fb6978527d76f0c915d0293370b93cf3e..3e7df18486a20b9ea75dba3d2644d46bee6b423b 100755
--- a/packaging/tools/install_client_kh.sh
+++ b/packaging/tools/install_client_kh.sh
@@ -189,9 +189,6 @@ function update() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -216,9 +213,6 @@ function install() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
diff --git a/packaging/tools/install_client_power.sh b/packaging/tools/install_client_power.sh
index ecd22f3de19ee639e1e081fb8330b010f6b7227c..64c355f0074dd158052d57e1df7da220c6614586 100755
--- a/packaging/tools/install_client_power.sh
+++ b/packaging/tools/install_client_power.sh
@@ -246,9 +246,6 @@ function update_PowerDB() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -274,9 +271,6 @@ function install_PowerDB() {
     install_header
     install_lib
     install_jemalloc
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
diff --git a/packaging/tools/install_client_pro.sh b/packaging/tools/install_client_pro.sh
index 425d39b6be4a5e5340bde225433ce9125ceeecd0..b21c90b7aa5bf9348f891222fecbdc04f8c72f87 100755
--- a/packaging/tools/install_client_pro.sh
+++ b/packaging/tools/install_client_pro.sh
@@ -188,9 +188,6 @@ function update_prodb() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -215,9 +212,6 @@ function install_prodb() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
diff --git a/packaging/tools/install_client_tq.sh b/packaging/tools/install_client_tq.sh
index 059e79949bb7f3296977aee011e9670c14087f5c..119b87fe3ee496c11562c44f223fbef8cf302402 100755
--- a/packaging/tools/install_client_tq.sh
+++ b/packaging/tools/install_client_tq.sh
@@ -192,9 +192,6 @@ function update_tq() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -219,9 +216,6 @@ function install_tq() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
diff --git a/packaging/tools/makeclient_jh.sh b/packaging/tools/makeclient_jh.sh
index 267d78b953be33c567f8175a369b13f326ee3f5a..ed61cffaf793ede0f774fa1ba2c81d7645f714dc 100755
--- a/packaging/tools/makeclient_jh.sh
+++ b/packaging/tools/makeclient_jh.sh
@@ -69,10 +69,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/jh_taos
-    cp ${script_dir}/remove_jh.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_jh.sh  ${install_dir}/bin
   else 
     cp ${build_dir}/bin/taos          ${install_dir}/bin/jh_taos
-    cp ${script_dir}/remove_jh.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_jh.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/jhdemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/jh_taosdump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin
diff --git a/packaging/tools/makeclient_kh.sh b/packaging/tools/makeclient_kh.sh
index 0d7c05249f47a25ce52296253cc763ae2c972e79..9d6a67b929ed393883ef278ce1efa08f29d28bd9 100755
--- a/packaging/tools/makeclient_kh.sh
+++ b/packaging/tools/makeclient_kh.sh
@@ -70,10 +70,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/khclient
-    cp ${script_dir}/remove_kh.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_kh.sh  ${install_dir}/bin
   else 
     cp ${build_dir}/bin/taos          ${install_dir}/bin/khclient
-    cp ${script_dir}/remove_kh.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_kh.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/khdemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/khdump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin
diff --git a/packaging/tools/makeclient_power.sh b/packaging/tools/makeclient_power.sh
index 19e24b3dafb7f1f95832e637e181449e4c381faf..affab87ec08fe4b8340513b17e9969cfc0f17234 100755
--- a/packaging/tools/makeclient_power.sh
+++ b/packaging/tools/makeclient_power.sh
@@ -109,10 +109,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/power
-    cp ${script_dir}/remove_power.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_power.sh  ${install_dir}/bin
   else
     cp ${build_dir}/bin/taos          ${install_dir}/bin/power
-    cp ${script_dir}/remove_power.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_power.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/powerdemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/powerdump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin
diff --git a/packaging/tools/makeclient_pro.sh b/packaging/tools/makeclient_pro.sh
index 3aa37545545d9f9237376fc8f5883e618535b10a..0a92dcaa12350a77133f49e91336d973abd15fc6 100755
--- a/packaging/tools/makeclient_pro.sh
+++ b/packaging/tools/makeclient_pro.sh
@@ -69,10 +69,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/prodbc
-    cp ${script_dir}/remove_pro.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_pro.sh  ${install_dir}/bin
   else 
     cp ${build_dir}/bin/taos          ${install_dir}/bin/prodbc
-    cp ${script_dir}/remove_pro.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_pro.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/prodemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/prodump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin
diff --git a/packaging/tools/makeclient_tq.sh b/packaging/tools/makeclient_tq.sh
index c6922d1c2357c99dc23b14212e652d32c7ac6368..fa1c479936d989bff3a2eb351201d09aba293f65 100755
--- a/packaging/tools/makeclient_tq.sh
+++ b/packaging/tools/makeclient_tq.sh
@@ -69,10 +69,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/tq
-    cp ${script_dir}/remove_tq.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_tq.sh  ${install_dir}/bin
   else 
     cp ${build_dir}/bin/taos          ${install_dir}/bin/tq
-    cp ${script_dir}/remove_tq.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_tq.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/tqdemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/tqdump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index d0ad31902a815edaafaf0da2b6d3fad76a42dc0a..4bb61d2ed8fc7c3091d67b14fa10ffd881822009 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -1527,6 +1527,41 @@ int stmtGenInsertStatement(SSqlObj* pSql, STscStmt* pStmt, const char* name, TAO
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t stmtValidateValuesFields(SSqlCmd *pCmd, char * sql) {
+  int32_t loopCont = 1, index0 = 0, values = 0;
+  SStrToken sToken;
+  
+  while (loopCont) {
+    sToken = tStrGetToken(sql, &index0, false);
+    if (sToken.n <= 0) {
+      return TSDB_CODE_SUCCESS;
+    }
+  
+    switch (sToken.type) {
+      case TK_RP:
+        if (values) {
+         return TSDB_CODE_SUCCESS;
+        }
+        break;
+      case TK_VALUES:
+        values = 1;
+        break;
+      case TK_QUESTION:  
+      case TK_LP:
+        break;
+      default:
+        if (values) {
+          tscError("only ? allowed in values");
+          return tscInvalidOperationMsg(pCmd->payload, "only ? allowed in values", NULL);
+        }
+        break;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // interface functions
 
@@ -1631,6 +1666,11 @@ int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
       STMT_RET(ret);
     }
 
+    ret = stmtValidateValuesFields(&pSql->cmd, pSql->sqlstr);
+    if (ret != TSDB_CODE_SUCCESS) {
+      STMT_RET(ret);
+    }
+
     if (pStmt->multiTbInsert) {
       STMT_RET(TSDB_CODE_SUCCESS);
     }
diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c
index a1413be1ce4ce6f67516fc09121115f30bbc56f0..e9cae7003251f4f10d3ec7cab12a83176929ba09 100644
--- a/src/kit/shell/src/shellDarwin.c
+++ b/src/kit/shell/src/shellDarwin.c
@@ -34,10 +34,10 @@ void insertChar(Command *cmd, char *c, int size);
 
 void printHelp() {
   char indent[10] = "        ";
-  printf("taos shell is used to test the TDengine database\n");
+  printf("taos shell is used to test the database\n");
 
   printf("%s%s\n", indent, "-h");
-  printf("%s%s%s\n", indent, indent, "TDengine server IP address to connect. The default host is localhost.");
+  printf("%s%s%s\n", indent, indent, "Server IP address to connect. The default host is localhost.");
   printf("%s%s\n", indent, "-p");
   printf("%s%s%s\n", indent, indent, "The password to use when connecting to the server.");
   printf("%s%s\n", indent, "-P");
diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c
index 190df9c53535a1f2d90ee62e805205feea868522..8d36e1cc6b785c17d90c409a412df2b288d0a620 100644
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
@@ -37,8 +37,8 @@ const char *argp_program_bug_address = "<support@taosdata.com>";
 static char doc[] = "";
 static char args_doc[] = "";
 static struct argp_option options[] = {
-  {"host",       'h', "HOST",       0,                   "TDengine server FQDN to connect. The default host is localhost."},
-  {"password",   'p', 0,   0,                   "The password to use when connecting to the server."},
+  {"host",       'h', "HOST",       0,                   "Server FQDN to connect. The default host is localhost."},
+  {"password",   'p', 0,            0,                   "The password to use when connecting to the server."},
   {"port",       'P', "PORT",       0,                   "The TCP/IP port number to use for the connection."},
   {"user",       'u', "USER",       0,                   "The user name to use when connecting to the server."},
   {"auth",       'A', "Auth",       0,                   "The auth string to use when connecting to the server."},
diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index c426653ab529405509a4fe7d2c1003a1bd5679b3..f693ae0b56cea2da12e01a0c82e32ac739e5ca4d 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -21,8 +21,26 @@
 
 extern char configDir[];
 
+#ifdef _TD_POWER_
+char      WINCLIENT_VERSION[] = "Welcome to the PowerDB shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2020 by PowerDB, Inc. All rights reserved.\n\n";
+#elif (_TD_TQ_ == true)
+char      WINCLIENT_VERSION[] = "Welcome to the TQ shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
+#elif (_TD_PRO_ == true)
+char      WINCLIENT_VERSION[] = "Welcome to the ProDB shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2020 by Hanatech, Inc. All rights reserved.\n\n";
+#elif (_TD_KH_ == true)
+char      WINCLIENT_VERSION[] = "Welcome to the KingHistorian shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2021 by Wellintech, Inc. All rights reserved.\n\n";
+#elif (_TD_JH_ == true)
+char      WINCLIENT_VERSION[] = "Welcome to the jh_iot shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2021 by jinheng, Inc. All rights reserved.\n\n";
+#else
 char      WINCLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
                              "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
+#endif
+
 
 void printVersion() {
   printf("version: %s\n", version);
@@ -30,10 +48,10 @@ void printVersion() {
 
 void printHelp() {
   char indent[10] = "        ";
-  printf("taos shell is used to test the TDengine database\n");
+  printf("taos shell is used to test the database\n");
 
   printf("%s%s\n", indent, "-h");
-  printf("%s%s%s\n", indent, indent, "TDengine server FQDN to connect. The default host is localhost.");
+  printf("%s%s%s\n", indent, indent, "Server FQDN to connect. The default host is localhost.");
   printf("%s%s\n", indent, "-p");
   printf("%s%s%s\n", indent, indent, "The password to use when connecting to the server.");
   printf("%s%s\n", indent, "-P");
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index c2a9c5a289ff7e57ac305a971d2bda87f4e0e8be..3a0f3a7f61b52f85da1809edd7120b6babe93169 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -773,7 +773,7 @@ static void printHelp() {
     printf("%s%s%s%s\n", indent, "-c, --config-dir=CONFIG_DIR", "\t",
             "Configuration directory.");
     printf("%s%s%s%s\n", indent, "-h, --host=HOST", "\t\t",
-            "TDengine server FQDN to connect. The default host is localhost.");
+            "Server FQDN to connect. The default host is localhost.");
     printf("%s%s%s%s\n", indent, "-P, --port=PORT", "\t\t",
             "The TCP/IP port number to use for the connection.");
     printf("%s%s%s%s\n", indent, "-I, --interface=INTERFACE", "\t",
@@ -10963,8 +10963,6 @@ static int insertTestProcess() {
     assert(cmdBuffer);
 
     if(createDatabasesAndStables(cmdBuffer) != 0) {
-        if (g_fpOfInsertResult)
-            fclose(g_fpOfInsertResult);
         free(cmdBuffer);
         return -1;
     }
diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c
index 798e7ef1934ad250691727dc68347e7c71fe709a..ff076522cade7b096cf01085e73f7509d2cf9ba8 100644
--- a/src/util/src/tconfig.c
+++ b/src/util/src/tconfig.c
@@ -467,7 +467,7 @@ bool taosReadGlobalCfg() {
 }
 
 void taosPrintGlobalCfg() {
-  uInfo("   taos config & system info:");
+  uInfo("        config & system info:");
   uInfo("==================================");
 
   for (int i = 0; i < tsGlobalConfigNum; ++i) {
@@ -553,7 +553,7 @@ static void taosDumpCfg(SGlobalCfg *cfg) {
 }
 
 void taosDumpGlobalCfg() {
-  printf("taos global config:\n");
+  printf("         global config:\n");
   printf("==================================\n");
   for (int i = 0; i < tsGlobalConfigNum; ++i) {
     SGlobalCfg *cfg = tsGlobalConfig + i;
@@ -564,7 +564,7 @@ void taosDumpGlobalCfg() {
     taosDumpCfg(cfg);
   }
 
-  printf("\ntaos local config:\n");
+  printf("\n      local config:\n");
   printf("==================================\n");
 
   for (int i = 0; i < tsGlobalConfigNum; ++i) {
diff --git a/tests/script/api/batchprepare.c b/tests/script/api/batchprepare.c
index a3a5a331007ab9f05f779dcf8f165ff6f6e50f9e..0281c4e9ee1554462dab9875c624beefa3ce8ad9 100644
--- a/tests/script/api/batchprepare.c
+++ b/tests/script/api/batchprepare.c
@@ -2020,7 +2020,7 @@ int stmt_funcb_autoctb_e2(TAOS_STMT *stmt) {
     code = taos_stmt_set_tbname_tags(stmt, buf, NULL);
     if (code != 0){
       printf("failed to execute taos_stmt_set_tbname_tags. code:%s\n", taos_stmt_errstr(stmt));
-      return -1;
+      goto exit;
     }  
 
     taos_stmt_bind_param_batch(stmt, params + id * 10);
@@ -2037,6 +2037,7 @@ int stmt_funcb_autoctb_e2(TAOS_STMT *stmt) {
   unsigned long long endtime = getCurrentTime();
   printf("insert total %d records, used %u seconds, avg:%u useconds\n", 10, (endtime-starttime)/1000000UL, (endtime-starttime)/(10));
 
+exit:
   free(v.ts);  
   free(lb);
   free(params);
@@ -2227,7 +2228,7 @@ int stmt_funcb_autoctb_e3(TAOS_STMT *stmt) {
   int code = taos_stmt_prepare(stmt, sql, 0);
   if (code != 0){
     printf("failed to execute taos_stmt_prepare. code:%s\n", taos_stmt_errstr(stmt));
-    return -1;
+    goto exit;
     //exit(1);
   }
 
@@ -2255,6 +2256,7 @@ int stmt_funcb_autoctb_e3(TAOS_STMT *stmt) {
   unsigned long long endtime = getCurrentTime();
   printf("insert total %d records, used %u seconds, avg:%u useconds\n", 10, (endtime-starttime)/1000000UL, (endtime-starttime)/(10));
 
+exit:
   free(v.ts);  
   free(lb);
   free(params);
@@ -2464,7 +2466,7 @@ int stmt_funcb_autoctb_e4(TAOS_STMT *stmt) {
     code = taos_stmt_bind_param_batch(stmt, params + id * 10);
     if (code != 0) {
       printf("failed to execute taos_stmt_bind_param_batch. error:%s\n", taos_stmt_errstr(stmt));
-      return -1;
+      goto exit;
     }
     
     taos_stmt_add_batch(stmt);
@@ -2480,6 +2482,7 @@ int stmt_funcb_autoctb_e4(TAOS_STMT *stmt) {
   unsigned long long endtime = getCurrentTime();
   printf("insert total %d records, used %u seconds, avg:%u useconds\n", 10, (endtime-starttime)/1000000UL, (endtime-starttime)/(10));
 
+exit:
   free(v.ts);  
   free(lb);
   free(params);
@@ -2691,7 +2694,7 @@ int stmt_funcb_autoctb_e5(TAOS_STMT *stmt) {
     code = taos_stmt_bind_param_batch(stmt, params + id * 10);
     if (code != 0) {
       printf("failed to execute taos_stmt_bind_param_batch. error:%s\n", taos_stmt_errstr(stmt));
-      return -1;
+      goto exit;
     }
     
     taos_stmt_add_batch(stmt);
@@ -2707,6 +2710,8 @@ int stmt_funcb_autoctb_e5(TAOS_STMT *stmt) {
   unsigned long long endtime = getCurrentTime();
   printf("insert total %d records, used %u seconds, avg:%u useconds\n", 10, (endtime-starttime)/1000000UL, (endtime-starttime)/(10));
 
+
+exit:
   free(v.ts);  
   free(lb);
   free(params);
@@ -2718,6 +2723,38 @@ int stmt_funcb_autoctb_e5(TAOS_STMT *stmt) {
 }
 
 
+int stmt_funcb_autoctb_e6(TAOS_STMT *stmt) {
+  char *sql = "insert into ? using stb1 tags(?,?,?,?,?,?,?,?,?) values(now,?,?,?,?,?,?,?,?,?)";
+  int code = taos_stmt_prepare(stmt, sql, 0);
+  if (code != 0){
+    printf("case success:failed to execute taos_stmt_prepare. code:%s\n", taos_stmt_errstr(stmt));
+  }
+
+  return 0;
+}
+
+
+int stmt_funcb_autoctb_e7(TAOS_STMT *stmt) {
+  char *sql = "insert into ? using stb1 tags(?,?,?,?,?,?,?,?,?) values(?,true,?,?,?,?,?,?,?,?)";
+  int code = taos_stmt_prepare(stmt, sql, 0);
+  if (code != 0){
+    printf("case success:failed to execute taos_stmt_prepare. code:%s\n", taos_stmt_errstr(stmt));
+  }
+
+  return 0;
+}
+
+
+int stmt_funcb_autoctb_e8(TAOS_STMT *stmt) {
+  char *sql = "insert into ? using stb1 tags(?,?,?,?,?,?,?,?,?) values(?,?,1,?,?,?,?,?,?,?)";
+  int code = taos_stmt_prepare(stmt, sql, 0);
+  if (code != 0){
+    printf("case success:failed to execute taos_stmt_prepare. code:%s\n", taos_stmt_errstr(stmt));
+  }
+
+  return 0;
+}
+
 
 //300 tables 60 records
 int stmt_funcb1(TAOS_STMT *stmt) {
@@ -4853,6 +4890,44 @@ void* runcase(void *par) {
 
 #endif
 
+
+#if 1  
+  prepare(taos, 1, 0);
+
+  stmt = taos_stmt_init(taos);
+
+  printf("e6 start\n");
+  stmt_funcb_autoctb_e6(stmt);
+  printf("e6 end\n");
+  taos_stmt_close(stmt);
+
+#endif
+
+#if 1  
+  prepare(taos, 1, 0);
+
+  stmt = taos_stmt_init(taos);
+
+  printf("e7 start\n");
+  stmt_funcb_autoctb_e7(stmt);
+  printf("e7 end\n");
+  taos_stmt_close(stmt);
+
+#endif
+
+#if 1  
+  prepare(taos, 1, 0);
+
+  stmt = taos_stmt_init(taos);
+
+  printf("e8 start\n");
+  stmt_funcb_autoctb_e8(stmt);
+  printf("e8 end\n");
+  taos_stmt_close(stmt);
+  
+#endif
+
+
 #if 1
   prepare(taos, 1, 0);