diff --git a/deps/iconv/relocatable.c b/deps/iconv/relocatable.c
index 79906a399c7af9a1e078c4a3e53bd52d0efe8537..52cf4c13727aa1b2171431a486f32ec30c2d323e 100644
--- a/deps/iconv/relocatable.c
+++ b/deps/iconv/relocatable.c
@@ -360,7 +360,7 @@ find_shared_library_fullname ()
 
 		  ungetc (c, fp);
 		  shared_library_fullname = NULL; size = 0;
-		  len = getline (&shared_library_fullname, &size, fp);
+		  len = taosGetline(&shared_library_fullname, &size, fp);
 		  if (len >= 0)
 		    {
 		      /* Success: filled shared_library_fullname.  */
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index c74cc82f85b2cc784a17ade8a53eca6286d41707..fc60e24d8ecba3ef9dbcf2babaa112ea8cd2f9c2 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1931,6 +1931,7 @@ int16_t tscGetJoinTagColIdByUid(STagCond* pTagCond, uint64_t uid) {
     return pTagCond->joinInfo.right.tagColId;
   } else {
     assert(0);
+    return -1;
   }
 }
 
diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c
index 3cb324abe93416dc11fbd7ee00d2db3b73d906d3..ce41827462366777d249a2e58c5fd6fec3fbb0e3 100644
--- a/src/kit/shell/src/shellDarwin.c
+++ b/src/kit/shell/src/shellDarwin.c
@@ -62,7 +62,7 @@ void printHelp() {
   exit(EXIT_SUCCESS);
 }
 
-void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
+void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
   wordexp_t full_path;
   for (int i = 1; i < argc; i++) {
     // for host
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 5d877ba6f06135bfaee12fe1bbd1bbf6739a1dce..750335a0379f3c1474ca15f823d15f43cd99224e 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -577,7 +577,7 @@ static int verticalPrintResult(TAOS_RES* tres) {
 
   int maxColNameLen = 0;
   for (int col = 0; col < num_fields; col++) {
-    int len = strlen(fields[col].name);
+    int len = (int)strlen(fields[col].name);
     if (len > maxColNameLen) {
       maxColNameLen = len;
     }
@@ -604,9 +604,8 @@ static int verticalPrintResult(TAOS_RES* tres) {
   return numOfRows;
 }
 
-
 static int calcColWidth(TAOS_FIELD* field, int precision) {
-  int width = strlen(field->name);
+  int width = (int)strlen(field->name);
 
   switch (field->type) {
     case TSDB_DATA_TYPE_BOOL:
@@ -741,7 +740,7 @@ void read_history() {
     return;
   }
 
-  while ((read_size = getline(&line, &line_size, f)) != -1) {
+  while ((read_size = taosGetline(&line, &line_size, f)) != -1) {
     line[read_size - 1] = '\0';
     history.hist[history.hend] = strdup(line);
 
@@ -822,7 +821,7 @@ void source_file(TAOS *con, char *fptr) {
     return;
   }
 
-  while ((read_len = getline(&line, &line_len, f)) != -1) {
+  while ((read_len = taosGetline(&line, &line_len, f)) != -1) {
     if (read_len >= tsMaxSQLStringLen) continue;
     line[--read_len] = '\0';
 
diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index 8a7996d6825626e7bd8ed51c429916cba541ac79..7297f2393143fc935109b1e7bac5fac7b6910c80 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -9,12 +9,16 @@
 *
 * ****************************************************************/
 
-#include "shell.h"
 #include <assert.h>
 #include <regex.h>
 #include <stdio.h>
+#include "os.h"
+#include "shell.h"
+#include "taos.h"
 #include "shellCommand.h"
 
+extern char configDir[];
+
 void printHelp() {
   char indent[10] = "        ";
   printf("taos shell is used to test the TDEngine database\n");
@@ -43,7 +47,7 @@ void printHelp() {
   exit(EXIT_SUCCESS);
 }
 
-void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
+void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
   for (int i = 1; i < argc; i++) {
     // for host
     if (strcmp(argv[i], "-h") == 0) {
@@ -81,7 +85,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
           fprintf(stderr, "config file path: %s overflow max len %d\n", argv[i], TSDB_FILENAME_LEN - 1);
           exit(EXIT_FAILURE);
         }
-        strcpy(configDir, argv[i]);
+        strcpy(configDir, argv[++i]);
       } else {
         fprintf(stderr, "Option -c requires an argument\n");
         exit(EXIT_FAILURE);
diff --git a/src/kit/taosdemo/CMakeLists.txt b/src/kit/taosdemo/CMakeLists.txt
index a13bb767fcf8f78bac4f79217992a4d30413d761..55ad64db133e62e5cb446c788a6332dec9b45121 100644
--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
@@ -13,5 +13,7 @@ IF (TD_LINUX)
 #  ELSE ()
 #    TARGET_LINK_LIBRARIES(taosdemo taos_static)
 #  ENDIF ()
-
+ELSEIF (TD_WINDOWS)
+  AUX_SOURCE_DIRECTORY(. SRC)
+  ADD_EXECUTABLE(taosdemo ${SRC})
 ENDIF ()
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 21e5b963c8a57d4a84297663e60ab5142109bda6..56a07b2ab78daf40cc0a528eaf549faf933af874 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
  *
  * This program is free software: you can use, redistribute, and/or modify
diff --git a/src/os/inc/osWindows.h b/src/os/inc/osWindows.h
index 825ef4769d5e4d12701bb9d45bf9c1caad1a9943..9a430c406dc024bce8c7f5aa734650e188cb435d 100644
--- a/src/os/inc/osWindows.h
+++ b/src/os/inc/osWindows.h
@@ -145,6 +145,7 @@ int        flock(int fd, int option);
 int        fsync(int filedes);
 char *     strndup(const char *s, size_t n);
 char *     dirname(char *pszPathname);
+int        gettimeofday(struct timeval *ptv, void *pTimeZone);
 
 // for access function in io.h
 #define F_OK 00  //Existence only
diff --git a/src/os/src/windows/w64Time.c b/src/os/src/windows/w64Time.c
index ce7eada6a01bcdc9d53e25de0aedabccb0d7d5b2..1484b13843fb7dc38f18e5d46bb1c2c6af3e1255 100644
--- a/src/os/src/windows/w64Time.c
+++ b/src/os/src/windows/w64Time.c
@@ -16,6 +16,18 @@
 #include <time.h>  
 #include <winsock2.h>
 
+int gettimeofday(struct timeval *tv, struct timezone *tz) {
+  time_t t;
+  t = time(NULL);
+  SYSTEMTIME st;
+  GetLocalTime(&st);
+
+  tv->tv_sec = (long)t;
+  tv->tv_usec = st.wMilliseconds * 1000;
+
+  return 0;
+}
+
 struct tm *localtime_r(const time_t *timep, struct tm *result) {
   localtime_s(result, timep);
   return result;
diff --git a/src/util/inc/tscompression.h b/src/util/inc/tscompression.h
index 9398ff82439445692b2e1c90041fd0595bbc27c7..bd1ccf3ca5fd52cb8e6f596ff955579389cd249f 100644
--- a/src/util/inc/tscompression.h
+++ b/src/util/inc/tscompression.h
@@ -56,6 +56,7 @@ static FORCE_INLINE int tsCompressTinyint(const char *const input, int inputSize
     return tsCompressStringImp(buffer, len, output, outputSize);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -68,6 +69,7 @@ static FORCE_INLINE int tsDecompressTinyint(const char *const input, int compres
     return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -80,6 +82,7 @@ static FORCE_INLINE int tsCompressSmallint(const char *const input, int inputSiz
     return tsCompressStringImp(buffer, len, output, outputSize);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -92,6 +95,7 @@ static FORCE_INLINE int tsDecompressSmallint(const char *const input, int compre
     return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -104,6 +108,7 @@ static FORCE_INLINE int tsCompressInt(const char *const input, int inputSize, co
     return tsCompressStringImp(buffer, len, output, outputSize);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -116,6 +121,7 @@ static FORCE_INLINE int tsDecompressInt(const char *const input, int compressedS
     return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -128,6 +134,7 @@ static FORCE_INLINE int tsCompressBigint(const char *const input, int inputSize,
     return tsCompressStringImp(buffer, len, output, outputSize);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -140,6 +147,7 @@ static FORCE_INLINE int tsDecompressBigint(const char *const input, int compress
     return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -152,6 +160,7 @@ static FORCE_INLINE int tsCompressBool(const char *const input, int inputSize, c
     return tsCompressStringImp(buffer, len, output, outputSize);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -164,6 +173,7 @@ static FORCE_INLINE int tsDecompressBool(const char *const input, int compressed
     return tsDecompressBoolImp(buffer, nelements, output);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -186,6 +196,7 @@ static FORCE_INLINE int tsCompressFloat(const char *const input, int inputSize,
     return tsCompressStringImp(buffer, len, output, outputSize);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -198,6 +209,7 @@ static FORCE_INLINE int tsDecompressFloat(const char *const input, int compresse
     return tsDecompressFloatImp(buffer, nelements, output);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -210,6 +222,7 @@ static FORCE_INLINE int tsCompressDouble(const char *const input, int inputSize,
     return tsCompressStringImp(buffer, len, output, outputSize);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -222,6 +235,7 @@ static FORCE_INLINE int tsDecompressDouble(const char *const input, int compress
     return tsDecompressDoubleImp(buffer, nelements, output);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -234,6 +248,7 @@ static FORCE_INLINE int tsCompressTimestamp(const char *const input, int inputSi
     return tsCompressStringImp(buffer, len, output, outputSize);
   } else {
     assert(0);
+    return -1;
   }
 }
 
@@ -246,6 +261,7 @@ static FORCE_INLINE int tsDecompressTimestamp(const char *const input, int compr
     return tsDecompressTimestampImp(buffer, nelements, output);
   } else {
     assert(0);
+    return -1;
   }
 }
 
diff --git a/src/util/src/tcompression.c b/src/util/src/tcompression.c
index c20ba59ac9b351445cf9f97134ae08fd1e45f0f7..8c5828d32d2323cbdc7a05687c3e64e4e61a29af 100644
--- a/src/util/src/tcompression.c
+++ b/src/util/src/tcompression.c
@@ -591,6 +591,7 @@ int tsDecompressTimestampImp(const char *const input, const int nelements, char
 
   } else {
     assert(0);
+    return -1;
   }
 }
 /* --------------------------------------------Double Compression