diff --git a/cmake/define.inc b/cmake/define.inc
index 5d4d94ff42c73a7ca11f32f8318526bfcfe4e525..9ee7b34e6af43ff19e0709f8b62f2aeffc98fc88 100755
--- a/cmake/define.inc
+++ b/cmake/define.inc
@@ -139,6 +139,9 @@ IF (TD_WINDOWS)
   SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
   IF (NOT TD_GODLL)
     SET(COMMON_FLAGS "/nologo /WX /wd4018 /wd2220 /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-")
+    IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
+      SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
+    ENDIF ()
     SET(DEBUG_FLAGS "/Zi /W3 /GL")
     SET(RELEASE_FLAGS "/W0 /O3 /GL")
   ENDIF ()
diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 4999fbb9bf1af797e24973aa9dfa2c949d2fcd24..e842030b4c40932a19ec1dbf2f6f8bea751daee2 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -27,11 +27,11 @@
 extern "C" {
 #endif
 
-#define STR_TO_VARSTR(x, str)                 \
-  do {                                        \
-    VarDataLenT __len = (int32_t)strlen(str); \
-    *(VarDataLenT *)(x) = __len;              \
-    memcpy(varDataVal(x), (str), __len);      \
+#define STR_TO_VARSTR(x, str)                     \
+  do {                                            \
+    VarDataLenT __len = (VarDataLenT)strlen(str); \
+    *(VarDataLenT *)(x) = __len;                  \
+    memcpy(varDataVal(x), (str), __len);          \
   } while (0);
 
 #define STR_WITH_MAXSIZE_TO_VARSTR(x, str, _maxs)                         \
@@ -40,10 +40,10 @@ extern "C" {
     varDataSetLen(x, (_e - (x)-VARSTR_HEADER_SIZE));                      \
   } while (0)
 
-#define STR_WITH_SIZE_TO_VARSTR(x, str, _size) \
-  do {                                         \
-    *(VarDataLenT *)(x) = (int32_t)(_size);    \
-    memcpy(varDataVal(x), (str), (_size));     \
+#define STR_WITH_SIZE_TO_VARSTR(x, str, _size)  \
+  do {                                          \
+    *(VarDataLenT *)(x) = (VarDataLenT)(_size); \
+    memcpy(varDataVal(x), (str), (_size));      \
   } while (0);
 
 // ----------------- TSDB COLUMN DEFINITION