From ceab359b914840df830f72832af9456c550ba69c Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sun, 9 Aug 2020 20:59:23 +0800
Subject: [PATCH 1/7] TD-1057

---
 src/os/src/windows/w64Env.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/os/src/windows/w64Env.c b/src/os/src/windows/w64Env.c
index c6046ecae7..57d34d4003 100644
--- a/src/os/src/windows/w64Env.c
+++ b/src/os/src/windows/w64Env.c
@@ -22,7 +22,7 @@ extern void taosWinSocketInit();
 
 void osInit() {
   if (configDir[0] == 0) {
-    strcpy(configDir, "~/TDengine/cfg");
+    strcpy(configDir, "C:/TDengine/cfg");
   }
 
   strcpy(tsVnodeDir, "C:/TDengine/data");

From a9cabb54fa67d8081780f216f33c969a0c933b05 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sun, 9 Aug 2020 22:59:42 +0800
Subject: [PATCH 2/7] TD-1057

---
 src/client/src/tscSql.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 3e5280401f..6b3653ff63 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -256,6 +256,7 @@ TAOS_RES* taos_query(TAOS *taos, const char *sqlstr) {
     return NULL;
   }
   
+  tsem_init(&pSql->rspSem, 0, 0);
   doAsyncQuery(pObj, pSql, waitForQueryRsp, taos, sqlstr, sqlLen);
 
   // wait for the callback function to post the semaphore

From 41d97eeea7257ce966d5e9c0a69e19b52f1afcd2 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sun, 9 Aug 2020 15:21:03 +0000
Subject: [PATCH 3/7] TD-1057

---
 src/client/src/tscSql.c        | 14 +++++++-------
 src/client/src/tscSub.c        |  8 ++++----
 src/client/src/tscSubquery.c   |  4 ++--
 src/client/src/tscUtil.c       |  2 +-
 src/dnode/src/dnodeSystem.c    |  8 ++++----
 src/dnode/src/dnodeTelemetry.c |  8 ++++----
 src/kit/taosdemo/taosdemo.c    | 30 +++++++++++++++---------------
 src/query/inc/qExecutor.h      |  2 +-
 src/rpc/test/rclient.c         | 10 +++++-----
 src/rpc/test/rsclient.c        |  6 +++---
 src/sync/src/tarbitrator.c     |  8 ++++----
 src/sync/test/syncClient.c     | 10 +++++-----
 12 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 6b3653ff63..7bb9be5d5c 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -141,7 +141,7 @@ static void syncConnCallback(void *param, TAOS_RES *tres, int code) {
   SSqlObj *pSql = (SSqlObj *) tres;
   assert(pSql != NULL);
   
-  sem_post(&pSql->rspSem);
+  tsem_post(&pSql->rspSem);
 }
 
 TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port) {
@@ -156,7 +156,7 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
     pSql->param = pSql;
     
     tscProcessSql(pSql);
-    sem_wait(&pSql->rspSem);
+    tsem_wait(&pSql->rspSem);
     
     if (pSql->res.code != TSDB_CODE_SUCCESS) {
       terrno = pSql->res.code;
@@ -225,12 +225,12 @@ void waitForQueryRsp(void *param, TAOS_RES *tres, int code) {
   assert(tres != NULL);
   
   SSqlObj *pSql = (SSqlObj *) tres;
-  sem_post(&pSql->rspSem);
+  tsem_post(&pSql->rspSem);
 }
 
 static void waitForRetrieveRsp(void *param, TAOS_RES *tres, int numOfRows) {
   SSqlObj* pSql = (SSqlObj*) tres;
-  sem_post(&pSql->rspSem);
+  tsem_post(&pSql->rspSem);
 }
 
 TAOS_RES* taos_query(TAOS *taos, const char *sqlstr) {
@@ -439,7 +439,7 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) {
        pCmd->command == TSDB_SQL_CLI_VERSION ||
        pCmd->command == TSDB_SQL_CURRENT_USER )) {
     taos_fetch_rows_a(res, waitForRetrieveRsp, pSql->pTscObj);
-    sem_wait(&pSql->rspSem);
+    tsem_wait(&pSql->rspSem);
   }
 
   return doSetResultRowData(pSql, true);
@@ -729,7 +729,7 @@ static void asyncCallback(void *param, TAOS_RES *tres, int code) {
   assert(param != NULL);
   SSqlObj *pSql = ((SSqlObj *)param);
   pSql->res.code = code;
-  sem_post(&pSql->rspSem);
+  tsem_post(&pSql->rspSem);
 }
 
 int taos_validate_sql(TAOS *taos, const char *sql) {
@@ -780,7 +780,7 @@ int taos_validate_sql(TAOS *taos, const char *sql) {
   pSql->param = pSql;
   int code = tsParseSql(pSql, true);
   if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
-    sem_wait(&pSql->rspSem);
+    tsem_wait(&pSql->rspSem);
     code = pSql->res.code;
   }
   if (code != TSDB_CODE_SUCCESS) {
diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index e9f2c1dc1d..608551c7f3 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -33,7 +33,7 @@ typedef struct SSubscriptionProgress {
 typedef struct SSub {
   void *                  signature;
   char                    topic[32];
-  sem_t                   sem;
+  tsem_t                  sem;
   int64_t                 lastSyncTime;
   int64_t                 lastConsumeTime;
   TAOS *                  taos;
@@ -85,7 +85,7 @@ static void asyncCallback(void *param, TAOS_RES *tres, int code) {
   assert(param != NULL);
   SSub *pSub = ((SSub *)param);
   pSub->pSql->res.code = code;
-  sem_post(&pSub->sem);
+  tsem_post(&pSub->sem);
 }
 
 
@@ -154,7 +154,7 @@ static SSub* tscCreateSubscription(STscObj* pObj, const char* topic, const char*
 
   code = tsParseSql(pSql, false);
   if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
-    sem_wait(&pSub->sem);
+    tsem_wait(&pSub->sem);
     code = pSql->res.code;
   }
   if (code != TSDB_CODE_SUCCESS) {
@@ -451,7 +451,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
     pSql->fetchFp = asyncCallback;
     pSql->param = pSub;
     tscDoQuery(pSql);
-    sem_wait(&pSub->sem);
+    tsem_wait(&pSub->sem);
 
     if (pRes->code != TSDB_CODE_SUCCESS) {
       continue;
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 8a596d8893..4e188d4fb6 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2057,7 +2057,7 @@ void tscBuildResFromSubqueries(SSqlObj *pSql) {
     }
 
     doBuildResFromSubqueries(pSql);
-    sem_post(&pSql->rspSem);
+    tsem_post(&pSql->rspSem);
 
     return;
 
@@ -2083,7 +2083,7 @@ void tscBuildResFromSubqueries(SSqlObj *pSql) {
 //      free(pState);
 //
 //      pRes->completed = true;  // set query completed
-//      sem_post(&pSql->rspSem);
+//      tsem_post(&pSql->rspSem);
 //      return;
 //    }
 
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 1b6d18be0c..582411fc0c 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -387,7 +387,7 @@ void tscFreeSqlObj(SSqlObj* pSql) {
   pCmd->allocSize = 0;
   
   taosTFree(pSql->sqlstr);
-  sem_destroy(&pSql->rspSem);
+  tsem_destroy(&pSql->rspSem);
   free(pSql);
 }
 
diff --git a/src/dnode/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c
index 2519684878..543e1c9639 100644
--- a/src/dnode/src/dnodeSystem.c
+++ b/src/dnode/src/dnodeSystem.c
@@ -22,7 +22,7 @@
 #include "dnodeMain.h"
 
 static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context);
-static sem_t exitSem;
+static tsem_t exitSem;
 
 int32_t main(int32_t argc, char *argv[]) {
   // Set global configuration file
@@ -88,7 +88,7 @@ int32_t main(int32_t argc, char *argv[]) {
 #endif
   }
 
-  if (sem_init(&exitSem, 0, 0) != 0) {
+  if (tsem_init(&exitSem, 0, 0) != 0) {
     printf("failed to create exit semphore\n");
     exit(EXIT_FAILURE);
   }
@@ -117,7 +117,7 @@ int32_t main(int32_t argc, char *argv[]) {
 
   syslog(LOG_INFO, "Started TDengine service successfully.");
 
-  for (int res = sem_wait(&exitSem); res != 0; res = sem_wait(&exitSem)) {
+  for (int res = tsem_wait(&exitSem); res != 0; res = tsem_wait(&exitSem)) {
     if (res != EINTR) {
       syslog(LOG_ERR, "failed to wait exit semphore: %d", res);
       break;
@@ -157,5 +157,5 @@ static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context) {
   sigaction(SIGUSR2, &act, NULL);
 
   // inform main thread to exit
-  sem_post(&exitSem);
+  tsem_post(&exitSem);
 }
diff --git a/src/dnode/src/dnodeTelemetry.c b/src/dnode/src/dnodeTelemetry.c
index 892fd1d903..8ed4a9518b 100644
--- a/src/dnode/src/dnodeTelemetry.c
+++ b/src/dnode/src/dnodeTelemetry.c
@@ -36,7 +36,7 @@
 #include "dnodeInt.h"
 #include "dnodeTelemetry.h"
 
-static sem_t tsExitSem;
+static tsem_t tsExitSem;
 static pthread_t tsTelemetryThread;
 
 #define TELEMETRY_SERVER "telemetry.taosdata.com"
@@ -266,7 +266,7 @@ int32_t dnodeInitTelemetry() {
     return 0;
   }
 
-  if (sem_init(&tsExitSem, 0, 0) == -1) {
+  if (tsem_init(&tsExitSem, 0, 0) == -1) {
     // just log the error, it is ok for telemetry to fail
     dTrace("failed to create semaphore for telemetry, reason:%s", strerror(errno));
     return 0;
@@ -291,8 +291,8 @@ void dnodeCleanupTelemetry() {
   }
 
   if (tsTelemetryThread) {
-    sem_post(&tsExitSem);
+    tsem_post(&tsExitSem);
     pthread_join(tsTelemetryThread, NULL);
-    sem_destroy(&tsExitSem);
+    tsem_destroy(&tsExitSem);
   }
 }
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 9d46ac5055..859e22a178 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -440,9 +440,9 @@ typedef struct {
   char* cols;  
   bool  use_metric;
 
-  sem_t mutex_sem;
+  tsem_t mutex_sem;
   int notFinished;
-  sem_t lock_sem;
+  tsem_t lock_sem;
 } info;
 
 typedef struct {
@@ -459,9 +459,9 @@ typedef struct {
   int data_of_order;
   int data_of_rate;
 
-  sem_t *mutex_sem;
-  int   *notFinished;
-  sem_t *lock_sem;
+  tsem_t *mutex_sem;
+  int    *notFinished;
+  tsem_t *lock_sem;
 } sTable;
 
 /* ******************************* Global
@@ -729,9 +729,9 @@ int main(int argc, char *argv[]) {
     t_info->end_table_id = i < b ? last + a : last + a - 1;
     last = t_info->end_table_id + 1;
 
-    sem_init(&(t_info->mutex_sem), 0, 1);
+    tsem_init(&(t_info->mutex_sem), 0, 1);
     t_info->notFinished = t_info->end_table_id - t_info->start_table_id + 1;
-    sem_init(&(t_info->lock_sem), 0, 0);
+    tsem_init(&(t_info->lock_sem), 0, 0);
 
     if (query_mode == SYNC) {
       pthread_create(pids + i, NULL, syncWrite, t_info);
@@ -762,8 +762,8 @@ int main(int argc, char *argv[]) {
   for (int i = 0; i < threads; i++) {
     info *t_info = infos + i;
     taos_close(t_info->taos);
-    sem_destroy(&(t_info->mutex_sem));
-    sem_destroy(&(t_info->lock_sem));
+    tsem_destroy(&(t_info->mutex_sem));
+    tsem_destroy(&(t_info->lock_sem));
   }
 
   free(pids);
@@ -1021,8 +1021,8 @@ void multiThreadCreateTable(char* cols, bool use_metric, int threads, int ntable
 
   for (int i = 0; i < threads; i++) {
     info *t_info = infos + i;
-    sem_destroy(&(t_info->mutex_sem));
-    sem_destroy(&(t_info->lock_sem));
+    tsem_destroy(&(t_info->mutex_sem));
+    tsem_destroy(&(t_info->lock_sem));
   }
 
   free(pids);
@@ -1272,7 +1272,7 @@ void *asyncWrite(void *sarg) {
     taos_query_a(winfo->taos, "show databases", callBack, tb_info);
   }
 
-  sem_wait(&(winfo->lock_sem));
+  tsem_wait(&(winfo->lock_sem));
   free(tb_infos);
 
   return NULL;
@@ -1292,10 +1292,10 @@ void callBack(void *param, TAOS_RES *res, int code) {
 
   // If finished;
   if (tb_info->counter >= tb_info->target) {
-    sem_wait(tb_info->mutex_sem);
+    tsem_wait(tb_info->mutex_sem);
     (*(tb_info->notFinished))--;
-    if (*(tb_info->notFinished) == 0) sem_post(tb_info->lock_sem);
-    sem_post(tb_info->mutex_sem);
+    if (*(tb_info->notFinished) == 0) tsem_post(tb_info->lock_sem);
+    tsem_post(tb_info->mutex_sem);
     return;
   }
 
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
index bd2e0a4470..9757036783 100644
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
@@ -186,7 +186,7 @@ typedef struct SQInfo {
   void*            signature;
   int32_t          pointsInterpo;
   int32_t          code;  // error code to returned to client
-//  sem_t            dataReady;
+//tsem_t           dataReady;
 
   void*            tsdb;
   int32_t          vgId;
diff --git a/src/rpc/test/rclient.c b/src/rpc/test/rclient.c
index 6ec2d82445..7a963e9ce4 100644
--- a/src/rpc/test/rclient.c
+++ b/src/rpc/test/rclient.c
@@ -26,8 +26,8 @@ typedef struct {
   int       num;
   int       numOfReqs;
   int       msgSize;
-  sem_t     rspSem; 
-  sem_t    *pOverSem; 
+  tsem_t    rspSem; 
+  tsem_t   *pOverSem; 
   pthread_t thread;
   void     *pRpc;
 } SInfo;
@@ -39,7 +39,7 @@ static void processResponse(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
   if (pEpSet) pInfo->epSet = *pEpSet;
 
   rpcFreeCont(pMsg->pCont);
-  sem_post(&pInfo->rspSem); 
+  tsem_post(&pInfo->rspSem); 
 }
 
 static int tcount = 0;
@@ -60,7 +60,7 @@ static void *sendRequest(void *param) {
     rpcSendRequest(pInfo->pRpc, &pInfo->epSet, &rpcMsg);
     if ( pInfo->num % 20000 == 0 ) 
       tInfo("thread:%d, %d requests have been sent", pInfo->index, pInfo->num);
-    sem_wait(&pInfo->rspSem);
+    tsem_wait(&pInfo->rspSem);
   }
 
   tDebug("thread:%d, it is over", pInfo->index);
@@ -171,7 +171,7 @@ int main(int argc, char *argv[]) {
     pInfo->epSet = epSet;
     pInfo->numOfReqs = numOfReqs;
     pInfo->msgSize = msgSize;
-    sem_init(&pInfo->rspSem, 0, 0);
+    tsem_init(&pInfo->rspSem, 0, 0);
     pInfo->pRpc = pRpc;
     pthread_create(&pInfo->thread, &thattr, sendRequest, pInfo);
     pInfo++;
diff --git a/src/rpc/test/rsclient.c b/src/rpc/test/rsclient.c
index 6e6961784b..a152d8e4a5 100644
--- a/src/rpc/test/rsclient.c
+++ b/src/rpc/test/rsclient.c
@@ -27,8 +27,8 @@ typedef struct {
   int       num;
   int       numOfReqs;
   int       msgSize;
-  sem_t     rspSem; 
-  sem_t    *pOverSem; 
+  tsem_t    rspSem; 
+  tsem_t   *pOverSem; 
   pthread_t thread;
   void     *pRpc;
 } SInfo;
@@ -171,7 +171,7 @@ int main(int argc, char *argv[]) {
     pInfo->epSet = epSet;
     pInfo->numOfReqs = numOfReqs;
     pInfo->msgSize = msgSize;
-    sem_init(&pInfo->rspSem, 0, 0);
+    tsem_init(&pInfo->rspSem, 0, 0);
     pInfo->pRpc = pRpc;
     pthread_create(&pInfo->thread, &thattr, sendRequest, pInfo);
     pInfo++;
diff --git a/src/sync/src/tarbitrator.c b/src/sync/src/tarbitrator.c
index 3c6db88a9c..3538391a94 100644
--- a/src/sync/src/tarbitrator.c
+++ b/src/sync/src/tarbitrator.c
@@ -31,7 +31,7 @@ static void arbSignalHandler(int32_t signum, siginfo_t *sigInfo, void *context);
 static void arbProcessIncommingConnection(int connFd, uint32_t sourceIp);
 static void arbProcessBrokenLink(void *param);
 static int  arbProcessPeerMsg(void *param, void *buffer);
-static sem_t    tsArbSem;
+static tsem_t   tsArbSem;
 static ttpool_h tsArbTcpPool;
 
 typedef struct {
@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
     }
   }
   
- if (sem_init(&tsArbSem, 0, 0) != 0) {
+ if (tsem_init(&tsArbSem, 0, 0) != 0) {
     printf("failed to create exit semphore\n");
     exit(EXIT_FAILURE);
   }
@@ -98,7 +98,7 @@ int main(int argc, char *argv[]) {
 
   sInfo("TAOS arbitrator: %s:%d is running", tsNodeFqdn, tsServerPort);
 
-  for (int res = sem_wait(&tsArbSem); res != 0; res = sem_wait(&tsArbSem)) {
+  for (int res = tsem_wait(&tsArbSem); res != 0; res = tsem_wait(&tsArbSem)) {
     if (res != EINTR) break;
   }
 
@@ -185,6 +185,6 @@ static void arbSignalHandler(int32_t signum, siginfo_t *sigInfo, void *context)
   sInfo("shut down signal is %d, sender PID:%d", signum, sigInfo->si_pid);
 
   // inform main thread to exit
-  sem_post(&tsArbSem);
+  tsem_post(&tsArbSem);
 }
 
diff --git a/src/sync/test/syncClient.c b/src/sync/test/syncClient.c
index cd873b758b..16053d1088 100644
--- a/src/sync/test/syncClient.c
+++ b/src/sync/test/syncClient.c
@@ -25,8 +25,8 @@ typedef struct {
   int       num;
   int       numOfReqs;
   int       msgSize;
-  sem_t     rspSem; 
-  sem_t    *pOverSem; 
+  tsem_t    rspSem; 
+  tsem_t   *pOverSem; 
   pthread_t thread;
   void     *pRpc;
 } SInfo;
@@ -38,7 +38,7 @@ void processResponse(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
   if (pEpSet) pInfo->epSet = *pEpSet;
   rpcFreeCont(pMsg->pCont);
 
-  sem_post(&pInfo->rspSem); 
+  tsem_post(&pInfo->rspSem); 
 }
 
 int tcount = 0;
@@ -59,7 +59,7 @@ void *sendRequest(void *param) {
     rpcSendRequest(pInfo->pRpc, &pInfo->epSet, &rpcMsg);
     if ( pInfo->num % 20000 == 0 ) 
       uInfo("thread:%d, %d requests have been sent", pInfo->index, pInfo->num);
-    sem_wait(&pInfo->rspSem);
+    tsem_wait(&pInfo->rspSem);
   }
 
   uDebug("thread:%d, it is over", pInfo->index);
@@ -169,7 +169,7 @@ int main(int argc, char *argv[]) {
     pInfo->epSet = epSet;
     pInfo->numOfReqs = numOfReqs;
     pInfo->msgSize = msgSize;
-    sem_init(&pInfo->rspSem, 0, 0);
+    tsem_init(&pInfo->rspSem, 0, 0);
     pInfo->pRpc = pRpc;
     pthread_create(&pInfo->thread, &thattr, sendRequest, pInfo);
     pInfo++;

From 4bd41a0fbf2d1fb400169a7df1ba9fccdd39f9dd Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 10 Aug 2020 18:17:14 +0800
Subject: [PATCH 4/7] TD-1057

---
 src/client/src/tscSub.c            |  2 +-
 src/client/src/tscSubquery.c       | 12 +++---
 src/client/src/tscUtil.c           |  2 +-
 src/os/inc/os.h                    |  1 +
 src/os/inc/osCommon.h              | 31 +++++++++++++++
 src/os/inc/osWindows.h             |  3 ++
 src/os/src/detail/osMemory.c       |  8 ++--
 src/plugins/http/src/httpContext.c |  2 +-
 src/plugins/http/src/httpSession.c |  2 +-
 src/query/src/qExecutor.c          | 12 +++---
 src/tsdb/src/tsdbRWHelper.c        |  4 +-
 src/tsdb/src/tsdbRead.c            |  8 ++--
 src/util/src/tkvstore.c            |  2 +-
 tests/script/test.bat              | 60 ++++++++++++++++++++++++++++++
 14 files changed, 122 insertions(+), 27 deletions(-)
 create mode 100644 src/os/inc/osCommon.h
 create mode 100644 tests/script/test.bat

diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index 608551c7f3..5d8e601882 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -339,7 +339,7 @@ static int tscLoadSubscriptionProgress(SSub* pSub) {
   fclose(fp);
 
   taosArraySort(progress, tscCompareSubscriptionProgress);
-  tscDebug("subscription progress loaded, %zu tables: %s", taosArrayGetSize(progress), pSub->topic);
+  tscDebug("subscription progress loaded, %%" PRIzu " tables: %s", taosArrayGetSize(progress), pSub->topic);
   return 1;
 }
 
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 4e188d4fb6..0718338237 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -362,7 +362,7 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
     }
 
     size_t numOfCols = taosArrayGetSize(pNewQueryInfo->colList);
-    tscDebug("%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%zu, colList:%zu, fieldsInfo:%d, name:%s",
+    tscDebug("%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, name:%s",
              pSql, pNew, 0, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, taosArrayGetSize(pNewQueryInfo->exprList),
              numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, pTableMetaInfo->name);
   }
@@ -522,7 +522,7 @@ static void issueTSCompQuery(SSqlObj* pSql, SJoinSupporter* pSupporter, SSqlObj*
   
   tscDebug(
       "%p subquery:%p tableIndex:%d, vgroupIndex:%d, numOfVgroups:%d, type:%d, ts_comp query to retrieve timestamps, "
-      "numOfExpr:%zu, colList:%zu, numOfOutputFields:%d, name:%s",
+      "numOfExpr:%" PRIzu ", colList:%" PRIzu ", numOfOutputFields:%d, name:%s",
       pParent, pSql, 0, pTableMetaInfo->vgroupIndex, pTableMetaInfo->vgroupList->numOfVgroups, pQueryInfo->type,
       tscSqlExprNumOfExprs(pQueryInfo), numOfCols, pQueryInfo->fieldsInfo.numOfOutput, pTableMetaInfo->name);
   
@@ -1225,7 +1225,7 @@ int32_t tscLaunchJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter
   
       tscDebug(
           "%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, transfer to tid_tag query to retrieve (tableId, tags), "
-          "exprInfo:%zu, colList:%zu, fieldsInfo:%d, tagIndex:%d, name:%s",
+          "exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, tagIndex:%d, name:%s",
           pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
           numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, index.columnIndex, pNewQueryInfo->pTableMetaInfo[0]->name);
     } else {
@@ -1260,7 +1260,7 @@ int32_t tscLaunchJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter
 
       tscDebug(
           "%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%u, transfer to ts_comp query to retrieve timestamps, "
-          "exprInfo:%zu, colList:%zu, fieldsInfo:%d, name:%s",
+          "exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, name:%s",
           pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
           numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, pNewQueryInfo->pTableMetaInfo[0]->name);
     }
@@ -1915,7 +1915,7 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
   pSql->pSubs = calloc(size, POINTER_BYTES);
   pSql->numOfSubs = (uint16_t)size;
 
-  tscDebug("%p submit data to %zu vnode(s)", pSql, size);
+  tscDebug("%p submit data to %" PRIzu " vnode(s)", pSql, size);
 
   SSubqueryState *pState = calloc(1, sizeof(SSubqueryState));
   pState->numOfTotal = pSql->numOfSubs;
@@ -1949,7 +1949,7 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
       tscDebug("%p sub:%p create subObj success. orderOfSub:%d", pSql, pNew, numOfSub);
       numOfSub++;
     } else {
-      tscDebug("%p prepare submit data block failed in async insertion, vnodeIdx:%d, total:%zu, code:%s", pSql, numOfSub,
+      tscDebug("%p prepare submit data block failed in async insertion, vnodeIdx:%d, total:%" PRIzu ", code:%s", pSql, numOfSub,
                size, tstrerror(pRes->code));
       goto _error;
     }
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 582411fc0c..3cd91c5ad1 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1864,7 +1864,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void
     size_t size = taosArrayGetSize(pNewQueryInfo->colList);
     
     tscDebug(
-        "%p new subquery:%p, tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%zu, colList:%zu,"
+        "%p new subquery:%p, tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%" PRIzu ", colList:%" PRIzu ","
         "fieldInfo:%d, name:%s, qrang:%" PRId64 " - %" PRId64 " order:%d, limit:%" PRId64,
         pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
         size, pNewQueryInfo->fieldsInfo.numOfOutput, pFinalInfo->name, pNewQueryInfo->window.skey,
diff --git a/src/os/inc/os.h b/src/os/inc/os.h
index 700b29ce98..11c423a500 100644
--- a/src/os/inc/os.h
+++ b/src/os/inc/os.h
@@ -41,6 +41,7 @@ extern "C" {
 #endif
 
 #include "osAtomic.h"
+#include "osCommon.h"
 #include "osDef.h"
 #include "osDir.h"
 #include "osFile.h"
diff --git a/src/os/inc/osCommon.h b/src/os/inc/osCommon.h
new file mode 100644
index 0000000000..70d2b2c0c2
--- /dev/null
+++ b/src/os/inc/osCommon.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_OS_COMMON_H
+#define TDENGINE_OS_COMMON_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef TAOS_OS_DEF_ZU
+  #define PRIzu "zu"
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osWindows.h b/src/os/inc/osWindows.h
index caab61536e..6665dcd920 100644
--- a/src/os/inc/osWindows.h
+++ b/src/os/inc/osWindows.h
@@ -97,6 +97,9 @@ typedef SOCKET eventfd_t;
 #define TAOS_OS_DEF_EPOLL
   #define TAOS_EPOLL_WAIT_TIME 100
 
+#define TAOS_OS_DEF_ZU
+  #define PRIzu "ld"  
+
 #define TAOS_OS_FUNC_STRING_WCHAR
   int twcslen(const wchar_t *wcs);
 #define TAOS_OS_FUNC_STRING_GETLINE
diff --git a/src/os/src/detail/osMemory.c b/src/os/src/detail/osMemory.c
index 3bbe806369..dfd320be89 100644
--- a/src/os/src/detail/osMemory.c
+++ b/src/os/src/detail/osMemory.c
@@ -42,7 +42,7 @@ static bool random_alloc_fail(size_t size, const char* file, uint32_t line) {
   }
 
   if (fpAllocLog != NULL) {
-    fprintf(fpAllocLog, "%s:%d: memory allocation of %zu bytes will fail.\n", file, line, size);
+    fprintf(fpAllocLog, "%s:%d: memory allocation of %" PRIzu " bytes will fail.\n", file, line, size);
   }
 
   return true;
@@ -159,7 +159,7 @@ static void* malloc_detect_leak(size_t size, const char* file, uint32_t line) {
   }
 
   if (size > UINT32_MAX && fpAllocLog != NULL) {
-    fprintf(fpAllocLog, "%s:%d: size too large: %zu.\n", file, line, size);
+    fprintf(fpAllocLog, "%s:%d: size too large: %" PRIzu ".\n", file, line, size);
   }
 
   blk->file = file;
@@ -207,7 +207,7 @@ static void* realloc_detect_leak(void* ptr, size_t size, const char* file, uint3
   }
 
   if (size > UINT32_MAX && fpAllocLog != NULL) {
-    fprintf(fpAllocLog, "%s:%d: size too large: %zu.\n", file, line, size);
+    fprintf(fpAllocLog, "%s:%d: size too large: %" PRIzu ".\n", file, line, size);
   }
 
   blk = (SMemBlock*)p;
@@ -295,7 +295,7 @@ static void dump_memory_leak() {
 
   atomic_store_ptr(&lock, 0);
 
-  fprintf(fpAllocLog, "\nnumber of blocks: %zu, total bytes: %zu\n", numOfBlk, totalSize);
+  fprintf(fpAllocLog, "\nnumber of blocks: %" PRIzu ", total bytes: %" PRIzu "\n", numOfBlk, totalSize);
   fflush(fpAllocLog);
 }
 
diff --git a/src/plugins/http/src/httpContext.c b/src/plugins/http/src/httpContext.c
index e367911695..7d6cca511e 100644
--- a/src/plugins/http/src/httpContext.c
+++ b/src/plugins/http/src/httpContext.c
@@ -70,7 +70,7 @@ bool httpInitContexts() {
 void httpCleanupContexts() {
   if (tsHttpServer.contextCache != NULL) {
     SCacheObj *cache = tsHttpServer.contextCache;
-    httpInfo("context cache is cleanuping, size:%zu", taosHashGetSize(cache->pHashTable));
+    httpInfo("context cache is cleanuping, size:%" PRIzu "", taosHashGetSize(cache->pHashTable));
     taosCacheCleanup(tsHttpServer.contextCache);
     tsHttpServer.contextCache = NULL;
   }
diff --git a/src/plugins/http/src/httpSession.c b/src/plugins/http/src/httpSession.c
index fce85df45e..ad57f0fc29 100644
--- a/src/plugins/http/src/httpSession.c
+++ b/src/plugins/http/src/httpSession.c
@@ -107,7 +107,7 @@ static void httpDestroySession(void *data) {
 void httpCleanUpSessions() {
   if (tsHttpServer.sessionCache != NULL) {
     SCacheObj *cache = tsHttpServer.sessionCache;
-    httpInfo("session cache is cleanuping, size:%zu", taosHashGetSize(cache->pHashTable));
+    httpInfo("session cache is cleanuping, size:%" PRIzu "", taosHashGetSize(cache->pHashTable));
     taosCacheCleanup(tsHttpServer.sessionCache);
     tsHttpServer.sessionCache = NULL;
   }
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index be3d476be5..71bf0eaa5a 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -4478,7 +4478,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
     while (pQInfo->groupIndex < numOfGroups) {
       SArray* group = taosArrayGetP(pQInfo->tableGroupInfo.pGroupList, pQInfo->groupIndex);
 
-      qDebug("QInfo:%p last_row query on group:%d, total group:%zu, current group:%p", pQInfo, pQInfo->groupIndex,
+      qDebug("QInfo:%p last_row query on group:%d, total group:%" PRIzu ", current group:%p", pQInfo, pQInfo->groupIndex,
              numOfGroups, group);
 
       STsdbQueryCond cond = {
@@ -4552,7 +4552,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
     while (pQInfo->groupIndex < numOfGroups) {
       SArray* group = taosArrayGetP(pQInfo->tableGroupInfo.pGroupList, pQInfo->groupIndex);
 
-      qDebug("QInfo:%p group by normal columns group:%d, total group:%zu", pQInfo, pQInfo->groupIndex, numOfGroups);
+      qDebug("QInfo:%p group by normal columns group:%d, total group:%" PRIzu "", pQInfo, pQInfo->groupIndex, numOfGroups);
 
       STsdbQueryCond cond = {
           .colList = pQuery->colList,
@@ -4743,7 +4743,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
   }
 
   qDebug(
-      "QInfo %p numOfTables:%"PRIu64", index:%d, numOfGroups:%zu, %"PRId64" points returned, total:%"PRId64", offset:%" PRId64,
+      "QInfo %p numOfTables:%"PRIu64", index:%d, numOfGroups:%" PRIzu ", %"PRId64" points returned, total:%"PRId64", offset:%" PRId64,
       pQInfo, pQInfo->tableqinfoGroupInfo.numOfTables, pQInfo->tableIndex, numOfGroups, pQuery->rec.rows, pQuery->rec.total,
       pQuery->limit.offset);
 }
@@ -6241,11 +6241,11 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qi
         goto _over;
       }
 
-      qDebug("qmsg:%p query on %zu tables in one group from client", pQueryMsg, tableGroupInfo.numOfTables);
+      qDebug("qmsg:%p query on %" PRIzu " tables in one group from client", pQueryMsg, tableGroupInfo.numOfTables);
     }
 
     int64_t el = taosGetTimestampUs() - st;
-    qDebug("qmsg:%p tag filter completed, numOfTables:%zu, elapsed time:%"PRId64"us", pQueryMsg, tableGroupInfo.numOfTables, el);
+    qDebug("qmsg:%p tag filter completed, numOfTables:%" PRIzu ", elapsed time:%"PRId64"us", pQueryMsg, tableGroupInfo.numOfTables, el);
   } else {
     assert(0);
   }
@@ -6356,7 +6356,7 @@ bool qTableQuery(qinfo_t qinfo) {
   if (IS_QUERY_KILLED(pQInfo)) {
     qDebug("QInfo:%p query is killed", pQInfo);
   } else if (pQuery->rec.rows == 0) {
-    qDebug("QInfo:%p over, %zu tables queried, %"PRId64" rows are returned", pQInfo, pQInfo->tableqinfoGroupInfo.numOfTables, pQuery->rec.total);
+    qDebug("QInfo:%p over, %" PRIzu " tables queried, %"PRId64" rows are returned", pQInfo, pQInfo->tableqinfoGroupInfo.numOfTables, pQuery->rec.total);
   } else {
     qDebug("QInfo:%p query paused, %" PRId64 " rows returned, numOfTotal:%" PRId64 " rows",
            pQInfo, pQuery->rec.rows, pQuery->rec.total + pQuery->rec.rows);
diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c
index d63bf8ab78..41da1b2dc6 100644
--- a/src/tsdb/src/tsdbRWHelper.c
+++ b/src/tsdb/src/tsdbRWHelper.c
@@ -608,14 +608,14 @@ int tsdbLoadCompData(SRWHelper *pHelper, SCompBlock *pCompBlock, void *target) {
   }
 
   if (taosTRead(pFile->fd, (void *)pHelper->pCompData, tsize) < tsize) {
-    tsdbError("vgId:%d failed to read %zu bytes from file %s since %s", REPO_ID(pHelper->pRepo), tsize, pFile->fname,
+    tsdbError("vgId:%d failed to read %" PRIzu " bytes from file %s since %s", REPO_ID(pHelper->pRepo), tsize, pFile->fname,
               strerror(errno));
     terrno = TAOS_SYSTEM_ERROR(errno);
     return -1;
   }
 
   if (!taosCheckChecksumWhole((uint8_t *)pHelper->pCompData, (uint32_t)tsize)) {
-    tsdbError("vgId:%d file %s is broken, offset %" PRId64 " size %zu", REPO_ID(pHelper->pRepo), pFile->fname,
+    tsdbError("vgId:%d file %s is broken, offset %" PRId64 " size %" PRIzu "", REPO_ID(pHelper->pRepo), pFile->fname,
               (int64_t)pCompBlock->offset, tsize);
     terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
     return -1;
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 17b0239e3b..051dcf7adf 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -250,7 +250,7 @@ TsdbQueryHandleT* tsdbQueryTables(TSDB_REPO_T* tsdb, STsdbQueryCond* pCond, STab
   taosArraySort(pQueryHandle->pTableCheckInfo, tsdbCheckInfoCompar);
   pQueryHandle->defaultLoadColumn = getDefaultLoadColumns(pQueryHandle, true);
 
-  tsdbDebug("%p total numOfTable:%zu in query, %p", pQueryHandle, taosArrayGetSize(pQueryHandle->pTableCheckInfo), pQueryHandle->qinfo);
+  tsdbDebug("%p total numOfTable:%" PRIzu " in query, %p", pQueryHandle, taosArrayGetSize(pQueryHandle->pTableCheckInfo), pQueryHandle->qinfo);
 
   tsdbInitDataBlockLoadInfo(&pQueryHandle->dataBlockLoadInfo);
   tsdbInitCompBlockLoadInfo(&pQueryHandle->compBlockLoadInfo);
@@ -2190,7 +2190,7 @@ SArray* createTableGroup(SArray* pTableList, STSchema* pTagSchema, SColIndex* pC
     }
 
     taosArrayPush(pTableGroup, &sa);
-    tsdbDebug("all %zu tables belong to one group", size);
+    tsdbDebug("all %" PRIzu " tables belong to one group", size);
   } else {
     STableGroupSupporter *pSupp = (STableGroupSupporter *) calloc(1, sizeof(STableGroupSupporter));
     pSupp->numOfCols = numOfOrderCols;
@@ -2309,7 +2309,7 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, const char* pT
     pGroupInfo->numOfTables = taosArrayGetSize(res);
     pGroupInfo->pGroupList  = createTableGroup(res, pTagSchema, pColIndex, numOfCols);
 
-    tsdbDebug("%p no table name/tag condition, all tables belong to one group, numOfTables:%zu", tsdb, pGroupInfo->numOfTables);
+    tsdbDebug("%p no table name/tag condition, all tables belong to one group, numOfTables:%" PRIzu "", tsdb, pGroupInfo->numOfTables);
     taosArrayDestroy(res);
 
     if (tsdbUnlockRepoMeta(tsdb) < 0) goto _error;
@@ -2352,7 +2352,7 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, const char* pT
   pGroupInfo->numOfTables = taosArrayGetSize(res);
   pGroupInfo->pGroupList  = createTableGroup(res, pTagSchema, pColIndex, numOfCols);
 
-  tsdbDebug("%p stable tid:%d, uid:%"PRIu64" query, numOfTables:%zu, belong to %zu groups", tsdb, pTable->tableId.tid,
+  tsdbDebug("%p stable tid:%d, uid:%"PRIu64" query, numOfTables:%" PRIzu ", belong to %" PRIzu " groups", tsdb, pTable->tableId.tid,
       pTable->tableId.uid, pGroupInfo->numOfTables, taosArrayGetSize(pGroupInfo->pGroupList));
 
   taosArrayDestroy(res);
diff --git a/src/util/src/tkvstore.c b/src/util/src/tkvstore.c
index 9657d82773..c10e882d57 100644
--- a/src/util/src/tkvstore.c
+++ b/src/util/src/tkvstore.c
@@ -509,7 +509,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
     ssize_t tsize = taosTRead(pStore->fd, tbuf, sizeof(SKVRecord));
     if (tsize == 0) break;
     if (tsize < sizeof(SKVRecord)) {
-      uError("failed to read %zu bytes from file %s at offset %" PRId64 "since %s", sizeof(SKVRecord), pStore->fname,
+      uError("failed to read %" PRIzu " bytes from file %s at offset %" PRId64 "since %s", sizeof(SKVRecord), pStore->fname,
              pStore->info.size, strerror(errno));
       terrno = TAOS_SYSTEM_ERROR(errno);
       goto _err;
diff --git a/tests/script/test.bat b/tests/script/test.bat
new file mode 100644
index 0000000000..1574b5013e
--- /dev/null
+++ b/tests/script/test.bat
@@ -0,0 +1,60 @@
+@echo off
+
+echo TDengine in windows
+echo Start TDengine Testing Case ...
+
+set "SCRIPT_DIR=%~dp0"
+echo SCRIPT_DIR: %SCRIPT_DIR%
+
+set "BUILD_DIR=%~dp0..\..\debug\build\bin"
+set "TSIM=%~dp0..\..\debug\build\bin\tsim"
+echo BUILD_DIR:  %BUILD_DIR%
+
+set "SIM_DIR=%~dp0..\..\sim"
+echo SIM_DIR:    %SIM_DIR%
+
+set "TSIM_DIR=%~dp0..\..\sim\tsim"
+echo TSIM_DIR:   %TSIM_DIR%
+
+set "CFG_DIR=%~dp0..\..\sim\tsim\cfg"
+echo CFG_DIR:    %CFG_DIR%
+
+set "LOG_DIR=%~dp0..\..\sim\tsim\log"
+echo LOG_DIR:    %LOG_DIR%
+
+set "TAOS_CFG=%~dp0..\..\sim\tsim\cfg\taos.cfg"
+echo TAOS_CFG:   %TAOS_CFG%
+
+if not exist %SIM_DIR%  mkdir %SIM_DIR%
+if not exist %TSIM_DIR% mkdir %TSIM_DIR%
+if exist %CFG_DIR% rmdir /s/q %CFG_DIR%
+if exist %LOG_DIR% rmdir /s/q %LOG_DIR%
+if not exist %CFG_DIR% mkdir %CFG_DIR%
+if not exist %LOG_DIR% mkdir %LOG_DIR%
+
+echo firstEp       %FIRSTEP%     > %TAOS_CFG%
+echo serverPort    6030          >> %TAOS_CFG%
+echo wal           2             >> %TAOS_CFG%
+echo asyncLog      0             >> %TAOS_CFG%
+echo locale        en_US.UTF-8   >> %TAOS_CFG%
+echo logDir        %LOG_DIR%     >> %TAOS_CFG%
+echo scriptDir     %SCRIPT_DIR%  >> %TAOS_CFG%
+echo numOfLogLines 100000000     >> %TAOS_CFG%
+echo tmrDebugFlag  131           >> %TAOS_CFG%
+echo rpcDebugFlag  143           >> %TAOS_CFG%
+echo cDebugFlag    143           >> %TAOS_CFG%
+echo qdebugFlag    143           >> %TAOS_CFG%
+echo udebugFlag    143           >> %TAOS_CFG%
+
+set "FILE_NAME=windows\testSuite.sim"
+set "FIRSTEP=localhost"
+if "%1" == "-f" set "FILE_NAME=%2"
+if "%1" == "-h" set "FIRSTEP=%2"
+if "%3" == "-f" set "FILE_NAME=%4"
+if "%3" == "-h" set "FIRSTEP=%4"
+
+echo FILE_NAME:  %FILE_NAME%
+echo FIRSTEP:    %FIRSTEP%
+echo ExcuteCmd:  %tsim% -c %CFG_DIR% -f %FILE_NAME%
+
+%tsim% -c %CFG_DIR% -f %FILE_NAME%
\ No newline at end of file

From 5aae4b90786096e4438bd66b23d3f37a0943d1e6 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 10 Aug 2020 18:46:20 +0800
Subject: [PATCH 5/7] TD-1057 first compile version of windows 64 client

---
 src/client/src/tscSub.c            |  2 +-
 tests/script/windows/testSuite.sim | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index 5d8e601882..0e1be926f4 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -339,7 +339,7 @@ static int tscLoadSubscriptionProgress(SSub* pSub) {
   fclose(fp);
 
   taosArraySort(progress, tscCompareSubscriptionProgress);
-  tscDebug("subscription progress loaded, %%" PRIzu " tables: %s", taosArrayGetSize(progress), pSub->topic);
+  tscDebug("subscription progress loaded, %" PRIzu " tables: %s", taosArrayGetSize(progress), pSub->topic);
   return 1;
 }
 
diff --git a/tests/script/windows/testSuite.sim b/tests/script/windows/testSuite.sim
index e372217b62..fc574ed9c4 100644
--- a/tests/script/windows/testSuite.sim
+++ b/tests/script/windows/testSuite.sim
@@ -1,14 +1,14 @@
 run windows/alter/table.sim   
 run windows/alter/metrics.sim  
 
-run windows/compute/avg.sim         
+#run windows/compute/avg.sim         
 run windows/compute/bottom.sim 
 run windows/compute/count.sim       
 run windows/compute/diff.sim       
 run windows/compute/first.sim        
 run windows/compute/interval.sim   
 run windows/compute/last.sim    
-run windows/compute/leastsquare.sim 
+##run windows/compute/leastsquare.sim 
 run windows/compute/max.sim           
 run windows/compute/min.sim         
 run windows/compute/percentile.sim   
@@ -37,12 +37,12 @@ run windows/field/tinyint.sim
 run windows/import/basic.sim   
 
 run windows/insert/basic.sim              
-run windows/insert/query_block1_file.sim   
-run windows/insert/query_block1_memory.sim 
-run windows/insert/query_block2_file.sim   
-run windows/insert/query_block2_memory.sim 
-run windows/insert/query_file_memory.sim   
-run windows/insert/query_multi_file.sim  
+#run windows/insert/query_block1_file.sim   
+#run windows/insert/query_block1_memory.sim 
+#run windows/insert/query_block2_file.sim   
+#run windows/insert/query_block2_memory.sim 
+#run windows/insert/query_file_memory.sim   
+#run windows/insert/query_multi_file.sim  
 
 run windows/table/binary.sim 
 run windows/table/bool.sim 

From e57965f64ace0f9c08f8e6ad70dd99cee249b7e6 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 10 Aug 2020 13:48:59 +0000
Subject: [PATCH 6/7] TD-1057

---
 tests/script/windows/alter/metrics.sim           |  7 +++++++
 tests/script/windows/alter/table.sim             |  7 +++++++
 tests/script/windows/compute/avg.sim             |  7 +++++++
 tests/script/windows/compute/bottom.sim          |  7 +++++++
 tests/script/windows/compute/count.sim           |  7 +++++++
 tests/script/windows/compute/diff.sim            |  7 +++++++
 tests/script/windows/compute/first.sim           |  7 +++++++
 tests/script/windows/compute/interval.sim        |  7 +++++++
 tests/script/windows/compute/last.sim            |  7 +++++++
 tests/script/windows/compute/leastsquare.sim     |  7 +++++++
 tests/script/windows/compute/max.sim             |  7 +++++++
 tests/script/windows/compute/min.sim             |  7 +++++++
 tests/script/windows/compute/percentile.sim      |  7 +++++++
 tests/script/windows/compute/stddev.sim          |  7 +++++++
 tests/script/windows/compute/sum.sim             |  7 +++++++
 tests/script/windows/compute/top.sim             |  7 +++++++
 tests/script/windows/db/basic.sim                |  7 +++++++
 tests/script/windows/db/len.sim                  |  7 +++++++
 tests/script/windows/field/2.sim                 |  7 +++++++
 tests/script/windows/field/3.sim                 |  7 +++++++
 tests/script/windows/field/4.sim                 |  7 +++++++
 tests/script/windows/field/5.sim                 |  7 +++++++
 tests/script/windows/field/6.sim                 |  7 +++++++
 tests/script/windows/field/bigint.sim            |  7 +++++++
 tests/script/windows/field/binary.sim            |  7 +++++++
 tests/script/windows/field/bool.sim              |  7 +++++++
 tests/script/windows/field/double.sim            |  7 +++++++
 tests/script/windows/field/float.sim             |  7 +++++++
 tests/script/windows/field/int.sim               |  7 +++++++
 tests/script/windows/field/single.sim            |  7 +++++++
 tests/script/windows/field/smallint.sim          |  7 +++++++
 tests/script/windows/field/tinyint.sim           |  7 +++++++
 tests/script/windows/import/basic.sim            |  7 +++++++
 tests/script/windows/insert/basic.sim            |  7 +++++++
 .../script/windows/insert/query_block1_file.sim  |  9 ++++++++-
 .../windows/insert/query_block1_memory.sim       |  7 +++++++
 .../script/windows/insert/query_block2_file.sim  |  7 +++++++
 .../windows/insert/query_block2_memory.sim       |  7 +++++++
 .../script/windows/insert/query_file_memory.sim  |  7 +++++++
 tests/script/windows/insert/query_multi_file.sim |  7 +++++++
 tests/script/windows/table/binary.sim            |  7 +++++++
 tests/script/windows/table/bool.sim              |  7 +++++++
 tests/script/windows/table/column_name.sim       |  8 ++++++++
 tests/script/windows/table/column_num.sim        |  8 ++++++++
 tests/script/windows/table/column_value.sim      |  8 ++++++++
 tests/script/windows/table/db.table.sim          |  8 ++++++++
 tests/script/windows/table/double.sim            |  7 +++++++
 tests/script/windows/table/float.sim             |  7 +++++++
 tests/script/windows/table/table.sim             |  7 +++++++
 tests/script/windows/table/table_len.sim         |  7 +++++++
 tests/script/windows/tag/3.sim                   |  7 +++++++
 tests/script/windows/tag/4.sim                   |  7 +++++++
 tests/script/windows/tag/5.sim                   |  7 +++++++
 tests/script/windows/tag/6.sim                   |  7 +++++++
 tests/script/windows/tag/add.sim                 |  7 +++++++
 tests/script/windows/tag/bigint.sim              |  7 +++++++
 tests/script/windows/tag/binary.sim              |  7 +++++++
 tests/script/windows/tag/binary_binary.sim       |  7 +++++++
 tests/script/windows/tag/bool.sim                |  7 +++++++
 tests/script/windows/tag/bool_binary.sim         |  7 +++++++
 tests/script/windows/tag/bool_int.sim            |  7 +++++++
 tests/script/windows/tag/change.sim              |  7 +++++++
 tests/script/windows/tag/column.sim              |  7 +++++++
 tests/script/windows/tag/create.sim              |  7 +++++++
 tests/script/windows/tag/delete.sim              |  7 +++++++
 tests/script/windows/tag/double.sim              |  7 +++++++
 tests/script/windows/tag/filter.sim              |  7 +++++++
 tests/script/windows/tag/float.sim               |  7 +++++++
 tests/script/windows/tag/int.sim                 |  7 +++++++
 tests/script/windows/tag/int_binary.sim          |  7 +++++++
 tests/script/windows/tag/int_float.sim           |  7 +++++++
 tests/script/windows/tag/set.sim                 |  7 +++++++
 tests/script/windows/tag/smallint.sim            |  7 +++++++
 tests/script/windows/tag/tinyint.sim             |  7 +++++++
 tests/script/windows/testSuite.sim               | 16 ++++++++--------
 tests/script/windows/vector/metrics_field.sim    |  7 +++++++
 tests/script/windows/vector/metrics_mix.sim      |  7 +++++++
 tests/script/windows/vector/metrics_query.sim    |  7 +++++++
 tests/script/windows/vector/metrics_tag.sim      |  7 +++++++
 tests/script/windows/vector/metrics_time.sim     |  7 +++++++
 tests/script/windows/vector/multi.sim            |  7 +++++++
 tests/script/windows/vector/single.sim           |  7 +++++++
 tests/script/windows/vector/table_field.sim      |  7 +++++++
 tests/script/windows/vector/table_mix.sim        |  7 +++++++
 tests/script/windows/vector/table_query.sim      |  7 +++++++
 tests/script/windows/vector/table_time.sim       |  7 +++++++
 86 files changed, 608 insertions(+), 9 deletions(-)

diff --git a/tests/script/windows/alter/metrics.sim b/tests/script/windows/alter/metrics.sim
index 3717d8c1ed..7d5dc77949 100644
--- a/tests/script/windows/alter/metrics.sim
+++ b/tests/script/windows/alter/metrics.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 print ======== step1 
 sql create database d2
 sql use d2
diff --git a/tests/script/windows/alter/table.sim b/tests/script/windows/alter/table.sim
index 3b811a065e..03182e613d 100644
--- a/tests/script/windows/alter/table.sim
+++ b/tests/script/windows/alter/table.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 print ======== step1 
 sql create database d1
 sql use d1
diff --git a/tests/script/windows/compute/avg.sim b/tests/script/windows/compute/avg.sim
index 1374ca5a25..b655abf163 100644
--- a/tests/script/windows/compute/avg.sim
+++ b/tests/script/windows/compute/avg.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_av_db
 $tbPrefix = m_av_tb
 $mtPrefix = m_av_mt
diff --git a/tests/script/windows/compute/bottom.sim b/tests/script/windows/compute/bottom.sim
index e908c774e4..dc104a8ebd 100644
--- a/tests/script/windows/compute/bottom.sim
+++ b/tests/script/windows/compute/bottom.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_bo_db
 $tbPrefix = m_bo_tb
 $mtPrefix = m_bo_mt
diff --git a/tests/script/windows/compute/count.sim b/tests/script/windows/compute/count.sim
index 54544f0354..9c9d8821b0 100644
--- a/tests/script/windows/compute/count.sim
+++ b/tests/script/windows/compute/count.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_co_db
 $tbPrefix = m_co_tb
 $mtPrefix = m_co_mt
diff --git a/tests/script/windows/compute/diff.sim b/tests/script/windows/compute/diff.sim
index 6c2829872a..667fcdbcff 100644
--- a/tests/script/windows/compute/diff.sim
+++ b/tests/script/windows/compute/diff.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_di_db
 $tbPrefix = m_di_tb
 $mtPrefix = m_di_mt
diff --git a/tests/script/windows/compute/first.sim b/tests/script/windows/compute/first.sim
index 9a0c02fe4b..d6e1b1deea 100644
--- a/tests/script/windows/compute/first.sim
+++ b/tests/script/windows/compute/first.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_fi_db
 $tbPrefix = m_fi_tb
 $mtPrefix = m_fi_mt
diff --git a/tests/script/windows/compute/interval.sim b/tests/script/windows/compute/interval.sim
index 365c6d9d31..4bf548ccf2 100644
--- a/tests/script/windows/compute/interval.sim
+++ b/tests/script/windows/compute/interval.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_in_db
 $tbPrefix = m_in_tb
 $mtPrefix = m_in_mt
diff --git a/tests/script/windows/compute/last.sim b/tests/script/windows/compute/last.sim
index aa9699778f..63d4d3ecbd 100644
--- a/tests/script/windows/compute/last.sim
+++ b/tests/script/windows/compute/last.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_la_db
 $tbPrefix = m_la_tb
 $mtPrefix = m_la_mt
diff --git a/tests/script/windows/compute/leastsquare.sim b/tests/script/windows/compute/leastsquare.sim
index bb7404edd0..4cd3ad1fb9 100644
--- a/tests/script/windows/compute/leastsquare.sim
+++ b/tests/script/windows/compute/leastsquare.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_le_db
 $tbPrefix = m_le_tb
 $mtPrefix = m_le_mt
diff --git a/tests/script/windows/compute/max.sim b/tests/script/windows/compute/max.sim
index a19d122ecd..e480736550 100644
--- a/tests/script/windows/compute/max.sim
+++ b/tests/script/windows/compute/max.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_ma_db
 $tbPrefix = m_ma_tb
 $mtPrefix = m_ma_mt
diff --git a/tests/script/windows/compute/min.sim b/tests/script/windows/compute/min.sim
index 216f2061d7..1ff637cecd 100644
--- a/tests/script/windows/compute/min.sim
+++ b/tests/script/windows/compute/min.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_mi_db
 $tbPrefix = m_mi_tb
 $mtPrefix = m_mi_mt
diff --git a/tests/script/windows/compute/percentile.sim b/tests/script/windows/compute/percentile.sim
index 20b2740d6e..5e327055a8 100644
--- a/tests/script/windows/compute/percentile.sim
+++ b/tests/script/windows/compute/percentile.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_pe_db
 $tbPrefix = m_pe_tb
 $mtPrefix = m_pe_mt
diff --git a/tests/script/windows/compute/stddev.sim b/tests/script/windows/compute/stddev.sim
index c02b3e4ab3..2aa481248a 100644
--- a/tests/script/windows/compute/stddev.sim
+++ b/tests/script/windows/compute/stddev.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_st_db
 $tbPrefix = m_st_tb
 $mtPrefix = m_st_mt
diff --git a/tests/script/windows/compute/sum.sim b/tests/script/windows/compute/sum.sim
index 04af1d457a..30e98a5b25 100644
--- a/tests/script/windows/compute/sum.sim
+++ b/tests/script/windows/compute/sum.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_su_db
 $tbPrefix = m_su_tb
 $mtPrefix = m_su_mt
diff --git a/tests/script/windows/compute/top.sim b/tests/script/windows/compute/top.sim
index b3c698c064..9590997ef7 100644
--- a/tests/script/windows/compute/top.sim
+++ b/tests/script/windows/compute/top.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_to_db
 $tbPrefix = m_to_tb
 $mtPrefix = m_to_mt
diff --git a/tests/script/windows/db/basic.sim b/tests/script/windows/db/basic.sim
index f1e18d15a5..fffde94d66 100644
--- a/tests/script/windows/db/basic.sim
+++ b/tests/script/windows/db/basic.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 print ============================ dnode1 start
 
 $i = 0
diff --git a/tests/script/windows/db/len.sim b/tests/script/windows/db/len.sim
index f922e7e05a..5afa2496dd 100644
--- a/tests/script/windows/db/len.sim
+++ b/tests/script/windows/db/len.sim
@@ -1,6 +1,13 @@
 sleep 3000
 sql connect
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 print =============== step1
 sql_error drop database dd
 
diff --git a/tests/script/windows/field/2.sim b/tests/script/windows/field/2.sim
index 3d4492083e..8ac6fa1a1b 100644
--- a/tests/script/windows/field/2.sim
+++ b/tests/script/windows/field/2.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_bt_db
 $tbPrefix = fi_bt_tb
 $mtPrefix = fi_bt_mt
diff --git a/tests/script/windows/field/3.sim b/tests/script/windows/field/3.sim
index fb7d60d12a..331e930b31 100644
--- a/tests/script/windows/field/3.sim
+++ b/tests/script/windows/field/3.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_3_db
 $tbPrefix = fi_3_tb
 $mtPrefix = fi_3_mt
diff --git a/tests/script/windows/field/4.sim b/tests/script/windows/field/4.sim
index f7ffa9807c..c6224c46ee 100644
--- a/tests/script/windows/field/4.sim
+++ b/tests/script/windows/field/4.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_4_db
 $tbPrefix = fi_4_tb
 $mtPrefix = fi_4_mt
diff --git a/tests/script/windows/field/5.sim b/tests/script/windows/field/5.sim
index e408871693..d1f40059d0 100644
--- a/tests/script/windows/field/5.sim
+++ b/tests/script/windows/field/5.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_5_db
 $tbPrefix = fi_5_tb
 $mtPrefix = fi_5_mt
diff --git a/tests/script/windows/field/6.sim b/tests/script/windows/field/6.sim
index d1551d63b5..98071f87df 100644
--- a/tests/script/windows/field/6.sim
+++ b/tests/script/windows/field/6.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_6_db
 $tbPrefix = fi_6_tb
 $mtPrefix = fi_6_mt
diff --git a/tests/script/windows/field/bigint.sim b/tests/script/windows/field/bigint.sim
index 9ccaeb3723..bef571f445 100644
--- a/tests/script/windows/field/bigint.sim
+++ b/tests/script/windows/field/bigint.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_bi_db
 $tbPrefix = fi_bi_tb
 $mtPrefix = fi_bi_mt
diff --git a/tests/script/windows/field/binary.sim b/tests/script/windows/field/binary.sim
index 8b86c4dbea..72a356e684 100644
--- a/tests/script/windows/field/binary.sim
+++ b/tests/script/windows/field/binary.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_by_db
 $tbPrefix = fi_by_tb
 $mtPrefix = fi_by_mt
diff --git a/tests/script/windows/field/bool.sim b/tests/script/windows/field/bool.sim
index 5f2c61475c..abc970264d 100644
--- a/tests/script/windows/field/bool.sim
+++ b/tests/script/windows/field/bool.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_bo_db
 $tbPrefix = fi_bo_tb
 $mtPrefix = fi_bo_mt
diff --git a/tests/script/windows/field/double.sim b/tests/script/windows/field/double.sim
index ea7e075208..e805e0373b 100644
--- a/tests/script/windows/field/double.sim
+++ b/tests/script/windows/field/double.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_do_db
 $tbPrefix = fi_do_tb
 $mtPrefix = fi_do_mt
diff --git a/tests/script/windows/field/float.sim b/tests/script/windows/field/float.sim
index 5be59bae3b..4178ab4e1e 100644
--- a/tests/script/windows/field/float.sim
+++ b/tests/script/windows/field/float.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_fl_db
 $tbPrefix = fi_fl_tb
 $mtPrefix = fi_fl_mt
diff --git a/tests/script/windows/field/int.sim b/tests/script/windows/field/int.sim
index d7d26b7341..05dc19094d 100644
--- a/tests/script/windows/field/int.sim
+++ b/tests/script/windows/field/int.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_in_db
 $tbPrefix = fi_in_tb
 $mtPrefix = fi_in_mt
diff --git a/tests/script/windows/field/single.sim b/tests/script/windows/field/single.sim
index 0199133ecd..6422b7f697 100644
--- a/tests/script/windows/field/single.sim
+++ b/tests/script/windows/field/single.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_si_db
 $tbPrefix = fi_si_tb
 $mtPrefix = fi_si_mt
diff --git a/tests/script/windows/field/smallint.sim b/tests/script/windows/field/smallint.sim
index 8bee463292..8bf41f45a5 100644
--- a/tests/script/windows/field/smallint.sim
+++ b/tests/script/windows/field/smallint.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_sm_db
 $tbPrefix = fi_sm_tb
 $mtPrefix = fi_sm_mt
diff --git a/tests/script/windows/field/tinyint.sim b/tests/script/windows/field/tinyint.sim
index 65bffca095..16c19ba38d 100644
--- a/tests/script/windows/field/tinyint.sim
+++ b/tests/script/windows/field/tinyint.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = fi_ti_db
 $tbPrefix = fi_ti_tb
 $mtPrefix = fi_ti_mt
diff --git a/tests/script/windows/import/basic.sim b/tests/script/windows/import/basic.sim
index c20378ee88..491b4f8b34 100644
--- a/tests/script/windows/import/basic.sim
+++ b/tests/script/windows/import/basic.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 sql create database ibadb
 sql use ibadb
 sql create table tb(ts timestamp, i int)
diff --git a/tests/script/windows/insert/basic.sim b/tests/script/windows/insert/basic.sim
index be0980a2d4..54cbd3f4d9 100644
--- a/tests/script/windows/insert/basic.sim
+++ b/tests/script/windows/insert/basic.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = tb_in_db
 $tbPrefix = tb_in_tb
diff --git a/tests/script/windows/insert/query_block1_file.sim b/tests/script/windows/insert/query_block1_file.sim
index 3eb1d402e8..388ed061e5 100644
--- a/tests/script/windows/insert/query_block1_file.sim
+++ b/tests/script/windows/insert/query_block1_file.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = tb_1f_db
 $tbPrefix = tb_1f_tb
@@ -24,7 +31,7 @@ $y = $N / 2
 while $x > $y
   $ms = $x . m
   $xt = - . $x 
-  sql insert into $tb values (now - $ms , - $x ) 
+  sql insert into $tb values (now - $ms , $x ) 
   $x = $x - 1
 endw 
 
diff --git a/tests/script/windows/insert/query_block1_memory.sim b/tests/script/windows/insert/query_block1_memory.sim
index 60d31e52d6..9e4fc68d09 100644
--- a/tests/script/windows/insert/query_block1_memory.sim
+++ b/tests/script/windows/insert/query_block1_memory.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = tb_1m_db
 $tbPrefix = tb_1m_tb
diff --git a/tests/script/windows/insert/query_block2_file.sim b/tests/script/windows/insert/query_block2_file.sim
index e9f562a538..9fd4434476 100644
--- a/tests/script/windows/insert/query_block2_file.sim
+++ b/tests/script/windows/insert/query_block2_file.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = tb_2f_db
 $tbPrefix = tb_2f_tb
diff --git a/tests/script/windows/insert/query_block2_memory.sim b/tests/script/windows/insert/query_block2_memory.sim
index fd173f1356..ede7f3efc6 100644
--- a/tests/script/windows/insert/query_block2_memory.sim
+++ b/tests/script/windows/insert/query_block2_memory.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = tb_2m_db
 $tbPrefix = tb_2m_tb
diff --git a/tests/script/windows/insert/query_file_memory.sim b/tests/script/windows/insert/query_file_memory.sim
index e9b0c69ea5..083beb4ac5 100644
--- a/tests/script/windows/insert/query_file_memory.sim
+++ b/tests/script/windows/insert/query_file_memory.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = tb_fm_db
 $tbPrefix = tb_fm_tb
diff --git a/tests/script/windows/insert/query_multi_file.sim b/tests/script/windows/insert/query_multi_file.sim
index 84c091fb21..465970f942 100644
--- a/tests/script/windows/insert/query_multi_file.sim
+++ b/tests/script/windows/insert/query_multi_file.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = tb_mf_db
 $tbPrefix = tb_mf_tb
diff --git a/tests/script/windows/table/binary.sim b/tests/script/windows/table/binary.sim
index 69354ed5c8..64a081c72f 100644
--- a/tests/script/windows/table/binary.sim
+++ b/tests/script/windows/table/binary.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = lm_bn_db
 $tbPrefix = lm_bn_tb
diff --git a/tests/script/windows/table/bool.sim b/tests/script/windows/table/bool.sim
index 9e434d801a..9486c42221 100644
--- a/tests/script/windows/table/bool.sim
+++ b/tests/script/windows/table/bool.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = lm_bo_db
 $tbPrefix = lm_bo_tb
diff --git a/tests/script/windows/table/column_name.sim b/tests/script/windows/table/column_name.sim
index bbac293fed..fffb1334e5 100644
--- a/tests/script/windows/table/column_name.sim
+++ b/tests/script/windows/table/column_name.sim
@@ -1,6 +1,14 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+
 $i = 0
 $dbPrefix = lm_cm_db
 $tbPrefix = lm_cm_tb
diff --git a/tests/script/windows/table/column_num.sim b/tests/script/windows/table/column_num.sim
index f7ead41437..d182696ce0 100644
--- a/tests/script/windows/table/column_num.sim
+++ b/tests/script/windows/table/column_num.sim
@@ -1,6 +1,14 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+
 $i = 0
 $dbPrefix = lm_cn_db
 $tbPrefix = lm_cn_tb
diff --git a/tests/script/windows/table/column_value.sim b/tests/script/windows/table/column_value.sim
index 9dbaf7ceab..c59e7af8ba 100644
--- a/tests/script/windows/table/column_value.sim
+++ b/tests/script/windows/table/column_value.sim
@@ -1,6 +1,14 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+
 $i = 0
 $dbPrefix = lm_cv_db
 $tbPrefix = lm_cv_tb
diff --git a/tests/script/windows/table/db.table.sim b/tests/script/windows/table/db.table.sim
index 8d244e011f..97a9e6fbe9 100644
--- a/tests/script/windows/table/db.table.sim
+++ b/tests/script/windows/table/db.table.sim
@@ -1,6 +1,14 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+
 $i = 0
 $dbPrefix = lm_dt_db
 $tbPrefix = lm_dt_tb
diff --git a/tests/script/windows/table/double.sim b/tests/script/windows/table/double.sim
index 1402982c98..93bf3bb149 100644
--- a/tests/script/windows/table/double.sim
+++ b/tests/script/windows/table/double.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = lm_do_db
 $tbPrefix = lm_do_tb
diff --git a/tests/script/windows/table/float.sim b/tests/script/windows/table/float.sim
index 57b626f865..684f78a386 100644
--- a/tests/script/windows/table/float.sim
+++ b/tests/script/windows/table/float.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = lm_fl_db
 $tbPrefix = lm_fl_tb
diff --git a/tests/script/windows/table/table.sim b/tests/script/windows/table/table.sim
index 55be8af851..985620152a 100644
--- a/tests/script/windows/table/table.sim
+++ b/tests/script/windows/table/table.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ============================ dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = ob_tb_db
 $tbPrefix = ob_tb_tb
diff --git a/tests/script/windows/table/table_len.sim b/tests/script/windows/table/table_len.sim
index cdd1f31731..367f1c6895 100644
--- a/tests/script/windows/table/table_len.sim
+++ b/tests/script/windows/table/table_len.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $i = 0
 $dbPrefix = lm_tb_db
 $tbPrefix = lm_tb_tb
diff --git a/tests/script/windows/tag/3.sim b/tests/script/windows/tag/3.sim
index 9ffa11b03f..63a8766727 100644
--- a/tests/script/windows/tag/3.sim
+++ b/tests/script/windows/tag/3.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_3_db
 $tbPrefix = ta_3_tb
 $mtPrefix = ta_3_mt
diff --git a/tests/script/windows/tag/4.sim b/tests/script/windows/tag/4.sim
index beabe1fd8f..7e9af7ece7 100644
--- a/tests/script/windows/tag/4.sim
+++ b/tests/script/windows/tag/4.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_4_db
 $tbPrefix = ta_4_tb
 $mtPrefix = ta_4_mt
diff --git a/tests/script/windows/tag/5.sim b/tests/script/windows/tag/5.sim
index 161d98756c..5dc128a0e0 100644
--- a/tests/script/windows/tag/5.sim
+++ b/tests/script/windows/tag/5.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_5_db
 $tbPrefix = ta_5_tb
 $mtPrefix = ta_5_mt
diff --git a/tests/script/windows/tag/6.sim b/tests/script/windows/tag/6.sim
index b8666305bd..12e9c597f0 100644
--- a/tests/script/windows/tag/6.sim
+++ b/tests/script/windows/tag/6.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_6_db
 $tbPrefix = ta_6_tb
 $mtPrefix = ta_6_mt
diff --git a/tests/script/windows/tag/add.sim b/tests/script/windows/tag/add.sim
index 2c72d01955..0a1416b68c 100644
--- a/tests/script/windows/tag/add.sim
+++ b/tests/script/windows/tag/add.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_ad_db
 $tbPrefix = ta_ad_tb
 $mtPrefix = ta_ad_mt
diff --git a/tests/script/windows/tag/bigint.sim b/tests/script/windows/tag/bigint.sim
index 4406c7386d..d988ad1fdc 100644
--- a/tests/script/windows/tag/bigint.sim
+++ b/tests/script/windows/tag/bigint.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_bi_db
 $tbPrefix = ta_bi_tb
 $mtPrefix = ta_bi_mt
diff --git a/tests/script/windows/tag/binary.sim b/tests/script/windows/tag/binary.sim
index deeae81117..9dc18cfa94 100644
--- a/tests/script/windows/tag/binary.sim
+++ b/tests/script/windows/tag/binary.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_by_db
 $tbPrefix = ta_by_tb
 $mtPrefix = ta_by_mt
diff --git a/tests/script/windows/tag/binary_binary.sim b/tests/script/windows/tag/binary_binary.sim
index c1f93bc656..ba688aa80e 100644
--- a/tests/script/windows/tag/binary_binary.sim
+++ b/tests/script/windows/tag/binary_binary.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_bib_db
 $tbPrefix = ta_bib_tb
 $mtPrefix = ta_bib_mt
diff --git a/tests/script/windows/tag/bool.sim b/tests/script/windows/tag/bool.sim
index 81ea20064b..a7e5d909c5 100644
--- a/tests/script/windows/tag/bool.sim
+++ b/tests/script/windows/tag/bool.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_bo_db
 $tbPrefix = ta_bo_tb
 $mtPrefix = ta_bo_mt
diff --git a/tests/script/windows/tag/bool_binary.sim b/tests/script/windows/tag/bool_binary.sim
index c3daf2c242..639f6c5f2f 100644
--- a/tests/script/windows/tag/bool_binary.sim
+++ b/tests/script/windows/tag/bool_binary.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_bob_db
 $tbPrefix = ta_bob_tb
 $mtPrefix = ta_bob_mt
diff --git a/tests/script/windows/tag/bool_int.sim b/tests/script/windows/tag/bool_int.sim
index 79e4b67bfa..900cc9e8a1 100644
--- a/tests/script/windows/tag/bool_int.sim
+++ b/tests/script/windows/tag/bool_int.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_boi_db
 $tbPrefix = ta_boi_tb
 $mtPrefix = ta_boi_mt
diff --git a/tests/script/windows/tag/change.sim b/tests/script/windows/tag/change.sim
index 2901842190..75a976bbb1 100644
--- a/tests/script/windows/tag/change.sim
+++ b/tests/script/windows/tag/change.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_ch_db
 $tbPrefix = ta_ch_tb
 $mtPrefix = ta_ch_mt
diff --git a/tests/script/windows/tag/column.sim b/tests/script/windows/tag/column.sim
index 131f3e06ea..9f5bfce07e 100644
--- a/tests/script/windows/tag/column.sim
+++ b/tests/script/windows/tag/column.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_co_db
 $tbPrefix = ta_co_tb
 $mtPrefix = ta_co_mt
diff --git a/tests/script/windows/tag/create.sim b/tests/script/windows/tag/create.sim
index 5beba21727..6a76c93d83 100644
--- a/tests/script/windows/tag/create.sim
+++ b/tests/script/windows/tag/create.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_cr_db
 $tbPrefix = ta_cr_tb
 $mtPrefix = ta_cr_mt
diff --git a/tests/script/windows/tag/delete.sim b/tests/script/windows/tag/delete.sim
index e2395c8f97..9e8ea9aba0 100644
--- a/tests/script/windows/tag/delete.sim
+++ b/tests/script/windows/tag/delete.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_de_db
 $tbPrefix = ta_de_tb
 $mtPrefix = ta_de_mt
diff --git a/tests/script/windows/tag/double.sim b/tests/script/windows/tag/double.sim
index c08351a41b..5445b1dbea 100644
--- a/tests/script/windows/tag/double.sim
+++ b/tests/script/windows/tag/double.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_do_db
 $tbPrefix = ta_do_tb
 $mtPrefix = ta_do_mt
diff --git a/tests/script/windows/tag/filter.sim b/tests/script/windows/tag/filter.sim
index b70e56fdb6..f704f32cd2 100644
--- a/tests/script/windows/tag/filter.sim
+++ b/tests/script/windows/tag/filter.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_fi_db
 $tbPrefix = ta_fi_tb
 $mtPrefix = ta_fi_mt
diff --git a/tests/script/windows/tag/float.sim b/tests/script/windows/tag/float.sim
index 79eabb2cb4..64424c1e20 100644
--- a/tests/script/windows/tag/float.sim
+++ b/tests/script/windows/tag/float.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_fl_db
 $tbPrefix = ta_fl_tb
 $mtPrefix = ta_fl_mt
diff --git a/tests/script/windows/tag/int.sim b/tests/script/windows/tag/int.sim
index d3921218fd..7d7b5271d1 100644
--- a/tests/script/windows/tag/int.sim
+++ b/tests/script/windows/tag/int.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_in_db
 $tbPrefix = ta_in_tb
 $mtPrefix = ta_in_mt
diff --git a/tests/script/windows/tag/int_binary.sim b/tests/script/windows/tag/int_binary.sim
index 96f4f18966..1dd4771605 100644
--- a/tests/script/windows/tag/int_binary.sim
+++ b/tests/script/windows/tag/int_binary.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_inb_db
 $tbPrefix = ta_inb_tb
 $mtPrefix = ta_inb_mt
diff --git a/tests/script/windows/tag/int_float.sim b/tests/script/windows/tag/int_float.sim
index 768e86b96d..cdb9032d8c 100644
--- a/tests/script/windows/tag/int_float.sim
+++ b/tests/script/windows/tag/int_float.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_inf_db
 $tbPrefix = ta_inf_tb
 $mtPrefix = ta_inf_mt
diff --git a/tests/script/windows/tag/set.sim b/tests/script/windows/tag/set.sim
index 580f91cb49..16103c6ce8 100644
--- a/tests/script/windows/tag/set.sim
+++ b/tests/script/windows/tag/set.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_se_db
 $tbPrefix = ta_se_tb
 $mtPrefix = ta_se_mt
diff --git a/tests/script/windows/tag/smallint.sim b/tests/script/windows/tag/smallint.sim
index 1b7ff0860b..dbab4f2d43 100644
--- a/tests/script/windows/tag/smallint.sim
+++ b/tests/script/windows/tag/smallint.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_sm_db
 $tbPrefix = ta_sm_tb
 $mtPrefix = ta_sm_mt
diff --git a/tests/script/windows/tag/tinyint.sim b/tests/script/windows/tag/tinyint.sim
index 8fe957664c..7a0237c0d9 100644
--- a/tests/script/windows/tag/tinyint.sim
+++ b/tests/script/windows/tag/tinyint.sim
@@ -2,6 +2,13 @@ sql connect
 sleep 3000
 print ======================== dnode1 start
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = ta_ti_db
 $tbPrefix = ta_ti_tb
 $mtPrefix = ta_ti_mt
diff --git a/tests/script/windows/testSuite.sim b/tests/script/windows/testSuite.sim
index fc574ed9c4..e372217b62 100644
--- a/tests/script/windows/testSuite.sim
+++ b/tests/script/windows/testSuite.sim
@@ -1,14 +1,14 @@
 run windows/alter/table.sim   
 run windows/alter/metrics.sim  
 
-#run windows/compute/avg.sim         
+run windows/compute/avg.sim         
 run windows/compute/bottom.sim 
 run windows/compute/count.sim       
 run windows/compute/diff.sim       
 run windows/compute/first.sim        
 run windows/compute/interval.sim   
 run windows/compute/last.sim    
-##run windows/compute/leastsquare.sim 
+run windows/compute/leastsquare.sim 
 run windows/compute/max.sim           
 run windows/compute/min.sim         
 run windows/compute/percentile.sim   
@@ -37,12 +37,12 @@ run windows/field/tinyint.sim
 run windows/import/basic.sim   
 
 run windows/insert/basic.sim              
-#run windows/insert/query_block1_file.sim   
-#run windows/insert/query_block1_memory.sim 
-#run windows/insert/query_block2_file.sim   
-#run windows/insert/query_block2_memory.sim 
-#run windows/insert/query_file_memory.sim   
-#run windows/insert/query_multi_file.sim  
+run windows/insert/query_block1_file.sim   
+run windows/insert/query_block1_memory.sim 
+run windows/insert/query_block2_file.sim   
+run windows/insert/query_block2_memory.sim 
+run windows/insert/query_file_memory.sim   
+run windows/insert/query_multi_file.sim  
 
 run windows/table/binary.sim 
 run windows/table/bool.sim 
diff --git a/tests/script/windows/vector/metrics_field.sim b/tests/script/windows/vector/metrics_field.sim
index 8e9a87239e..e7c926e141 100644
--- a/tests/script/windows/vector/metrics_field.sim
+++ b/tests/script/windows/vector/metrics_field.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_mf_db
 $tbPrefix = m_mf_tb
 $mtPrefix = m_mf_mt
diff --git a/tests/script/windows/vector/metrics_mix.sim b/tests/script/windows/vector/metrics_mix.sim
index 0f960deb4d..3d94a96385 100644
--- a/tests/script/windows/vector/metrics_mix.sim
+++ b/tests/script/windows/vector/metrics_mix.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_mx_db
 $tbPrefix = m_mx_tb
 $mtPrefix = m_mx_mt
diff --git a/tests/script/windows/vector/metrics_query.sim b/tests/script/windows/vector/metrics_query.sim
index a0df4c9b04..c292c6b306 100644
--- a/tests/script/windows/vector/metrics_query.sim
+++ b/tests/script/windows/vector/metrics_query.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_mq_db
 $tbPrefix = m_mq_tb
 $mtPrefix = m_mq_mt
diff --git a/tests/script/windows/vector/metrics_tag.sim b/tests/script/windows/vector/metrics_tag.sim
index 22fd19bc89..f51a449d71 100644
--- a/tests/script/windows/vector/metrics_tag.sim
+++ b/tests/script/windows/vector/metrics_tag.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_mtg_db
 $tbPrefix = m_mtg_tb
 $mtPrefix = m_mtg_mt
diff --git a/tests/script/windows/vector/metrics_time.sim b/tests/script/windows/vector/metrics_time.sim
index da102b64a3..716f49d1e5 100644
--- a/tests/script/windows/vector/metrics_time.sim
+++ b/tests/script/windows/vector/metrics_time.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_mt_db
 $tbPrefix = m_mt_tb
 $mtPrefix = m_mt_mt
diff --git a/tests/script/windows/vector/multi.sim b/tests/script/windows/vector/multi.sim
index adcc94db3b..415384d243 100644
--- a/tests/script/windows/vector/multi.sim
+++ b/tests/script/windows/vector/multi.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_mu_db
 $tbPrefix = m_mu_tb
 $mtPrefix = m_mu_mt
diff --git a/tests/script/windows/vector/single.sim b/tests/script/windows/vector/single.sim
index 61135fc6b5..f3f3862e54 100644
--- a/tests/script/windows/vector/single.sim
+++ b/tests/script/windows/vector/single.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_si_db
 $tbPrefix = m_si_tb
 $mtPrefix = m_si_mt
diff --git a/tests/script/windows/vector/table_field.sim b/tests/script/windows/vector/table_field.sim
index ec50bc7a2a..0c5df695fb 100644
--- a/tests/script/windows/vector/table_field.sim
+++ b/tests/script/windows/vector/table_field.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_tf_db
 $tbPrefix = m_tf_tb
 $mtPrefix = m_tf_mt
diff --git a/tests/script/windows/vector/table_mix.sim b/tests/script/windows/vector/table_mix.sim
index 653171b302..3d660b5611 100644
--- a/tests/script/windows/vector/table_mix.sim
+++ b/tests/script/windows/vector/table_mix.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_tm_db
 $tbPrefix = m_tm_tb
 $mtPrefix = m_tm_mt
diff --git a/tests/script/windows/vector/table_query.sim b/tests/script/windows/vector/table_query.sim
index cdbd96f4d0..27fcd0f654 100644
--- a/tests/script/windows/vector/table_query.sim
+++ b/tests/script/windows/vector/table_query.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_tq_db
 $tbPrefix = m_tq_tb
 $mtPrefix = m_tq_mt
diff --git a/tests/script/windows/vector/table_time.sim b/tests/script/windows/vector/table_time.sim
index 48bcf86dca..8a3804c619 100644
--- a/tests/script/windows/vector/table_time.sim
+++ b/tests/script/windows/vector/table_time.sim
@@ -1,6 +1,13 @@
 sql connect
 sleep 3000
 
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
 $dbPrefix = m_tt_db
 $tbPrefix = m_tt_tb
 $mtPrefix = m_tt_mt

From d79cad4b641fbf66fdebd876edd14830e8c4f990 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 10 Aug 2020 14:34:50 +0000
Subject: [PATCH 7/7] TD-1057

---
 tests/script/{test.bat => wtest.bat} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/script/{test.bat => wtest.bat} (100%)

diff --git a/tests/script/test.bat b/tests/script/wtest.bat
similarity index 100%
rename from tests/script/test.bat
rename to tests/script/wtest.bat