[td-225] merge develop

2020-08-06 11:06:40 +08:00 · 2020-08-06 11:06:40 +08:00 · b1173807fa
parent 80d44b2ff0 dac01da0e6
commit b1173807fa
121 changed files with 1461 additions and 960 deletions
--- a/.gitignore
+++ b/.gitignore
@ -66,3 +66,14 @@ CMakeError.log
 /test/cfg
 /src/.vs
 *.o
+src/connector/jdbc/.settings/
+tests/comparisonTest/cassandra/cassandratest/.classpath
+tests/comparisonTest/cassandra/cassandratest/.project
+tests/comparisonTest/cassandra/cassandratest/.settings/
+tests/comparisonTest/opentsdb/opentsdbtest/.classpath
+tests/comparisonTest/opentsdb/opentsdbtest/.factorypath
+tests/comparisonTest/opentsdb/opentsdbtest/.project
+tests/comparisonTest/opentsdb/opentsdbtest/.settings/
+tests/examples/JDBC/JDBCDemo/.classpath
+tests/examples/JDBC/JDBCDemo/.project
+tests/examples/JDBC/JDBCDemo/.settings/
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@ -7,4 +7,8 @@ ADD_SUBDIRECTORY(regex)
 ADD_SUBDIRECTORY(iconv)
 ADD_SUBDIRECTORY(lz4)
 ADD_SUBDIRECTORY(cJson)
-ADD_SUBDIRECTORY(MQTT-C)
+#ADD_SUBDIRECTORY(MsvcLibX)
+
+IF (NOT TD_WINDOWS)
+  ADD_SUBDIRECTORY(MQTT-C)
+ENDIF ()
--- a/deps/MQTT-C/CMakeLists.txt
+++ b/deps/MQTT-C/CMakeLists.txt
@ -10,11 +10,11 @@ option(MQTT_C_TESTS "Build MQTT-C tests?" OFF)
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

 # MQTT-C library
-add_library(mqttc STATIC 
+ADD_LIBRARY(mqttc STATIC 
    src/mqtt_pal.c
    src/mqtt.c
 )
-target_include_directories(mqttc PUBLIC include)
+TARGET_INCLUDE_DIRECTORIES(mqttc PUBLIC include)
 target_link_libraries(mqttc PUBLIC 
    $<$<C_COMPILER_ID:MSVS>:ws2_32>
 )
@ -30,7 +30,7 @@ endif()
 # Configure with mbed TLS support
 if(MQTT_C_MbedTLS_SUPPORT)
    find_package(MbedTLS REQUIRED)
-    target_include_directories(mqttc PUBLIC ${MBEDTLS_INCLUDE_DIRS})
+    TARGET_INCLUDE_DIRECTORIES(mqttc PUBLIC ${MBEDTLS_INCLUDE_DIRS})
    target_link_libraries(mqttc INTERFACE ${MBEDTLS_LIBRARY})
    target_compile_definitions(mqttc PUBLIC MQTT_USE_MBEDTLS)
 endif()
@ -70,7 +70,7 @@ if(MQTT_C_TESTS)

    add_executable(tests tests.c)
    target_link_libraries(tests ${CMOCKA_LIBRARY} mqttc)
-    target_include_directories(tests PRIVATE ${CMOCKA_INCLUDE_DIR})
+    TARGET_INCLUDE_DIRECTORIES(tests PRIVATE ${CMOCKA_INCLUDE_DIR})
 endif()

 # Install includes and library
--- a/deps/cJson/CMakeLists.txt
+++ b/deps/cJson/CMakeLists.txt
@ -1,4 +1,4 @@
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)

-add_library(cJson ${SOURCE_LIST})
-target_include_directories(cJson PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+ADD_LIBRARY(cJson ${SOURCE_LIST})
+TARGET_INCLUDE_DIRECTORIES(cJson PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
--- a/deps/iconv/CMakeLists.txt
+++ b/deps/iconv/CMakeLists.txt
@ -1,9 +1,11 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS)
  LIST(APPEND SRC iconv.c)
  LIST(APPEND SRC localcharset.c)
  INCLUDE_DIRECTORIES(.)
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX-")
+  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX-")
  ADD_LIBRARY(iconv ${SRC})
 ENDIF ()
--- a/deps/iconv/iconv.h
+++ b/deps/iconv/iconv.h
@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
   This file is part of the GNU LIBICONV Library.

   The GNU LIBICONV Library is free software; you can redistribute it
--- a/deps/lz4/CMakeLists.txt
+++ b/deps/lz4/CMakeLists.txt
@ -1,4 +1,9 @@
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)

-add_library(lz4 ${SOURCE_LIST})
-target_include_directories(lz4 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+IF (TD_WINDOWS)
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX-")
+  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX-")
+ENDIF()
+
+ADD_LIBRARY(lz4 ${SOURCE_LIST})
+TARGET_INCLUDE_DIRECTORIES(lz4 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
--- a/deps/pthread/CMakeLists.txt
+++ b/deps/pthread/CMakeLists.txt
@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS)
  INCLUDE_DIRECTORIES(.)
  LIST(APPEND SRC pthread.c)
  ADD_LIBRARY(pthread ${SRC})
--- a/deps/pthread/pthread_mutex_consistent.c
+++ b/deps/pthread/pthread_mutex_consistent.c
@ -1,4 +1,4 @@
-/*
+/*
 * pthread_mutex_consistent.c
 *
 * Description:
--- a/deps/regex/CMakeLists.txt
+++ b/deps/regex/CMakeLists.txt
@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS)
  INCLUDE_DIRECTORIES(inc .)
  LIST(APPEND SRC regex.c)
  ADD_LIBRARY(regex ${SRC})
--- a/deps/zlib-1.2.11/CMakeLists.txt
+++ b/deps/zlib-1.2.11/CMakeLists.txt
@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

-IF (TD_LINUX_64)
+IF (TD_LINUX_64 OR TD_WINDOWS_64)
  INCLUDE_DIRECTORIES(inc)
  AUX_SOURCE_DIRECTORY(src SRC)
  ADD_LIBRARY(z ${SRC})
--- a/deps/zlib-1.2.11/inc/zconf.h
+++ b/deps/zlib-1.2.11/inc/zconf.h
@ -14,177 +14,177 @@
 * Even better than compiling with -DZ_PREFIX would be to use configure to set
 * this permanently in zconf.h using "./configure --zprefix".
 */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
+#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
+#define Z_PREFIX_SET

 /* all linked symbols and init macros */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define crc32_z               z_crc32_z
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateGetDictionary  z_deflateGetDictionary
-#  define deflateInit           z_deflateInit
-#  define deflateInit2          z_deflateInit2
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzfread               z_gzfread
-#    define gzfwrite              z_gzfwrite
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzvprintf             z_gzvprintf
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit       z_inflateBackInit
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCodesUsed      z_inflateCodesUsed
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit           z_inflateInit
-#  define inflateInit2          z_inflateInit2
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateValidate       z_inflateValidate
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#    define uncompress2           z_uncompress2
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
+#define _dist_code z__dist_code
+#define _length_code z__length_code
+#define _tr_align z__tr_align
+#define _tr_flush_bits z__tr_flush_bits
+#define _tr_flush_block z__tr_flush_block
+#define _tr_init z__tr_init
+#define _tr_stored_block z__tr_stored_block
+#define _tr_tally z__tr_tally
+#define adler32 z_adler32
+#define adler32_combine z_adler32_combine
+#define adler32_combine64 z_adler32_combine64
+#define adler32_z z_adler32_z
+#ifndef Z_SOLO
+#define compress z_compress
+#define compress2 z_compress2
+#define compressBound z_compressBound
+#endif
+#define crc32 z_crc32
+#define crc32_combine z_crc32_combine
+#define crc32_combine64 z_crc32_combine64
+#define crc32_z z_crc32_z
+#define deflate z_deflate
+#define deflateBound z_deflateBound
+#define deflateCopy z_deflateCopy
+#define deflateEnd z_deflateEnd
+#define deflateGetDictionary z_deflateGetDictionary
+#define deflateInit z_deflateInit
+#define deflateInit2 z_deflateInit2
+#define deflateInit2_ z_deflateInit2_
+#define deflateInit_ z_deflateInit_
+#define deflateParams z_deflateParams
+#define deflatePending z_deflatePending
+#define deflatePrime z_deflatePrime
+#define deflateReset z_deflateReset
+#define deflateResetKeep z_deflateResetKeep
+#define deflateSetDictionary z_deflateSetDictionary
+#define deflateSetHeader z_deflateSetHeader
+#define deflateTune z_deflateTune
+#define deflate_copyright z_deflate_copyright
+#define get_crc_table z_get_crc_table
+#ifndef Z_SOLO
+#define gz_error z_gz_error
+#define gz_intmax z_gz_intmax
+#define gz_strwinerror z_gz_strwinerror
+#define gzbuffer z_gzbuffer
+#define gzclearerr z_gzclearerr
+#define gzclose z_gzclose
+#define gzclose_r z_gzclose_r
+#define gzclose_w z_gzclose_w
+#define gzdirect z_gzdirect
+#define gzdopen z_gzdopen
+#define gzeof z_gzeof
+#define gzerror z_gzerror
+#define gzflush z_gzflush
+#define gzfread z_gzfread
+#define gzfwrite z_gzfwrite
+#define gzgetc z_gzgetc
+#define gzgetc_ z_gzgetc_
+#define gzgets z_gzgets
+#define gzoffset z_gzoffset
+#define gzoffset64 z_gzoffset64
+#define gzopen z_gzopen
+#define gzopen64 z_gzopen64
+#ifdef _WIN32
+#define gzopen_w z_gzopen_w
+#endif
+#define gzprintf z_gzprintf
+#define gzputc z_gzputc
+#define gzputs z_gzputs
+#define gzread z_gzread
+#define gzrewind z_gzrewind
+#define gzseek z_gzseek
+#define gzseek64 z_gzseek64
+#define gzsetparams z_gzsetparams
+#define gztell z_gztell
+#define gztell64 z_gztell64
+#define gzungetc z_gzungetc
+#define gzvprintf z_gzvprintf
+#define gzwrite z_gzwrite
+#endif
+#define inflate z_inflate
+#define inflateBack z_inflateBack
+#define inflateBackEnd z_inflateBackEnd
+#define inflateBackInit z_inflateBackInit
+#define inflateBackInit_ z_inflateBackInit_
+#define inflateCodesUsed z_inflateCodesUsed
+#define inflateCopy z_inflateCopy
+#define inflateEnd z_inflateEnd
+#define inflateGetDictionary z_inflateGetDictionary
+#define inflateGetHeader z_inflateGetHeader
+#define inflateInit z_inflateInit
+#define inflateInit2 z_inflateInit2
+#define inflateInit2_ z_inflateInit2_
+#define inflateInit_ z_inflateInit_
+#define inflateMark z_inflateMark
+#define inflatePrime z_inflatePrime
+#define inflateReset z_inflateReset
+#define inflateReset2 z_inflateReset2
+#define inflateResetKeep z_inflateResetKeep
+#define inflateSetDictionary z_inflateSetDictionary
+#define inflateSync z_inflateSync
+#define inflateSyncPoint z_inflateSyncPoint
+#define inflateUndermine z_inflateUndermine
+#define inflateValidate z_inflateValidate
+#define inflate_copyright z_inflate_copyright
+#define inflate_fast z_inflate_fast
+#define inflate_table z_inflate_table
+#ifndef Z_SOLO
+#define uncompress z_uncompress
+#define uncompress2 z_uncompress2
+#endif
+#define zError z_zError
+#ifndef Z_SOLO
+#define zcalloc z_zcalloc
+#define zcfree z_zcfree
+#endif
+#define zlibCompileFlags z_zlibCompileFlags
+#define zlibVersion z_zlibVersion

 /* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
+#define Byte z_Byte
+#define Bytef z_Bytef
+#define alloc_func z_alloc_func
+#define charf z_charf
+#define free_func z_free_func
+#ifndef Z_SOLO
+#define gzFile z_gzFile
+#endif
+#define gz_header z_gz_header
+#define gz_headerp z_gz_headerp
+#define in_func z_in_func
+#define intf z_intf
+#define out_func z_out_func
+#define uInt z_uInt
+#define uIntf z_uIntf
+#define uLong z_uLong
+#define uLongf z_uLongf
+#define voidp z_voidp
+#define voidpc z_voidpc
+#define voidpf z_voidpf

 /* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
+#define gz_header_s z_gz_header_s
+#define internal_state z_internal_state

 #endif

 #if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
+#define MSDOS
 #endif
 #if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
+#define OS2
 #endif
 #if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
+#define WINDOWS
 #endif
 #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
+#ifndef WIN32
+#define WIN32
+#endif
 #endif
 #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
+#if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#ifndef SYS16BIT
+#define SYS16BIT
+#endif
+#endif
 #endif

 /*
@ -192,73 +192,73 @@
 * than 64k bytes at a time (needed on systems with 16-bit int).
 */
 #ifdef SYS16BIT
-#  define MAXSEG_64K
+#define MAXSEG_64K
 #endif
 #ifdef MSDOS
-#  define UNALIGNED_OK
+#define UNALIGNED_OK
 #endif

 #ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
+#ifndef STDC
+#define STDC
+#endif
+#if __STDC_VERSION__ >= 199901L
+#ifndef STDC99
+#define STDC99
+#endif
+#endif
 #endif
 #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
+#define STDC
 #endif
 #if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
+#define STDC
 #endif
 #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
+#define STDC
 #endif
 #if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
+#define STDC
 #endif

-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
+#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
+#define STDC
 #endif

 #ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
+#ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#define const /* note: need a more gentle solution here */
+#endif
 #endif

 #if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
+#define z_const const
 #else
-#  define z_const
+#define z_const
 #endif

 #ifdef Z_SOLO
-   typedef uint64_t z_size_t;
+typedef uint64_t z_size_t;
 #else
-#  define z_longlong int64_t
-#  if defined(NO_SIZE_T)
-     typedef unsigned NO_SIZE_T z_size_t;
-#  elif defined(STDC)
-#    include <stddef.h>
-     typedef size_t z_size_t;
-#  else
-     typedef uint64_t z_size_t;
-#  endif
-#  undef z_longlong
+#define z_longlong int64_t
+#if defined(NO_SIZE_T)
+typedef unsigned NO_SIZE_T z_size_t;
+#elif defined(STDC)
+#include <stddef.h>
+typedef size_t z_size_t;
+#else
+typedef uint64_t z_size_t;
+#endif
+#undef z_longlong
 #endif

 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
+#ifdef MAXSEG_64K
+#define MAX_MEM_LEVEL 8
+#else
+#define MAX_MEM_LEVEL 9
+#endif
 #endif

 /* Maximum value for windowBits in deflateInit2 and inflateInit2.
@ -267,7 +267,7 @@
 * gzip.)
 */
 #ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
+#define MAX_WBITS 15 /* 32K LZ77 window */
 #endif

 /* The memory requirements for deflate are (in bytes):
@ -283,22 +283,22 @@
 for small objects.
 */

-                        /* Type declarations */
+/* Type declarations */

 #ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
+#ifdef STDC
+#define OF(args) args
+#else
+#define OF(args) ()
+#endif
 #endif

 #ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#define Z_ARG(args) args
+#else
+#define Z_ARG(args) ()
+#endif
 #endif

 /* The following definitions for FAR are needed only for MSDOS mixed
@ -308,153 +308,153 @@
 * just define FAR to be empty.
 */
 #ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
+#if defined(M_I86SM) || defined(M_I86MM)
+/* MSC small or medium model */
+#define SMALL_MEDIUM
+#ifdef _MSC_VER
+#define FAR _far
+#else
+#define FAR far
+#endif
+#endif
+#if (defined(__SMALL__) || defined(__MEDIUM__))
+/* Turbo C small or medium model */
+#define SMALL_MEDIUM
+#ifdef __BORLANDC__
+#define FAR _far
+#else
+#define FAR far
+#endif
+#endif
 #endif

 #if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
+/* If building or using zlib as a DLL, define ZLIB_DLL.
+ * This is not mandatory, but it offers a little performance increase.
+ */
+#ifdef ZLIB_DLL
+#if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#ifdef ZLIB_INTERNAL
+#define ZEXTERN extern __declspec(dllexport)
+#else
+#define ZEXTERN extern __declspec(dllimport)
+#endif
+#endif
+#endif /* ZLIB_DLL */
+       /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+        * define ZLIB_WINAPI.
+        * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+        */
+#ifdef ZLIB_WINAPI
+#ifdef FAR
+#undef FAR
+#endif
+#include <windows.h>
+/* No need for _export, use ZLIB.DEF instead. */
+/* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#define ZEXPORT WINAPI
+#ifdef WIN32
+#define ZEXPORTVA WINAPIV
+#else
+#define ZEXPORTVA FAR CDECL
+#endif
+#endif
 #endif

-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
+#if defined(__BEOS__)
+#ifdef ZLIB_DLL
+#ifdef ZLIB_INTERNAL
+#define ZEXPORT __declspec(dllexport)
+#define ZEXPORTVA __declspec(dllexport)
+#else
+#define ZEXPORT __declspec(dllimport)
+#define ZEXPORTVA __declspec(dllimport)
+#endif
+#endif
 #endif

 #ifndef ZEXTERN
-#  define ZEXTERN extern
+#define ZEXTERN extern
 #endif
 #ifndef ZEXPORT
-#  define ZEXPORT
+#define ZEXPORT
 #endif
 #ifndef ZEXPORTVA
-#  define ZEXPORTVA
+#define ZEXPORTVA
 #endif

 #ifndef FAR
-#  define FAR
+#define FAR
 #endif

 #if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
+typedef unsigned char Byte; /* 8 bits */
 #endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef uint64_t  uLong; /* 32 bits or more */
+typedef unsigned int uInt;  /* 16 bits or more */
+typedef uint64_t     uLong; /* 32 bits or more */

 #ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
+/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#define Bytef Byte FAR
 #else
-   typedef Byte  FAR Bytef;
+typedef Byte FAR    Bytef;
 #endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
+typedef char FAR charf;
+typedef int FAR intf;
+typedef uInt FAR uIntf;
 typedef uLong FAR uLongf;

 #ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
+typedef void const *voidpc;
+typedef void FAR *voidpf;
+typedef void *    voidp;
 #else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
+typedef Byte const *voidpc;
+typedef Byte FAR *voidpf;
+typedef Byte *    voidp;
 #endif

 #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 uint64_t
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
+#include <limits.h>
+#if (UINT_MAX == 0xffffffffUL)
+#define Z_U4 unsigned
+#elif (ULONG_MAX == 0xffffffffUL)
+#define Z_U4 uint64_t
+#elif (USHRT_MAX == 0xffffffffUL)
+#define Z_U4 unsigned short
+#endif
 #endif

 #ifdef Z_U4
-   typedef Z_U4 z_crc_t;
+typedef Z_U4 z_crc_t;
 #else
-   typedef uint64_t z_crc_t;
+typedef uint64_t  z_crc_t;
 #endif

-#if 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
+#if 1 /* was set to #if 1 by ./configure */
+#define Z_HAVE_UNISTD_H
 #endif

-#if 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
+#if 1 /* was set to #if 1 by ./configure */
+#define Z_HAVE_STDARG_H
 #endif

 #ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
+#ifndef Z_SOLO
+#include <sys/types.h> /* for off_t */
+#endif
 #endif

 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
+#ifndef Z_SOLO
+#include <stdarg.h> /* for va_list */
+#endif
 #endif

 #ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
+#ifndef Z_SOLO
+#include <stddef.h> /* for wchar_t */
+#endif
 #endif

 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
@ -464,71 +464,76 @@ typedef uLong FAR uLongf;
 * equivalently requesting no 64-bit operations
 */
 #if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
+#undef _LARGEFILE64_SOURCE
 #endif

 #if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
+#define Z_HAVE_UNISTD_H
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#if (_WIN64)
+#include <io.h>
+#include <process.h>
+#else
+#include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#endif
+#ifdef VMS
+#include <unixio.h> /* for off_t */
+#endif
+#ifndef z_off_t
+#define z_off_t off_t
+#endif
+#endif
 #endif

-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE - 0
+#define Z_LFS64
 #endif

 #if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
+#define Z_LARGE64
 #endif

-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS - 0 == 64 && defined(Z_LFS64)
+#define Z_WANT64
 #endif

 #if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#define SEEK_SET 0 /* Seek from beginning of file.  */
+#define SEEK_CUR 1 /* Seek from current position.  */
+#define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
 #endif

 #ifndef z_off_t
-#  define z_off_t int64_t
+#define z_off_t int64_t
 #endif

 #if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
+#define z_off64_t off64_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
+#if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#define z_off64_t __int64
+#else
+#define z_off64_t z_off_t
+#endif
 #endif

 /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
+#pragma map(deflateInit_, "DEIN")
+#pragma map(deflateInit2_, "DEIN2")
+#pragma map(deflateEnd, "DEEND")
+#pragma map(deflateBound, "DEBND")
+#pragma map(inflateInit_, "ININ")
+#pragma map(inflateInit2_, "ININ2")
+#pragma map(inflateEnd, "INEND")
+#pragma map(inflateSync, "INSY")
+#pragma map(inflateSetDictionary, "INSEDI")
+#pragma map(compressBound, "CMBND")
+#pragma map(inflate_table, "INTABL")
+#pragma map(inflate_fast, "INFA")
+#pragma map(inflate_copyright, "INCOPY")
 #endif

 #endif /* ZCONF_H */
--- a/deps/zlib-1.2.11/src/zconf.h
+++ b/deps/zlib-1.2.11/src/zconf.h
@ -472,7 +472,12 @@ typedef uLong FAR uLongf;
 #endif
 #ifndef Z_SOLO
 #  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#if (_WIN64)
+#include <io.h>
+#include <process.h>
+#else
+#include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#endif
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
 #    endif
--- a/documentation20/webdocs/markdowndocs/Connections
+++ b/documentation20/webdocs/markdowndocs/Connections
@ -31,7 +31,7 @@ TDengine的Grafana插件在安装包的/usr/local/taos/connector/grafana目录

 ![img](../assets/add_datasource3.jpg)

-* Host： TDengine 集群的中任意一台服务器的 IP 地址与 TDengine RESTful 接口的端口号(6020)，默认 http://localhost:6020。
+* Host： TDengine 集群的中任意一台服务器的 IP 地址与 TDengine RESTful 接口的端口号(6041)，默认 http://localhost:6041
 * User：TDengine 用户名。
 * Password：TDengine 用户密码。

--- a/documentation20/webdocs/markdowndocs/Getting
+++ b/documentation20/webdocs/markdowndocs/Getting
@ -53,9 +53,12 @@ systemctl start taosd
 systemctl status taosd
 ```

-如果TDengine服务正常工作，那么您可以通过TDengine的命令行程序`taos`来访问并体验TDengine。
-
-**注：_systemctl_ 命令需要 _root_ 权限来运行，如果您非 _root_ 用户，请在命令前添加 _sudo_**
+如果TDengine服务正常工作，那么您可以通过TDengine的命令行程序`taos`来访问并体验TDengine。  
+  
+**注意：**  
+  
+- systemctl命令需要 _root_ 权限来运行，如果您非 _root_ 用户，请在命令前添加 sudo
+- 为更好的获得产品反馈，改善产品，TDengine会采集基本的使用信息，但您可以修改系统配置文件taos.cfg里的配置参数telemetryReporting, 将其设为0，就可将其关闭。

 ## TDengine命令行程序

--- a/documentation20/webdocs/markdowndocs/administrator-ch.md
+++ b/documentation20/webdocs/markdowndocs/administrator-ch.md
@ -39,7 +39,7 @@ Raw DataSize = numOfTables * rowSizePerTable * rowsPerTable

 用户可以通过参数keep，设置数据在磁盘中的最大保存时长。为进一步减少存储成本，TDengine还提供多级存储，最冷的数据可以存放在最廉价的存储介质上，应用的访问不用做任何调整，只是读取速度降低了。

-为提高速度，可以配置多快硬盘，这样可以并发写入或读取数据。
+为提高速度，可以配置多快硬盘，这样可以并发写入或读取数据。需要提醒的是，TDengine采取多副本的方式提供数据的高可靠，因此不再需要采用昂贵的磁盘阵列。

 ### 物理机或虚拟机台数

@ -80,11 +80,11 @@ TDengine系统后台服务由taosd提供，可以在配置文件taos.cfg里修

 下面仅仅列出一些重要的配置参数，更多的参数请看配置文件里的说明。各个参数的详细介绍及作用请看前述章节，而且这些参数的缺省配置都是工作的，一般无需设置。**注意：配置修改后，需要重启*taosd*服务才能生效。**

- firstEp: taosd启动时，主动连接的集群中第一个dnode的end point, 缺省值为 localhost:6030。
- secondEp: taosd启动时，如果first连接不上，尝试连接集群中第二个dnode的end point, 缺省值为空。
- fqdn：数据节点的FQDN。如果为空，将自动获取操作系统配置的第一个, 缺省值为空。
+- firstEp: taosd启动时，主动连接的集群中第一个dnode的end point, 默认值为localhost:6030。
+- secondEp: taosd启动时，如果first连接不上，尝试连接集群中第二个dnode的end point, 默认值为空。
+- fqdn：数据节点的FQDN。如果为空，将自动获取操作系统配置的第一个, 默认值为空。
 - serverPort：taosd启动后，对外服务的端口号，默认值为6030。
- httpPort: RESTful服务使用的端口号，所有的HTTP请求（TCP）都需要向该接口发起查询/写入请求。
+- httpPort: RESTful服务使用的端口号，所有的HTTP请求（TCP）都需要向该接口发起查询/写入请求, 默认值为6041。
 - dataDir: 数据文件目录，所有的数据文件都将写入该目录。默认值：/var/lib/taos。
 - logDir：日志文件目录，客户端和服务器的运行日志文件将写入该目录。默认值：/var/log/taos。
 - arbitrator：系统中裁决器的end point, 缺省值为空。
@ -92,9 +92,9 @@ TDengine系统后台服务由taosd提供，可以在配置文件taos.cfg里修
 - debugFlag：运行日志开关。131（输出错误和警告日志），135（ 输出错误、警告和调试日志），143（ 输出错误、警告、调试和跟踪日志）。默认值：131或135（不同模块有不同的默认值）。
 - numOfLogLines：单个日志文件允许的最大行数。默认值：10,000,000行。
 - maxSQLLength：单条SQL语句允许最长限制。默认值：65380字节。
- maxBinaryDisplayWidth：Shell中binary 和 nchar字段的显示宽度上限，超过此限制的部分将被隐藏。默认值：30。可在 shell 中通过命令 set max_binary_display_width nn动态修改此选项。
+- telemetryReporting: 是否允许 TDengine 采集和上报基本使用信息，0表示不允许，1表示允许。 默认值：1。

-**注意：**对于端口，TDengine会使用从serverPort起11个连续的TCP和UDP端口号，请务必在防火墙打开。因此如果是缺省配置，需要打开从6030都6040共11个端口，而且必须TCP和UDP都打开。
+**注意：**对于端口，TDengine会使用从serverPort起12个连续的TCP和UDP端口号，请务必在防火墙打开。因此如果是缺省配置，需要打开从6030都6041共12个端口，而且必须TCP和UDP都打开。

 不同应用场景的数据往往具有不同的数据特征，比如保留天数、副本数、采集频次、记录大小、采集点的数量、压缩等都可完全不同。为获得在存储上的最高效率，TDengine提供如下存储相关的系统配置参数：

@ -142,6 +142,7 @@ TDengine系统的前台交互客户端应用程序为taos，它与taosd共享同
 - secondEp: taos启动时，如果first连接不上，尝试连接集群中第二个taosd实例的end point, 缺省值为空。
 - charset：字符集编码。系统中动态获取，如果自动获取失败，需要用户在配置文件设置或通过API设置。
 - locale：系统区位信息及编码格式。系统中动态获取，如果自动获取失败，需要用户在配置文件设置或通过API设置。
+- maxBinaryDisplayWidth：Shell中binary 和 nchar字段的显示宽度上限，超过此限制的部分将被隐藏。默认值：30。可在 shell 中通过命令 set max_binary_display_width *nn* 动态修改此选项。

 日志的配置参数，与server的配置参数完全一样。

@ -152,19 +153,19 @@ TDengine系统的前台交互客户端应用程序为taos，它与taosd共享同
 系统管理员可以在CLI界面里添加、删除用户，也可以修改密码。CLI里SQL语法如下：

 ```
-CREATE USER user_name PASS ‘password’;
+CREATE USER <user_name> PASS <‘password’>;
 ```

 创建用户，并指定用户名和密码，密码需要用单引号引起来

 ```
-DROP USER user_name;
+DROP USER <user_name>;
 ```

 删除用户，限root用户使用

 ```
-ALTER USER user_name PASS ‘password’;
+ALTER USER <user_name> PASS <‘password’>;
 ```

 修改用户密码, 为避免被转换为小写，密码需要用单引号引用
@ -173,7 +174,9 @@ ALTER USER user_name PASS ‘password’;
 SHOW USERS;
 ```

-显示所有用户
+显示所有用户  
+  
+**注意：**SQL 语法中，< >表示需要用户输入的部分，但请不要输入< >本身

 ## 数据导入

--- a/documentation20/webdocs/markdowndocs/connector-ch.md
+++ b/documentation20/webdocs/markdowndocs/connector-ch.md
@ -338,16 +338,11 @@ TDengine 目前支持时间戳、数字、字符、布尔类型，与 Java 对
 maven 项目中使用如下 pom.xml 配置即可：

 ```xml
-<dependencies>
-    <dependency>
-      <groupId>com.taosdata.jdbc</groupId>
-      <artifactId>taos-jdbcdriver</artifactId>
-      <version>2.0.0</version>
-      <type>jar</type>
-      <scope>system</scope>
-      <systemPath>{localdir}/connector/taos-jdbcdriver-2.0.0-dist.jar</systemPath>
-    </dependency>
-</dependencies>
+<dependency>
+  <groupId>com.taosdata.jdbc</groupId>
+  <artifactId>taos-jdbcdriver</artifactId>
+  <version>2.0.1</version>
+</dependency>
 ```

 ### 源码编译打包
@ -752,9 +747,9 @@ http://<ip>:<PORT>/rest/sql
 参数说明：

 - IP: 集群中的任一台主机
- PORT: 配置文件中httpPort配置项，缺省为6020
+- PORT: 配置文件中httpPort配置项，缺省为6041

-例如：http://192.168.0.1:6020/rest/sql 是指向IP地址为192.168.0.1的URL. 
+例如：http://192.168.0.1:6041/rest/sql 是指向IP地址为192.168.0.1的URL. 

 HTTP请求的Header里需带有身份认证信息，TDengine支持Basic认证与自定义认证两种机制，后续版本将提供标准安全的数字签名机制来做身份验证。

@ -814,7 +809,7 @@ curl -u username:password -d '<SQL>' <ip>:<PORT>/rest/sql
 HTTP请求中需要带有授权码`<TOKEN>`，用于身份识别。授权码通常由管理员提供，可简单的通过发送`HTTP GET`请求来获取授权码，操作如下：

 ```
-curl http://<ip>:6020/rest/login/<username>/<password>
+curl http://<ip>:6041/rest/login/<username>/<password>
 ```

 其中，`ip`是TDengine数据库的IP地址，`username`为数据库用户名，`password`为数据库密码，返回值为`JSON`格式，各字段含义如下：
@ -828,7 +823,7 @@ curl http://<ip>:6020/rest/login/<username>/<password>
 获取授权码示例：

 ```
-curl http://192.168.0.1:6020/rest/login/root/taosdata
+curl http://192.168.0.1:6041/rest/login/root/taosdata
 ```

 返回值：
@ -846,7 +841,7 @@ curl http://192.168.0.1:6020/rest/login/root/taosdata
 - 在demo库里查询表d1001的所有记录： 

 ```
-curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001' 192.168.0.1:6020/rest/sql`
+curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001' 192.168.0.1:6041/rest/sql
 ```
 返回值：

@ -865,7 +860,7 @@ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001
 - 创建库demo：

 ```
-curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 192.168.0.1:6020/rest/sql`
+curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 192.168.0.1:6041/rest/sql
 ```

 返回值：
@ -885,7 +880,7 @@ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 19
 HTTP请求URL采用`sqlt`时，返回结果集的时间戳将采用Unix时间戳格式表示，例如

 ```
-curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001' 192.168.0.1:6020/rest/sqlt
+curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001' 192.168.0.1:6041/rest/sqlt
 ```

 返回值：
@ -906,7 +901,7 @@ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001

 HTTP请求URL采用`sqlutc`时，返回结果集的时间戳将采用UTC时间字符串表示，例如
 ```
-  curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.t1' 192.168.0.1:6020/rest/sqlutc
+  curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.t1' 192.168.0.1:6041/rest/sqlutc
 ```

 返回值：
@ -927,7 +922,7 @@ HTTP请求URL采用`sqlutc`时，返回结果集的时间戳将采用UTC时间

 下面仅列出一些与RESTFul接口有关的配置参数，其他系统参数请看配置文件里的说明。注意：配置修改后，需要重启taosd服务才能生效

- httpPort: 对外提供RESTFul服务的端口号，默认绑定到6020
+- httpPort: 对外提供RESTFul服务的端口号，默认绑定到6041
 - httpMaxThreads: 启动的线程数量，默认为2
 - restfulRowLimit: 返回结果集（JSON格式）的最大条数，默认值为10240
 - httpEnableCompress: 是否支持压缩，默认不支持，目前TDengine仅支持gzip压缩格式
@ -1099,3 +1094,18 @@ promise2.then(function(result) {
 [这里](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example-raw.js)同样是一个使用NodeJS 连接器建表，插入天气数据并查询插入的数据的代码示例，但和上面不同的是，该示例只使用`cursor`.


+[1]: https://search.maven.org/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[2]: https://mvnrepository.com/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[3]: https://github.com/taosdata/TDengine
+[4]: https://www.taosdata.com/blog/2019/12/03/jdbcdriver%e6%89%be%e4%b8%8d%e5%88%b0%e5%8a%a8%e6%80%81%e9%93%be%e6%8e%a5%e5%ba%93/
+[5]: https://github.com/brettwooldridge/HikariCP
+[6]: https://github.com/alibaba/druid
+[7]: https://github.com/taosdata/TDengine/issues
+[8]: https://search.maven.org/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[9]: https://mvnrepository.com/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[10]: https://maven.aliyun.com/mvn/search
+[11]:  https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC/SpringJdbcTemplate
+[12]: https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC/springbootdemo
+[13]: https://www.taosdata.com/cn/documentation20/administrator/#%E5%AE%A2%E6%88%B7%E7%AB%AF%E9%85%8D%E7%BD%AE
+[14]: https://www.taosdata.com/cn/documentation20/connector/#Windows
+[15]: https://www.taosdata.com/cn/getting-started/#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B
--- a/minidevops/grafana/tdengine/partials/config.html
+++ b/minidevops/grafana/tdengine/partials/config.html
@ -3,7 +3,7 @@
 <div class="gf-form-group">
 	<div class="gf-form max-width-30">
 		<span class="gf-form-label width-7">Host</span>
-		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6020" bs-typeahead="{{['http://localhost:6020']}}" required></input>
+		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6041" bs-typeahead="{{['http://localhost:6041']}}" required></input>
 	</div>

 	<div class="gf-form-inline">
--- a/minidevops/run.sh
+++ b/minidevops/run.sh
@ -1,35 +1,28 @@
 #!/bin/bash

 #set -x
-LP=`pwd`
-#echo $LP

 docker rm -f `docker ps -a -q`
 docker network rm minidevops
 docker network create --ip-range 172.15.1.255/24 --subnet 172.15.1.1/16 minidevops 

-#docker run -d   --net="host"   --pid="host"   -v "/:/host:ro"   quay.io/prometheus/node-exporter   --path.rootfs=/host

-docker run -d --net minidevops --ip 172.15.1.11 -v $LP/grafana:/var/lib/grafana/plugins -p 3000:3000 grafana/grafana
-#docker run -d --net minidevops --ip 172.15.1.11 -v /Users/tom/Documents/minidevops/grafana:/var/lib/grafana/plugins -p 3000:3000 grafana/grafana
+docker run -d --net minidevops --ip 172.15.1.11 -v $(pwd)/grafana:/var/lib/grafana/plugins -p 3000:3000 grafana/grafana

-TDENGINE=`docker run -d --net minidevops --ip 172.15.1.6 -p 6030:6030 -p 6020:6020 -p 6031:6031 -p 6032:6032 -p 6033:6033 -p 6034:6034 -p 6035:6035 -p 6036:6036 -p 6037:6037 -p 6038:6038 -p 6039:6039 tdengine/tdengine:1.6.4.5` 
-docker cp /etc/localtime $TDENGINE:/etc/localtime
+docker run -d --net minidevops --ip 172.15.1.6 -p 6030:6030 -p 6020:6020 -p 6031:6031 -p 6032:6032 -p 6033:6033 -p 6034:6034 -p 6035:6035 -p 6036:6036 -p 6037:6037 -p 6038:6038 -p 6039:6039 -p 6040:6040 -p 6041:6041 -h '172.15.1.6' tdengine/tdengine:2.0.0.0

-BLMPROMETHEUS=`docker run -d --net minidevops --ip 172.15.1.7 -p 10203:10203 tdengine/blm_prometheus 172.15.1.6`
+docker run -d --net minidevops --ip 172.15.1.7 -v $(pwd)/taos:/etc/taos -p 10203:10203 tdengine/blm_prometheus:2.0.0.0 -tdengine-name 172.15.1.6 -tdengine-api-port 6041


-BLMPTELEGRAF=`docker run -d --net minidevops --ip 172.15.1.8 -p 10202:10202 tdengine/blm_telegraf 172.15.1.6`
+docker run -d --net minidevops --ip 172.15.1.8 -p 10202:10202 tdengine/blm_telegraf:2.0.0.0 -host 172.15.1.6

-docker run -d  --net minidevops --ip 172.15.1.9 -v $LP/prometheus:/etc/prometheus -p 9090:9090 prom/prometheus
-#docker run -d  --net minidevops --ip 172.15.1.9 -v /Users/tom/Documents/minidevops/prometheus:/etc/prometheus -p 9090:9090 prom/prometheus
+docker run -d  --net minidevops --ip 172.15.1.9 -v $(pwd)/prometheus:/etc/prometheus -p 9090:9090 prom/prometheus

-docker run -d --net minidevops --ip 172.15.1.10 -v $LP/telegraf:/etc/telegraf -p 8092:8092 -p 8094:8094 -p 8125:8125 telegraf
-#docker run -d --net minidevops --ip 172.15.1.10 -v /Users/tom/Documents/minidevops/telegraf:/etc/telegraf -p 8092:8092 -p 8094:8094 -p 8125:8125 telegraf
+docker run -d --net minidevops --ip 172.15.1.10 -v $(pwd)/telegraf:/etc/telegraf -p 8092:8092 -p 8094:8094 -p 8125:8125 telegraf


 sleep 10
-curl -X POST http://localhost:3000/api/datasources --header "Content-Type:application/json" -u admin:admin -d '{"Name": "TDengine","Type": "tdengine","TypeLogoUrl": "public/plugins/tdengine/img/taosdata_logo.png","Access": "proxy","Url": "http://172.15.1.6:6020","BasicAuth": false,"isDefault": true,"jsonData": {},"readOnly": false}'
+curl -X POST http://localhost:3000/api/datasources --header "Content-Type:application/json" -u admin:admin -d '{"Name": "TDengine","Type": "tdengine","TypeLogoUrl": "public/plugins/tdengine/img/taosdata_logo.png","Access": "proxy","Url": "http://172.15.1.6:6041","BasicAuth": false,"isDefault": true,"jsonData": {},"readOnly": false}'

 curl -X POST http://localhost:3000/api/dashboards/db --header "Content-Type:application/json" -u admin:admin -d '{"dashboard":{"annotations":{"list":[{"builtIn":1,"datasource":"-- Grafana --","enable":true,"hide":true,"iconColor":"rgba(0, 211, 255, 1)","name":"Annotations & Alerts","type":"dashboard"}]},"editable":true,"gnetId":null,"graphTooltip":0,"id":1,"links":[],"panels":[{"datasource":null,"gridPos":{"h":8,"w":6,"x":0,"y":0},"id":6,"options":{"fieldOptions":{"calcs":["mean"],"defaults":{"color":{"mode":"thresholds"},"links":[{"title":"","url":""}],"mappings":[],"max":100,"min":0,"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null},{"color":"red","value":80}]},"unit":"percent"},"overrides":[],"values":false},"orientation":"auto","showThresholdLabels":false,"showThresholdMarkers":true},"pluginVersion":"6.6.0","targets":[{"refId":"A","sql":"select last_row(value) from telegraf.mem where field=\"used_percent\""}],"timeFrom":null,"timeShift":null,"title":"Memory used percent","type":"gauge"},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":null,"fill":1,"fillGradient":0,"gridPos":{"h":8,"w":12,"x":6,"y":0},"hiddenSeries":false,"id":8,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"MEMUSED-PERCENT","refId":"A","sql":"select avg(value) from telegraf.mem where field=\"used_percent\" interval(1m)"}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"MEM","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}},{"datasource":null,"gridPos":{"h":3,"w":18,"x":0,"y":8},"id":10,"options":{"displayMode":"lcd","fieldOptions":{"calcs":["mean"],"defaults":{"mappings":[],"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null}]},"unit":"percent"},"overrides":[],"values":false},"orientation":"auto","showUnfilled":true},"pluginVersion":"6.6.0","targets":[{"alias":"CPU-SYS","refId":"A","sql":"select last_row(value) from telegraf.cpu where field=\"usage_system\""},{"alias":"CPU-IDLE","refId":"B","sql":"select last_row(value) from telegraf.cpu where field=\"usage_idle\""},{"alias":"CPU-USER","refId":"C","sql":"select last_row(value) from telegraf.cpu where field=\"usage_user\""}],"timeFrom":null,"timeShift":null,"title":"CPU-USED","type":"bargauge"},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"TDengine","description":"General CPU monitor","fill":1,"fillGradient":0,"gridPos":{"h":9,"w":18,"x":0,"y":11},"hiddenSeries":false,"id":2,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"CPU-USER","refId":"A","sql":"select avg(value) from telegraf.cpu where field=\"usage_user\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-SYS","refId":"B","sql":"select avg(value) from telegraf.cpu where field=\"usage_system\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-IDLE","refId":"C","sql":"select avg(value) from telegraf.cpu where field=\"usage_idle\" and cpu=\"cpu-total\" interval(1m)"}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"CPU","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}}],"refresh":"10s","schemaVersion":22,"style":"dark","tags":["demo"],"templating":{"list":[]},"time":{"from":"now-3h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"]},"timezone":"","title":"TDengineDashboardDemo","id":null,"uid":null,"version":0}}'

--- a/minidevops/taos/taos.cfg
+++ b/minidevops/taos/taos.cfg
@ -0,0 +1 @@
+debugFlag 135
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@ -47,7 +47,6 @@ cp ${compile_dir}/../packaging/cfg/taos.cfg         ${pkg_dir}${install_home_pat
 cp ${compile_dir}/../packaging/deb/taosd            ${pkg_dir}${install_home_path}/init.d
 cp ${compile_dir}/../packaging/tools/post.sh        ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/tools/preun.sh       ${pkg_dir}${install_home_path}/script
-cp ${compile_dir}/build/bin/taosdump                ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taosdemo                ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taos                    ${pkg_dir}${install_home_path}/bin
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@ -5,14 +5,13 @@ WORKDIR /root
 COPY tdengine.tar.gz /root/
 RUN tar -zxf tdengine.tar.gz
 WORKDIR /root/TDengine-server/
-RUN sh install.sh
+RUN sh install.sh -e no


 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib"
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
-EXPOSE 6020 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042
-EXPOSE 6043 6044 6045 6046 6047 6048 6049 6050
+EXPOSE 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041
 CMD ["taosd"]
 VOLUME [ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
@ -2,5 +2,5 @@
 set -x
 $1
 docker build --rm -f "Dockerfile" -t tdengine/tdengine:$1 "."
-docker login -u tdengine -p ********  #replace the docker registry username and password
-docker push tdengine/tdengine:$1
+docker login -u tdengine -p $2  #replace the docker registry username and password
+docker push tdengine/tdengine:$1
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@ -58,7 +58,6 @@ cp %{_compiledir}/../packaging/tools/preun.sh       %{buildroot}%{homepath}/scri
 cp %{_compiledir}/build/bin/taos                    %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosd                   %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosdemo                %{buildroot}%{homepath}/bin
-cp %{_compiledir}/build/bin/taosdump                %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/lib/${libfile}              %{buildroot}%{homepath}/driver
 cp %{_compiledir}/../src/inc/taos.h                 %{buildroot}%{homepath}/include
 cp %{_compiledir}/../src/inc/taoserror.h            %{buildroot}%{homepath}/include
@ -134,7 +133,6 @@ if [ $1 -eq 0 ];then
    ${csudo} rm -f ${bin_link_dir}/taos       || :
    ${csudo} rm -f ${bin_link_dir}/taosd      || :
    ${csudo} rm -f ${bin_link_dir}/taosdemo   || :
-    ${csudo} rm -f ${bin_link_dir}/taosdump   || :
    ${csudo} rm -f ${cfg_link_dir}/*          || :
    ${csudo} rm -f ${inc_link_dir}/taos.h     || :
    ${csudo} rm -f ${inc_link_dir}/taoserror.h     || :
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@ -22,6 +22,7 @@ cfg_install_dir="/etc/taos"

 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"

 #install main path
@ -165,7 +166,6 @@ function install_bin() {
    ${csudo} rm -f ${bin_link_dir}/taos     || :
    ${csudo} rm -f ${bin_link_dir}/taosd    || :
    ${csudo} rm -f ${bin_link_dir}/taosdemo || :
-    ${csudo} rm -f ${bin_link_dir}/taosdump || :
    ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
    ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :

@ -174,7 +174,6 @@ function install_bin() {
    #Make link
    [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos                      || :
    [ -x ${install_main_dir}/bin/taosd ] && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd                   || :
-    [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump          || :
    [ -x ${install_main_dir}/bin/taosdemo ] && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo          || :
    [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos          || :
    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
@ -189,6 +188,7 @@ function install_bin() {
 function install_lib() {
    # Remove links
    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
    #${csudo} rm -rf ${v15_java_app_dir}              || :

    ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*  
@ -196,6 +196,9 @@ function install_lib() {
    ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
    ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
    
+    ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+    ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+        
 	  #if [ "$verMode" == "cluster" ]; then
    #    # Compatible with version 1.5
    #    ${csudo} mkdir -p ${v15_java_app_dir}
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@ -36,7 +36,7 @@ if [ "$pagMode" == "lite" ]; then
  strip ${build_dir}/bin/taos
  bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${script_dir}/remove.sh"
 else 
-  bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${build_dir}/bin/taosdump ${build_dir}/bin/tarbitrator ${script_dir}/remove.sh"
+  bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${build_dir}/bin/tarbitrator ${script_dir}/remove.sh"
 fi

 lib_files="${build_dir}/lib/libtaos.so.${version}"
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@ -21,6 +21,7 @@ inc_dir="/usr/local/taos/include"
 cfg_install_dir="/etc/taos"
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"

 service_config_dir="/etc/systemd/system"
@ -74,16 +75,19 @@ function install_include() {

 function install_lib() {
    ${csudo} rm -f ${lib_link_dir}/libtaos* || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos* || :
    
    ${csudo} ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.so.1
    ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+    
+    ${csudo} ln -s ${lib_dir}/libtaos.* ${lib64_link_dir}/libtaos.so.1           || :
+    ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so   || :
 }

 function install_bin() {
    # Remove links
    ${csudo} rm -f ${bin_link_dir}/taos     || :
    ${csudo} rm -f ${bin_link_dir}/taosd    || :
-    ${csudo} rm -f ${bin_link_dir}/taosdump || :
    ${csudo} rm -f ${bin_link_dir}/taosdemo || :
    ${csudo} rm -f ${bin_link_dir}/rmtaos   || :

@ -92,7 +96,6 @@ function install_bin() {
    #Make link
    [ -x ${bin_dir}/taos ] && ${csudo} ln -s ${bin_dir}/taos ${bin_link_dir}/taos             || :
    [ -x ${bin_dir}/taosd ] && ${csudo} ln -s ${bin_dir}/taosd ${bin_link_dir}/taosd          || :
-    [ -x ${bin_dir}/taosdump ] && ${csudo} ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || :
    [ -x ${bin_dir}/taosdemo ] && ${csudo} ln -s ${bin_dir}/taosdemo ${bin_link_dir}/taosdemo || :
 #   [ -x ${bin_dir}/remove.sh ] && ${csudo} ln -s ${bin_dir}/remove.sh ${bin_link_dir}/rmtaos || :
 }
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@ -37,7 +37,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))

  ADD_SUBDIRECTORY(tests)

-ELSEIF (TD_WINDOWS_64)
+ELSEIF (TD_WINDOWS)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows/win32)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@ -158,7 +158,7 @@ typedef struct SParamInfo {
  int32_t  idx;
  char     type;
  uint8_t  timePrec;
-  short    bytes;
+  int16_t  bytes;
  uint32_t offset;
 } SParamInfo;

--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@ -298,7 +298,7 @@ static int doBindParam(char* data, SParamInfo* param, TAOS_BIND* bind) {
      break;

    case TSDB_DATA_TYPE_BINARY:
-      if ((*bind->length) > param->bytes) {
+      if ((*bind->length) > (uintptr_t)param->bytes) {
        return TSDB_CODE_TSC_INVALID_VALUE;
      }
      size = (short)*bind->length;
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@ -1987,7 +1987,8 @@ int tscProcessUseDbRsp(SSqlObj *pSql) {
  return 0;
 }

-int tscProcessDropDbRsp(SSqlObj *UNUSED_PARAM(pSql)) {
+int tscProcessDropDbRsp(SSqlObj *pSql) {
+  pSql->pTscObj->db[0] = 0;
  taosCacheEmpty(tscCacheHandle);
  return 0;
 }
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@ -220,15 +220,16 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);

  if (numOfRows > 0) { // when reaching here the first execution of stream computing is successful.
-    pStream->numOfRes += numOfRows;
    for(int32_t i = 0; i < numOfRows; ++i) {
      TAOS_ROW row = taos_fetch_row(res);
-      tscDebug("%p stream:%p fetch result", pSql, pStream);
-      tscStreamFillTimeGap(pStream, *(TSKEY*)row[0]);
-      pStream->stime = *(TSKEY *)row[0];
-
-      // user callback function
-      (*pStream->fp)(pStream->param, res, row);
+      if (row != NULL) {
+        tscDebug("%p stream:%p fetch result", pSql, pStream);
+        tscStreamFillTimeGap(pStream, *(TSKEY*)row[0]);
+        pStream->stime = *(TSKEY *)row[0];
+        // user callback function
+        (*pStream->fp)(pStream->param, res, row);
+        pStream->numOfRes++;
+      }
    }

    if (!pStream->isProject) {
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@ -203,6 +203,7 @@ static void tscProcessSubscriptionTimer(void *handle, void *tmrId) {

 static SArray* getTableList( SSqlObj* pSql ) {
  const char* p = strstr( pSql->sqlstr, " from " );
+  assert(p != NULL); // we are sure this is a 'select' statement
  char* sql = alloca(strlen(p) + 32);
  sprintf(sql, "select tbid(tbname)%s", p);
  
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@ -1,6 +1,12 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

+IF (TD_WINDOWS)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/iconv)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
+ENDIF ()
+
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/os/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@ -565,7 +565,7 @@ int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value) {
    nrow = malloc(kvRowLen(row) + sizeof(SColIdx) + diff);
    if (nrow == NULL) return -1;

-    kvRowSetLen(nrow, kvRowLen(row) + sizeof(SColIdx) + diff);
+    kvRowSetLen(nrow, kvRowLen(row) + (int16_t)sizeof(SColIdx) + diff);
    kvRowSetNCols(nrow, kvRowNCols(row) + 1);

    if (ptr == NULL) {
@ -573,10 +573,10 @@ int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value) {
      memcpy(kvRowValues(nrow), kvRowValues(row), POINTER_DISTANCE(kvRowEnd(row), kvRowValues(row)));
      int colIdx = kvRowNCols(nrow) - 1;
      kvRowColIdxAt(nrow, colIdx)->colId = colId;
-      kvRowColIdxAt(nrow, colIdx)->offset = POINTER_DISTANCE(kvRowEnd(row), kvRowValues(row));
+      kvRowColIdxAt(nrow, colIdx)->offset = (int16_t)(POINTER_DISTANCE(kvRowEnd(row), kvRowValues(row)));
      memcpy(kvRowColVal(nrow, kvRowColIdxAt(nrow, colIdx)), value, diff);
    } else {
-      int16_t tlen = POINTER_DISTANCE(ptr, kvRowColIdx(row));
+      int16_t tlen = (int16_t)(POINTER_DISTANCE(ptr, kvRowColIdx(row)));
      if (tlen > 0) {
        memcpy(kvRowColIdx(nrow), kvRowColIdx(row), tlen);
        memcpy(kvRowValues(nrow), kvRowValues(row), ((SColIdx *)ptr)->offset);
@ -617,7 +617,7 @@ int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value) {
        kvRowSetNCols(nrow, kvRowNCols(row));

        // Copy part ahead
-        nlen = POINTER_DISTANCE(ptr, kvRowColIdx(row));
+        nlen = (int16_t)(POINTER_DISTANCE(ptr, kvRowColIdx(row)));
        ASSERT(nlen % sizeof(SColIdx) == 0);
        if (nlen > 0) {
          ASSERT(((SColIdx *)ptr)->offset > 0);
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@ -92,7 +92,7 @@ int32_t tsStreamCompStartDelay = 10000;
 int32_t tsStreamCompRetryDelay = 10;

 // The delayed computing ration. 10% of the whole computing time window by default.
-float tsStreamComputDelayRatio = 0.1;
+float tsStreamComputDelayRatio = 0.1f;

 int32_t tsProjectExecInterval = 10000;   // every 10sec, the projection will be executed once
 int64_t tsMaxRetentWindow = 24 * 3600L;  // maximum time window tolerance
@ -126,7 +126,7 @@ int32_t tsMnodeEqualVnodeNum = 4;
 // restful
 int32_t  tsEnableHttpModule = 1;
 int32_t  tsRestRowLimit = 10240;
-uint16_t tsHttpPort = 6020;  // only tcp, range tcp[6020]
+uint16_t tsHttpPort = 6041;  // only tcp, range tcp[6041]
 int32_t  tsHttpCacheSessions = 1000;
 int32_t  tsHttpSessionExpire = 36000;
 int32_t  tsHttpMaxThreads = 2;
@ -173,8 +173,8 @@ float   tsTotalTmpDirGB = 0;
 float   tsTotalDataDirGB = 0;
 float   tsAvailTmpDirectorySpace = 0;
 float   tsAvailDataDirGB = 0;
-float   tsReservedTmpDirectorySpace = 0.1;
-float   tsMinimalDataDirGB = 0.5;
+float   tsReservedTmpDirectorySpace = 0.1f;
+float   tsMinimalDataDirGB = 0.5f;
 int32_t tsTotalMemoryMB = 0;
 int32_t tsVersion = 0;

@ -294,7 +294,7 @@ bool taosCfgDynamicOptions(char *msg) {
  return false;
 }

-static void doInitGlobalConfig() {
+static void doInitGlobalConfig(void) {
  SGlobalCfg cfg = {0};
  
  // ip address
@ -405,8 +405,8 @@ static void doInitGlobalConfig() {
  cfg.ptr = &tsRatioOfQueryThreads;
  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
-  cfg.minValue = 0.1;
-  cfg.maxValue = 0.9;
+  cfg.minValue = 0.1f;
+  cfg.maxValue = 0.9f;
  cfg.ptrLength = 0;
  cfg.unitType = TAOS_CFG_UTYPE_NONE;
  taosInitConfigOption(cfg);
@ -607,8 +607,8 @@ static void doInitGlobalConfig() {
  cfg.ptr = &tsStreamComputDelayRatio;
  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 0.1;
-  cfg.maxValue = 0.9;
+  cfg.minValue = 0.1f;
+  cfg.maxValue = 0.9f;
  cfg.ptrLength = 0;
  cfg.unitType = TAOS_CFG_UTYPE_NONE;
  taosInitConfigOption(cfg);
@ -870,7 +870,7 @@ static void doInitGlobalConfig() {
  cfg.ptr = &tsMinimalLogDirGB;
  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 0.001;
+  cfg.minValue = 0.001f;
  cfg.maxValue = 10000000;
  cfg.ptrLength = 0;
  cfg.unitType = TAOS_CFG_UTYPE_GB;
@ -880,7 +880,7 @@ static void doInitGlobalConfig() {
  cfg.ptr = &tsReservedTmpDirectorySpace;
  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 0.001;
+  cfg.minValue = 0.001f;
  cfg.maxValue = 10000000;
  cfg.ptrLength = 0;
  cfg.unitType = TAOS_CFG_UTYPE_GB;
@ -890,7 +890,7 @@ static void doInitGlobalConfig() {
  cfg.ptr = &tsMinimalDataDirGB;
  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 0.001;
+  cfg.minValue = 0.001f;
  cfg.maxValue = 10000000;
  cfg.ptrLength = 0;
  cfg.unitType = TAOS_CFG_UTYPE_GB;
@ -1256,7 +1256,7 @@ static void doInitGlobalConfig() {
  cfg.valType = TAOS_CFG_VTYPE_INT32;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
  cfg.minValue = 1;
-  cfg.maxValue = 0x7fffffff;
+  cfg.maxValue = 65536;
  cfg.ptrLength = 0;
  cfg.unitType = TAOS_CFG_UTYPE_NONE;
  taosInitConfigOption(cfg);
@ -1338,7 +1338,7 @@ int taosGetFqdnPortFromEp(const char *ep, char *fqdn, uint16_t *port) {
 */

 bool taosCheckBalanceCfgOptions(const char *option, int32_t *vnodeId, int32_t *dnodeId) {
-  int len = strlen(option);
+  int len = (int)strlen(option);
  if (strncasecmp(option, "vnode:", 6) != 0) {
    return false;
  }
--- a/src/common/src/tname.c
+++ b/src/common/src/tname.c
@ -6,7 +6,7 @@
 #include "ttokendef.h"

 // todo refactor
-__attribute__((unused)) static FORCE_INLINE const char* skipSegments(const char* input, char delim, int32_t num) {
+UNUSED_FUNC static FORCE_INLINE const char* skipSegments(const char* input, char delim, int32_t num) {
  for (int32_t i = 0; i < num; ++i) {
    while (*input != 0 && *input++ != delim) {
    };
@ -14,7 +14,7 @@ __attribute__((unused)) static FORCE_INLINE const char* skipSegments(const char*
  return input;
 }

-__attribute__((unused)) static FORCE_INLINE size_t copy(char* dst, const char* src, char delimiter) {
+UNUSED_FUNC static FORCE_INLINE size_t copy(char* dst, const char* src, char delimiter) {
  size_t len = 0;
  while (*src != delimiter && *src != 0) {
    *dst++ = *src++;
@ -120,11 +120,11 @@ void extractTableNameFromToken(SSQLToken* pToken, SSQLToken* pTable) {
  char* r = strnchr(pToken->z, sep, pToken->n, false);

  if (r != NULL) {  // record the table name token
-    pTable->n = r - pToken->z;
+    pTable->n = (uint32_t)(r - pToken->z);
    pTable->z = pToken->z;

    r += 1;
-    pToken->n -= (r - pToken->z);
+    pToken->n -= (uint32_t)(r - pToken->z);
    pToken->z = r;
  }
 }
--- a/src/common/src/ttypes.c
+++ b/src/common/src/ttypes.c
@ -204,8 +204,8 @@ static void getStatics_i64(const TSKEY *primaryKey, const void *pData, int32_t n
 static void getStatics_f(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
                         int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
  float *data = (float *)pData;
-  float fmin      = DBL_MAX;
-  float fmax      = -DBL_MAX;
+  float fmin      = FLT_MAX;
+  float fmax      = -FLT_MAX;
  double dsum     = 0;
  *minIndex       = 0;
  *maxIndex       = 0;
--- a/src/common/src/tvariant.c
+++ b/src/common/src/tvariant.c
@ -101,19 +101,19 @@ void tVariantCreateFromBinary(tVariant *pVar, const char *pz, size_t len, uint32
      break;
    }
    case TSDB_DATA_TYPE_NCHAR: { // here we get the nchar length from raw binary bits length
-      int32_t lenInwchar = len / TSDB_NCHAR_SIZE;
+      size_t lenInwchar = len / TSDB_NCHAR_SIZE;
      pVar->wpz = calloc(1, (lenInwchar + 1) * TSDB_NCHAR_SIZE);
      
      wcsncpy(pVar->wpz, (wchar_t *)pz, lenInwchar);
      pVar->wpz[lenInwchar] = 0;
-      pVar->nLen = len;
+      pVar->nLen = (int32_t)len;
      
      break;
    }
    case TSDB_DATA_TYPE_BINARY: {  // todo refactor, extract a method
      pVar->pz = calloc(len, sizeof(char));
      memcpy(pVar->pz, pz, len);
-      pVar->nLen = len;
+      pVar->nLen = (int32_t)len;
      break;
    }
    
@ -185,7 +185,7 @@ int32_t tVariantToString(tVariant *pVar, char *dst) {
    case TSDB_DATA_TYPE_NCHAR: {
      dst[0] = '\'';
      taosUcs4ToMbs(pVar->wpz, (twcslen(pVar->wpz) + 1) * TSDB_NCHAR_SIZE, dst + 1);
-      int32_t len = strlen(dst);
+      int32_t len = (int32_t)strlen(dst);
      dst[len] = '\'';
      dst[len + 1] = 0;
      return len + 1;
@ -361,11 +361,11 @@ static int32_t toBinary(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
        pBuf = realloc(pBuf, newSize + 1);
      }
      
-      taosUcs4ToMbs(pVariant->wpz, newSize, pBuf);
+      taosUcs4ToMbs(pVariant->wpz, (int32_t)newSize, pBuf);
      free(pVariant->wpz);
      pBuf[newSize] = 0;
    } else {
-      taosUcs4ToMbs(pVariant->wpz, newSize, *pDest);
+      taosUcs4ToMbs(pVariant->wpz, (int32_t)newSize, *pDest);
    }
    
  } else {
@ -384,7 +384,7 @@ static int32_t toBinary(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
    *pDest = pBuf;
  }
  
-  *pDestSize = strlen(*pDest);
+  *pDestSize = (int32_t)strlen(*pDest);
  return 0;
 }

@ -428,7 +428,7 @@ static int32_t toNchar(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
    taosMbsToUcs4(pDst, nLen, *pDest, (nLen + 1) * TSDB_NCHAR_SIZE, &output);
    
    if (pDestSize != NULL) {
-      *pDestSize = output;
+      *pDestSize = (int32_t)output;
    }
  }
  
@ -682,7 +682,7 @@ int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool inclu
        float fv = (float)pVariant->i64Key;
        SET_FLOAT_VAL_ALIGN(payload, &fv);
 #else
-        *((float *)payload) = pVariant->i64Key;
+        *((float *)payload) = (float)pVariant->i64Key;
 #endif
      } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
 #ifdef _TD_ARM_32_
@ -735,7 +735,7 @@ int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool inclu
        double dv = (double)(pVariant->i64Key);
        SET_DOUBLE_VAL_ALIGN(payload, &dv);
 #else
-        *((double *)payload) = pVariant->i64Key;
+        *((double *)payload) = (double)pVariant->i64Key;
 #endif
      } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
 #ifdef _TD_ARM_32_
--- a/src/connector/grafana/tdengine/dist/partials/config.html
+++ b/src/connector/grafana/tdengine/dist/partials/config.html
@ -3,7 +3,7 @@
 <div class="gf-form-group">
 	<div class="gf-form max-width-30">
 		<span class="gf-form-label width-7">Host</span>
-		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6020" bs-typeahead="{{['http://localhost:6020']}}" required></input>
+		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6041" bs-typeahead="{{['http://localhost:6041']}}" required></input>
 	</div>

 	<div class="gf-form-inline">
--- a/src/connector/grafana/tdengine/src/partials/config.html
+++ b/src/connector/grafana/tdengine/src/partials/config.html
@ -3,7 +3,7 @@
 <div class="gf-form-group">
 	<div class="gf-form max-width-30">
 		<span class="gf-form-label width-7">Host</span>
-		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6020" bs-typeahead="{{['http://localhost:6020']}}" required></input>
+		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6041" bs-typeahead="{{['http://localhost:6041']}}" required></input>
 	</div>

 	<div class="gf-form-inline">
--- a/src/connector/jdbc/deploy-pom.xml
+++ b/src/connector/jdbc/deploy-pom.xml
@ -0,0 +1,218 @@
+<!-- This xml is used for deploy taos-jdbcdriver to maven reprository, change name to pom.xml if you need to deploy new driver to maven reprository -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.taosdata.jdbc</groupId>
+  <artifactId>taos-jdbcdriver</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+
+  <name>JDBCDriver</name>
+  <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
+  <description>TDengine JDBC Driver</description>
+
+
+  <licenses>
+    <license>
+      <name>GNU AFFERO GENERAL PUBLIC LICENSE Version 3</name>
+      <url>https://github.com/taosdata/TDengine/blob/master/LICENSE</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <scm>
+    <connection>scm:git:git://github.com/taosdata/TDengine.git</connection>
+    <developerConnection>scm:git:git@github.com:taosdata/TDengine.git</developerConnection>
+    <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
+    <tag>HEAD</tag>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>taosdata</name>
+      <email>support@taosdata.com</email>
+      <organization>https://www.taosdata.com/</organization>
+      <organizationUrl>https://www.taosdata.com/</organizationUrl>
+    </developer>
+  </developers>
+
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.5</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/assembly-jar.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.6.1</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <source>11</source>
+          <target>11</target>
+          <debug>true</debug>
+          <showDeprecation>true</showDeprecation>
+        </configuration>
+      </plugin>
+
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <charset>UTF-8</charset>
+          <docencoding>UTF-8</docencoding>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <doclint>none</doclint>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <version>1.6</version>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>deploy</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.2</version>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.7</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh-td</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <localCheckout>true</localCheckout>
+          <pushChanges>false</pushChanges>
+          <mavenExecutorId>forked-path</mavenExecutorId>
+          <arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-provider-gitexe</artifactId>
+            <version>1.11.2</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+    </plugins>
+  </build>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh-td</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+    <repository>
+      <id>ossrh-td</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+  </distributionManagement>
+
+</project>
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@ -97,7 +97,7 @@ public class TSDBJNIConnector {

        this.taos = this.connectImp(host, port, dbName, user, password);
        if (this.taos == TSDBConstants.JNI_NULL_POINTER) {
-            throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg(null)), "", this.getErrCode(null));
+            throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg(0L)), "", this.getErrCode(0l));
        }

        return true;
@ -115,7 +115,7 @@ public class TSDBJNIConnector {
            freeResultSet(taosResultSetPointer);
        }

-        long pSql = 0l;
+        Long pSql = 0l;
        try {
            pSql = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos);
        } catch (Exception e) {
@ -124,16 +124,11 @@ public class TSDBJNIConnector {
            throw new SQLException(TSDBConstants.WrapErrMsg("Unsupported encoding"));
        }
        int code = this.getErrCode(pSql);
-
-        if (code < 0) {
+        if (code != 0) {
            affectedRows = -1;
-            if (code == TSDBConstants.JNI_TDENGINE_ERROR) {
-                this.freeResultSet(pSql);
-                throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg(pSql)), "", this.getErrCode(pSql));
-            } else {
-                this.freeResultSet(pSql);
-                throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode(pSql));
-            }
+            String err_msg = this.getErrMsg(pSql);
+            this.freeResultSet(pSql);
+            throw new SQLException(TSDBConstants.WrapErrMsg(err_msg), "", code);
        }

        // Try retrieving result set for the executed SQL using the current connection pointer. If the executed
@ -151,20 +146,20 @@ public class TSDBJNIConnector {
    /**
     * Get recent error code by connection
     */
-    public int getErrCode(Long pSql) {
-        return Math.abs(this.getErrCodeImp(this.taos, pSql));
+    public int getErrCode(long pSql) {
+        return this.getErrCodeImp(this.taos, pSql);
    }

-    private native int getErrCodeImp(long connection, Long pSql);
+    private native int getErrCodeImp(long connection, long pSql);

    /**
     * Get recent error message by connection
     */
-    public String getErrMsg(Long pSql) {
-        return this.getErrMsgImp(this.taos, pSql);
+    public String getErrMsg(long pSql) {
+        return this.getErrMsgImp(pSql);
    }

-    private native String getErrMsgImp(long connection, Long pSql);
+    private native String getErrMsgImp(long pSql);

    /**
     * Get resultset pointer
@ -248,7 +243,7 @@ public class TSDBJNIConnector {
    public void closeConnection() throws SQLException {
        int code = this.closeConnectionImp(this.taos);
        if (code < 0) {
-            throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode(null));
+            throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode(0l));
        } else if (code == 0) {
            this.taos = TSDBConstants.JNI_NULL_POINTER;
        } else {
--- a/src/dnode/src/dnodeTelemetry.c
+++ b/src/dnode/src/dnodeTelemetry.c
@ -22,8 +22,16 @@
 #include "tsocket.h"
 #include "tbuffer.h"
 #include "mnode.h"
+#include "mnodeDef.h"
+#include "mnodeDb.h"
+#include "mnodeDnode.h"
 #include "mnodeCluster.h"
+#include "mnodeDnode.h"
+#include "mnodeVgroup.h"
+#include "mnodeMnode.h"
+#include "mnodeTable.h"
 #include "mnodeSdb.h"
+#include "mnodeAcct.h"
 #include "dnode.h"
 #include "dnodeInt.h"
 #include "dnodeTelemetry.h"
@ -33,7 +41,7 @@ static pthread_t tsTelemetryThread;

 #define TELEMETRY_SERVER "telemetry.taosdata.com"
 #define TELEMETRY_PORT 80
-#define REPORT_INTERVAL 86400
+#define REPORT_INTERVAL 86400 

 static void beginObject(SBufferWriter* bw) {
  tbufWriteChar(bw, '{');
@ -170,18 +178,23 @@ static void addVersionInfo(SBufferWriter* bw) {
  addStringField(bw, "version", version);
  addStringField(bw, "buildInfo", buildinfo);
  addStringField(bw, "gitInfo", gitinfo);
-  //addStringField(&bw, "installAt", "2020-08-01T00:00:00Z");
 }

 static void addRuntimeInfo(SBufferWriter* bw) {
-  // addIntField(&bw, "numOfDnode", 1);
-  // addIntField(&bw, "numOfVnode", 1);
-  // addIntField(&bw, "numOfStable", 1);
-  // addIntField(&bw, "numOfTable", 1);
-  // addIntField(&bw, "numOfRows", 1);
-  // addStringField(&bw, "startAt", "2020-08-01T00:00:00Z");
-  // addStringField(&bw, "memoryUsage", "10240 kB");
-  // addStringField(&bw, "diskUsage", "10240 MB");
+  addIntField(bw, "numOfDnode", mnodeGetDnodesNum());
+  addIntField(bw, "numOfMnode", mnodeGetMnodesNum());
+  addIntField(bw, "numOfVgroup", mnodeGetVgroupNum());
+  addIntField(bw, "numOfDatabase", mnodeGetDbNum());
+  addIntField(bw, "numOfSuperTable", mnodeGetSuperTableNum());
+  addIntField(bw, "numOfChildTable", mnodeGetChildTableNum());
+
+  SAcctInfo info;
+  mnodeGetStatOfAllAcct(&info);
+  addIntField(bw, "numOfColumn", info.numOfTimeSeries);
+  addIntField(bw, "numOfPoint", info.totalPoints);
+  addIntField(bw, "totalStorage", info.totalStorage);
+  addIntField(bw, "compStorage", info.compStorage);
+  // addStringField(bw, "installTime", "2020-08-01T00:00:00Z");
 }

 static void sendTelemetryReport() {
@ -220,28 +233,29 @@ static void sendTelemetryReport() {
  taosWriteSocket(fd, tbufGetData(&bw, false), contLen);
  tbufCloseWriter(&bw);

-  taosReadSocket(fd, buf, 10); // read something to avoid nginx error 499
+  // read something to avoid nginx error 499
+  if (taosReadSocket(fd, buf, 10) < 0) {
+    dTrace("failed to receive response, reason:%s", strerror(errno));
+  }
  taosCloseSocket(fd);
 }

 static void* telemetryThread(void* param) {
-  int timeToWait = 0;
+  struct timespec end = {0};
+  clock_gettime(CLOCK_REALTIME, &end);
+  end.tv_sec += 300; // wait 5 minutes before send first report
+
  while (1) {
-    if (timeToWait <= 0) {
-      if (sdbIsMaster()) {
-        sendTelemetryReport();
-      }
-      timeToWait = REPORT_INTERVAL;
+    if (sem_timedwait(&tsExitSem, &end) == 0) {
+      break;
+    } else if (errno != ETIMEDOUT) {
+      continue;
    }

-    int startAt = taosGetTimestampSec();
-    struct timespec timeout = {.tv_sec = 0, .tv_nsec = 0};
-    clock_gettime(CLOCK_REALTIME, &timeout);
-    timeout.tv_sec += timeToWait;
-    if (sem_timedwait(&tsExitSem, &timeout) == 0) {
-      break;
+    if (sdbIsMaster()) {
+      sendTelemetryReport();
    }
-    timeToWait -= (taosGetTimestampSec() - startAt);
+    end.tv_sec += REPORT_INTERVAL;
  }

  return NULL;
--- a/src/inc/taos.h
+++ b/src/inc/taos.h
@ -72,8 +72,8 @@ DLL_EXPORT void  taos_close(TAOS *taos);
 typedef struct TAOS_BIND {
  int            buffer_type;
  void *         buffer;
-  unsigned long  buffer_length;  // unused
-  unsigned long *length;
+  uintptr_t      buffer_length;  // unused
+  uintptr_t      *length;
  int *          is_null;
  int            is_unsigned;  // unused
  int *          error;        // unused
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@ -206,7 +206,7 @@ typedef struct SSubmitMsg {
  SMsgHead   header;
  int32_t    length;
  int32_t    numOfBlocks;
-  SSubmitBlk blocks[];
+  char       blocks[];
 } SSubmitMsg;

 typedef struct {
@ -680,7 +680,7 @@ typedef struct STableMetaMsg {
 typedef struct SMultiTableMeta {
  int32_t       numOfTables;
  int32_t       contLen;
-  STableMetaMsg metas[];
+  char          metas[];
 } SMultiTableMeta;

 typedef struct {
--- a/src/kit/shell/CMakeLists.txt
+++ b/src/kit/shell/CMakeLists.txt
@ -22,7 +22,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
 #  ENDIF ()
  
  SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
-ELSEIF (TD_WINDOWS_64)
+ELSEIF (TD_WINDOWS)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
  LIST(APPEND SRC ./src/shellEngine.c)
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@ -43,9 +43,10 @@ extern char configDir[];
 #define MAX_DB_NAME_SIZE 64
 #define MAX_TB_NAME_SIZE 64
 #define MAX_DATA_SIZE    1024
-#define MAX_NUM_DATATYPE 8
+#define MAX_NUM_DATATYPE 30
 #define OPT_ABORT        1 /* –abort */
 #define STRING_LEN       512
+#define MAX_PREPARED_RAND 1000000

 /* The options we understand. */
 static struct argp_option options[] = {
@ -175,6 +176,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
          }
          sptr[index++] = token;
          token = strsep(&running, ", ");
+          if (index >= MAX_NUM_DATATYPE) break;
        }
      }
      break;
@ -311,6 +313,8 @@ int generateData(char *res, char **data_type, int num_of_cols, int64_t timestamp

 void rand_string(char *str, int size);

+void init_rand_data();
+
 double getCurrentTime();

 void callBack(void *param, TAOS_RES *res, int code);
@ -361,7 +365,7 @@ int main(int argc, char *argv[]) {
  arguments.num_of_DPT = 100000;
  arguments.num_of_RPR = 1000;
  arguments.use_metric = true;
-  arguments.insert_only = false;
+  arguments.insert_only = true;
  // end change

  argp_parse(&argp, argc, argv, 0, 0, &arguments);
@ -403,6 +407,7 @@ int main(int argc, char *argv[]) {
    taos_close(qtaos);
    return 0;
  }
+  init_rand_data();

  memset(dataString, 0, STRING_LEN);
  int len = 0;
@ -411,7 +416,7 @@ int main(int argc, char *argv[]) {
    do_aggreFunc = false;
  }
  for (; count_data_type <= MAX_NUM_DATATYPE; count_data_type++) {
-    if (strcasecmp(data_type[count_data_type], "") == 0) {
+    if (data_type[count_data_type] == NULL) {
      break;
    }

@ -1169,6 +1174,66 @@ double getCurrentTime() {
  return tv.tv_sec + tv.tv_usec / 1E6;
 }

+int32_t  randint[MAX_PREPARED_RAND];
+int64_t  randbigint[MAX_PREPARED_RAND];
+float  randfloat[MAX_PREPARED_RAND];
+double  randdouble[MAX_PREPARED_RAND];
+
+int32_t rand_tinyint(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randint[cursor] % 128;
+
+}
+
+int32_t rand_smallint(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randint[cursor] % 32767;
+}
+
+int32_t rand_int(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randint[cursor];
+}
+
+int64_t rand_bigint(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randbigint[cursor];
+  
+}
+
+float rand_float(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randfloat[cursor];  
+  
+}
+
+double rand_double() {
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randdouble[cursor];
+
+}
+
+void init_rand_data(){
+  for (int i = 0; i < MAX_PREPARED_RAND; i++){
+    randint[i] = (int)(rand() % 10);
+    randbigint[i] = (int64_t)(rand() % 2147483648);
+    randfloat[i] = (float)(rand() / 1000.0);
+    randdouble[i] = (double)(rand() / 1000000.0);
+  }
+}
+
 int32_t generateData(char *res, char **data_type, int num_of_cols, int64_t timestamp, int len_of_binary) {
  memset(res, 0, MAX_DATA_SIZE);
  char *pstr = res;
@ -1176,7 +1241,7 @@ int32_t generateData(char *res, char **data_type, int num_of_cols, int64_t times
  int c = 0;

  for (; c < MAX_NUM_DATATYPE; c++) {
-    if (strcasecmp(data_type[c], "") == 0) {
+    if (data_type[c] == NULL) {
      break;
    }
  }
@ -1188,17 +1253,17 @@ int32_t generateData(char *res, char **data_type, int num_of_cols, int64_t times

  for (int i = 0; i < num_of_cols; i++) {
    if (strcasecmp(data_type[i % c], "tinyint") == 0) {
-      pstr += sprintf(pstr, ", %d", (int)(rand() % 128));
+      pstr += sprintf(pstr, ", %d", rand_tinyint() );
    } else if (strcasecmp(data_type[i % c], "smallint") == 0) {
-      pstr += sprintf(pstr, ", %d", (int)(rand() % 32767));
+      pstr += sprintf(pstr, ", %d", rand_smallint());
    } else if (strcasecmp(data_type[i % c], "int") == 0) {
-      pstr += sprintf(pstr, ", %d", (int)(rand() % 10)); 
+      pstr += sprintf(pstr, ", %d", rand_int()); 
    } else if (strcasecmp(data_type[i % c], "bigint") == 0) {
-      pstr += sprintf(pstr, ", %" PRId64, rand() % 2147483648);
+      pstr += sprintf(pstr, ", %" PRId64, rand_bigint());
    } else if (strcasecmp(data_type[i % c], "float") == 0) {
-      pstr += sprintf(pstr, ", %10.4f", (float)(rand() / 1000.0));
+      pstr += sprintf(pstr, ", %10.4f", rand_float());
    } else if (strcasecmp(data_type[i % c], "double") == 0) {
-      double t = (double)(rand() / 1000000.0);
+      double t = rand_double();
      pstr += sprintf(pstr, ", %20.8f", t);
    } else if (strcasecmp(data_type[i % c], "bool") == 0) {
      bool b = rand() & 1;
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@ -29,6 +29,7 @@
 #include <iconv.h>
 #include <time.h>

+#include "os.h"
 #include "taos.h"
 #include "taosdef.h"
 #include "taosmsg.h"
@ -191,7 +192,7 @@ struct arguments {
  char    *user;
  char    *password;
  uint16_t port;  
-  char     cversion[TSDB_FILENAME_LEN+1];
+  char     cversion[12];
  uint16_t mysqlFlag;
  // output file
  char     outpath[TSDB_FILENAME_LEN+1];
@ -248,7 +249,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
        fprintf(stderr, "Invalid client vesion %s\n", arg);
        return -1;
      }
-      strcpy(arguments->cversion, full_path.we_wordv[0]);
+      tstrncpy(arguments->cversion, full_path.we_wordv[0], 11);
      wordfree(&full_path);
      break;
    // output file path
@ -257,7 +258,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
        fprintf(stderr, "Invalid path %s\n", arg);
        return -1;
      }
-      strcpy(arguments->outpath, full_path.we_wordv[0]);
+      tstrncpy(arguments->outpath, full_path.we_wordv[0], TSDB_FILENAME_LEN);
      wordfree(&full_path);
      break;
    case 'i':
@ -266,7 +267,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
        fprintf(stderr, "Invalid path %s\n", arg);
        return -1;
      }
-      strcpy(arguments->inpath, full_path.we_wordv[0]);
+      tstrncpy(arguments->inpath, full_path.we_wordv[0], TSDB_FILENAME_LEN);
      wordfree(&full_path);
      break;
    case 'c':
@ -274,7 +275,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
        fprintf(stderr, "Invalid path %s\n", arg);
        return -1;
      }
-      strcpy(configDir, full_path.we_wordv[0]);
+      tstrncpy(configDir, full_path.we_wordv[0], TSDB_FILENAME_LEN);
      wordfree(&full_path);
      break;
    case 'e':
@ -430,7 +431,7 @@ int main(int argc, char *argv[]) {
  printf("==============================\n");

  if (tsArguments.cversion[0] != 0){
-    strcpy(version, tsArguments.cversion);
+    tstrncpy(version, tsArguments.cversion, 11);
  }

  if (taosCheckParam(&tsArguments) < 0) {
@ -513,7 +514,7 @@ int taosGetTableRecordInfo(char *table, STableRecordInfo *pTableRecordInfo, TAOS
  while ((row = taos_fetch_row(result)) != NULL) {
    isSet = true;
    pTableRecordInfo->isMetric = true;
-    strcpy(pTableRecordInfo->tableRecord.metric, table);
+    tstrncpy(pTableRecordInfo->tableRecord.metric, table, TSDB_TABLE_NAME_LEN);
    break;
  }

@ -541,9 +542,9 @@ int32_t taosSaveAllNormalTableToTempFile(TAOS *taosCon, char*meter, char* metric
    }
  }
  
-  memset(tableRecord.name, 0, sizeof(STableRecord));
-  strcpy(tableRecord.name, meter);
-  strcpy(tableRecord.metric, metric);
+  memset(&tableRecord, 0, sizeof(STableRecord));
+  tstrncpy(tableRecord.name, meter, TSDB_TABLE_NAME_LEN);
+  tstrncpy(tableRecord.metric, metric, TSDB_TABLE_NAME_LEN);

  taosTWrite(*fd, &tableRecord, sizeof(STableRecord));
  return 0;
@ -587,7 +588,7 @@ int32_t taosSaveTableOfMetricToTempFile(TAOS *taosCon, char* metric, struct argu
        taos_free_result(result);
        for (int32_t loopCnt = 0; loopCnt < numOfThread; loopCnt++) {
          sprintf(tmpFileName, ".tables.tmp.%d", loopCnt);
-          remove(tmpFileName);
+          (void)remove(tmpFileName);
        }
        free(tmpCommand);
        return -1;
@ -596,9 +597,9 @@ int32_t taosSaveTableOfMetricToTempFile(TAOS *taosCon, char* metric, struct argu
      numOfThread++;
    }
  
-    memset(tableRecord.name, 0, sizeof(STableRecord));
-    strncpy(tableRecord.name, (char *)row[0], fields[0].bytes);
-    strcpy(tableRecord.metric, metric);
+    memset(&tableRecord, 0, sizeof(STableRecord));
+    tstrncpy(tableRecord.name, (char *)row[0], fields[0].bytes);
+    tstrncpy(tableRecord.metric, metric, TSDB_TABLE_NAME_LEN);

    taosTWrite(fd, &tableRecord, sizeof(STableRecord));

@ -606,12 +607,16 @@ int32_t taosSaveTableOfMetricToTempFile(TAOS *taosCon, char* metric, struct argu

    if (numOfTable >= arguments->table_batch) {
      numOfTable = 0;
-      taosClose(fd);
+      close(fd);
      fd = -1;
    }
  }
-  taosClose(fd);
-  fd = -1;
+  
+  if (fd >= 0) {
+    close(fd);
+    fd = -1;
+  }
+  
  taos_free_result(result);

  *totalNumOfThread = numOfThread;
@ -846,13 +851,14 @@ int taosGetTableDes(char *table, STableDef *tableDes, TAOS* taosCon, bool isSupe
  if (code != 0) {
    fprintf(stderr, "failed to run command %s\n", tempCommand);
    free(tempCommand);
+    free(tbuf);
    taos_free_result(tmpResult);
    return -1;
  }

  TAOS_FIELD *fields = taos_fetch_fields(tmpResult);

-  strcpy(tableDes->name, table);
+  tstrncpy(tableDes->name, table, TSDB_COL_NAME_LEN);

  while ((row = taos_fetch_row(tmpResult)) != NULL) {
    strncpy(tableDes->cols[count].field, (char *)row[TSDB_DESCRIBE_METRIC_FIELD_INDEX],
@ -871,6 +877,7 @@ int taosGetTableDes(char *table, STableDef *tableDes, TAOS* taosCon, bool isSupe

  if (isSuperTable) {
    free(tempCommand);
+    free(tbuf);
    return count;
  }
  
@ -886,6 +893,7 @@ int taosGetTableDes(char *table, STableDef *tableDes, TAOS* taosCon, bool isSupe
    if (code != 0) {
      fprintf(stderr, "failed to run command %s\n", tempCommand);
      free(tempCommand);
+      free(tbuf);
      taos_free_result(tmpResult);
      return -1;
    }
@ -896,6 +904,7 @@ int taosGetTableDes(char *table, STableDef *tableDes, TAOS* taosCon, bool isSupe
    if (NULL == row) {
      fprintf(stderr, " fetch failed to run command %s\n", tempCommand);
      free(tempCommand);
+      free(tbuf);
      taos_free_result(tmpResult);
      return -1;
    }
@ -956,6 +965,7 @@ int taosGetTableDes(char *table, STableDef *tableDes, TAOS* taosCon, bool isSupe
  }

  free(tempCommand);
+  free(tbuf);

  return count;
 }
@ -1056,6 +1066,7 @@ void* taosDumpOutWorkThreadFp(void *arg)
  fp = fopen(tmpFileName, "w");
  if (fp == NULL) {
    fprintf(stderr, "failed to open file %s\n", tmpFileName);
+    close(fd);
    return NULL;
  }

@ -1067,16 +1078,20 @@ void* taosDumpOutWorkThreadFp(void *arg)
  if (code != 0) {
    fprintf(stderr, "invalid database %s\n", pThread->dbName);
    taos_free_result(tmpResult);
+    fclose(fp);  
+    close(fd);
    return NULL;
  }

  fprintf(fp, "USE %s\n\n", pThread->dbName);
-  while (read(fd, &tableRecord, sizeof(STableRecord)) > 0) {
+  while (1) {
+    ssize_t readLen = read(fd, &tableRecord, sizeof(STableRecord));
+    if (readLen <= 0) break;
    taosDumpTable(tableRecord.name, tableRecord.metric, &tsArguments, fp, pThread->taosCon);
  }

  taos_free_result(tmpResult);
-  taosClose(fd);
+  close(fd);
  fclose(fp);  

  return NULL;
@ -1090,7 +1105,7 @@ static void taosStartDumpOutWorkThreads(struct arguments* args, int32_t  numOfTh
    SThreadParaObj *pThread = threadObj + t;
    pThread->threadIndex = t;
    pThread->totalThreads = numOfThread;
-    strcpy(pThread->dbName, dbName);
+    tstrncpy(pThread->dbName, dbName, TSDB_TABLE_NAME_LEN);
    pThread->taosCon = taos_connect(args->host, args->user, args->password, NULL, args->port);
                                
    if (pThread->taosCon == NULL) {
@ -1189,7 +1204,7 @@ int32_t taosDumpCreateSuperTableClause(TAOS* taosCon, char* dbName, FILE *fp)
    fprintf(stderr, "failed to open temp file: %s\n", tmpFileName);
    taos_free_result(tmpResult);
    free(tmpCommand);
-    remove(".stables.tmp");
+    (void)remove(".stables.tmp");
    exit(-1);
  }
  
@ -1200,14 +1215,17 @@ int32_t taosDumpCreateSuperTableClause(TAOS* taosCon, char* dbName, FILE *fp)
  }  
  
  taos_free_result(tmpResult);
-  lseek(fd, 0, SEEK_SET);
+  (void)lseek(fd, 0, SEEK_SET);

-  while (read(fd, &tableRecord, sizeof(STableRecord)) > 0) {
+  while (1) {
+    ssize_t readLen = read(fd, &tableRecord, sizeof(STableRecord));
+    if (readLen <= 0) break;
+    
    (void)taosDumpStable(tableRecord.name, fp, taosCon);
  }

-  taosClose(fd);
-  remove(".stables.tmp");
+  close(fd);
+  (void)remove(".stables.tmp");
  
  free(tmpCommand);
  return 0;  
@ -1269,7 +1287,7 @@ int taosDumpDb(SDbInfo *dbInfo, struct arguments *arguments, FILE *fp, TAOS *tao
        taos_free_result(tmpResult);
        for (int32_t loopCnt = 0; loopCnt < numOfThread; loopCnt++) {
          sprintf(tmpFileName, ".tables.tmp.%d", loopCnt);
-          remove(tmpFileName);
+          (void)remove(tmpFileName);
        }
        free(tmpCommand);
        return -1;
@ -1279,8 +1297,8 @@ int taosDumpDb(SDbInfo *dbInfo, struct arguments *arguments, FILE *fp, TAOS *tao
    }
  
    memset(&tableRecord, 0, sizeof(STableRecord));
-    strncpy(tableRecord.name, (char *)row[TSDB_SHOW_TABLES_NAME_INDEX], fields[TSDB_SHOW_TABLES_NAME_INDEX].bytes);
-    strncpy(tableRecord.metric, (char *)row[TSDB_SHOW_TABLES_METRIC_INDEX], fields[TSDB_SHOW_TABLES_METRIC_INDEX].bytes);
+    tstrncpy(tableRecord.name, (char *)row[TSDB_SHOW_TABLES_NAME_INDEX], fields[TSDB_SHOW_TABLES_NAME_INDEX].bytes);
+    tstrncpy(tableRecord.metric, (char *)row[TSDB_SHOW_TABLES_METRIC_INDEX], fields[TSDB_SHOW_TABLES_METRIC_INDEX].bytes);

    taosTWrite(fd, &tableRecord, sizeof(STableRecord));

@ -1288,19 +1306,23 @@ int taosDumpDb(SDbInfo *dbInfo, struct arguments *arguments, FILE *fp, TAOS *tao

    if (numOfTable >= arguments->table_batch) {
      numOfTable = 0;
-      taosClose(fd);
+      close(fd);
      fd = -1;
    }
  }
-  taosClose(fd);
-  fd = -1;
+
+  if (fd >= 0) {
+    close(fd);
+    fd = -1;
+  }
+  
  taos_free_result(tmpResult);

  // start multi threads to dumpout
  taosStartDumpOutWorkThreads(arguments, numOfThread, dbInfo->name);
  for (int loopCnt = 0; loopCnt < numOfThread; loopCnt++) {
    sprintf(tmpFileName, ".tables.tmp.%d", loopCnt);
-    remove(tmpFileName);
+    (void)remove(tmpFileName);
  }
  
  free(tmpCommand);
@ -1718,6 +1740,10 @@ int convertNCharToReadable(char *str, int size, char *buf, int bufsize) {
  while (size > 0) {
    if (*pstr == '\0') break;
    int byte_width = mbtowc(&wc, pstr, MB_CUR_MAX);
+    if (byte_width < 0) {
+      fprintf(stderr, "mbtowc() return fail.\n");
+      exit(-1);
+    }

    if ((int)wc < 256) {
      pbuf = stpcpy(pbuf, ascii_literal_list[(int)wc]);
@ -1736,16 +1762,16 @@ int convertNCharToReadable(char *str, int size, char *buf, int bufsize) {
 void taosDumpCharset(FILE *fp) {
  char charsetline[256];

-  fseek(fp, 0, SEEK_SET);
+  (void)fseek(fp, 0, SEEK_SET);
  sprintf(charsetline, "#!%s\n", tsCharset);
-  fwrite(charsetline, strlen(charsetline), 1, fp);
+  (void)fwrite(charsetline, strlen(charsetline), 1, fp);
 }

 void taosLoadFileCharset(FILE *fp, char *fcharset) {
  char * line = NULL;
  size_t line_size = 0;

-  fseek(fp, 0, SEEK_SET);
+  (void)fseek(fp, 0, SEEK_SET);
  ssize_t size = getline(&line, &line_size, fp);
  if (size <= 2) {
    goto _exit_no_charset;
@ -1764,7 +1790,7 @@ void taosLoadFileCharset(FILE *fp, char *fcharset) {
  return;

 _exit_no_charset:
-  fseek(fp, 0, SEEK_SET);
+  (void)fseek(fp, 0, SEEK_SET);
  *fcharset = '\0';
  taosTFree(line);
  return;
@ -1814,7 +1840,7 @@ static void taosParseDirectory(const char *directoryName, const char *prefix, ch
  }

  int fileNum = 0;
-  while (fscanf(fp, "%s", fileArray[fileNum++])) {
+  while (fscanf(fp, "%128s", fileArray[fileNum++])) {
    if (strcmp(fileArray[fileNum-1], tsDbSqlFile) == 0) {
      fileNum--;
    }
@ -1825,6 +1851,7 @@ static void taosParseDirectory(const char *directoryName, const char *prefix, ch

  if (fileNum != totalFiles) {
    fprintf(stderr, "ERROR: directory:%s changed while read\n", directoryName);
+    pclose(fp);
    exit(0);
  }

@ -1842,7 +1869,7 @@ static void taosCheckTablesSQLFile(const char *directoryName)
    exit(0);
  }

-  while (fscanf(fp, "%s", tsDbSqlFile)) {
+  while (fscanf(fp, "%128s", tsDbSqlFile)) {
    break;
  }

@ -1900,20 +1927,6 @@ static FILE*  taosOpenDumpInFile(char *fptr) {

  char *fname = full_path.we_wordv[0];
  
-  if (access(fname, F_OK) != 0) {
-    fprintf(stderr, "ERROR: file %s is not exist\n", fptr);
-    
-    wordfree(&full_path);
-    return NULL;
-  }
-  
-  if (access(fname, R_OK) != 0) {
-    fprintf(stderr, "ERROR: file %s is not readable\n", fptr);
-    
-    wordfree(&full_path);
-    return NULL;
-  }
-
  FILE *f = fopen(fname, "r");
  if (f == NULL) {
    fprintf(stderr, "ERROR: failed to open file %s\n", fname);
--- a/src/kit/taosnetwork/client.c
+++ b/src/kit/taosnetwork/client.c
@ -43,7 +43,7 @@ typedef struct Arguments {

 static struct argp_option options[] = {
    {0, 'h', "host", 0, "The host to connect to TDEngine. Default is localhost.", 0},
-    {0, 'p', "port", 0, "The TCP or UDP port number to use for the connection. Default is 6020.", 1},
+    {0, 'p', "port", 0, "The TCP or UDP port number to use for the connection. Default is 6041.", 1},
    {0, 'm', "max port", 0, "The max TCP or UDP port number to use for the connection. Default is 6050.", 2}};

 static error_t parse_opt(int key, char *arg, struct argp_state *state) {
@ -145,7 +145,7 @@ void *checkUPort(void *sarg) {
 }

 int main(int argc, char *argv[]) {
-  SArguments arguments = {"127.0.0.1", 6020, 6050};
+  SArguments arguments = {"127.0.0.1", 6041, 6050};

  argp_parse(&argp, argc, argv, 0, 0, &arguments);

--- a/src/mnode/inc/mnodeAcct.h
+++ b/src/mnode/inc/mnodeAcct.h
@ -24,6 +24,7 @@ extern "C" {

 int32_t mnodeInitAccts();
 void    mnodeCleanupAccts();
+void    mnodeGetStatOfAllAcct(SAcctInfo* pAcctInfo);
 void *  mnodeGetAcct(char *acctName);
 void *  mnodeGetNextAcct(void *pIter, SAcctObj **pAcct);
 void    mnodeIncAcctRef(SAcctObj *pAcct);
--- a/src/mnode/inc/mnodeDb.h
+++ b/src/mnode/inc/mnodeDb.h
@ -30,6 +30,7 @@ enum _TSDB_DB_STATUS {
 // api
 int32_t mnodeInitDbs();
 void    mnodeCleanupDbs();
+int64_t mnodeGetDbNum();
 SDbObj *mnodeGetDb(char *db);
 SDbObj *mnodeGetDbByTableId(char *db);
 void *  mnodeGetNextDb(void *pIter, SDbObj **pDb);
--- a/src/mnode/inc/mnodeTable.h
+++ b/src/mnode/inc/mnodeTable.h
@ -24,6 +24,8 @@ extern "C" {

 int32_t mnodeInitTables();
 void    mnodeCleanupTables();
+int64_t mnodeGetSuperTableNum();
+int64_t mnodeGetChildTableNum();
 void *  mnodeGetTable(char *tableId);
 void    mnodeIncTableRef(void *pTable);
 void    mnodeDecTableRef(void *pTable);
--- a/src/mnode/inc/mnodeVgroup.h
+++ b/src/mnode/inc/mnodeVgroup.h
@ -24,6 +24,7 @@ struct SMnodeMsg;

 int32_t mnodeInitVgroups();
 void    mnodeCleanupVgroups();
+int64_t mnodeGetVgroupNum();
 SVgObj *mnodeGetVgroup(int32_t vgId);
 void    mnodeIncVgroupRef(SVgObj *pVgroup);
 void    mnodeDecVgroupRef(SVgObj *pVgroup);
--- a/src/mnode/src/mnodeAcct.c
+++ b/src/mnode/src/mnodeAcct.c
@ -23,6 +23,7 @@
 #include "mnodeDb.h"
 #include "mnodeSdb.h"
 #include "mnodeUser.h"
+#include "mnodeVgroup.h"

 #include "tglobal.h"

@ -130,6 +131,37 @@ void mnodeCleanupAccts() {
  tsAcctSdb = NULL;
 }

+void mnodeGetStatOfAllAcct(SAcctInfo* pAcctInfo) {
+  memset(pAcctInfo, 0, sizeof(*pAcctInfo));
+
+  void   *pIter = NULL;
+  SAcctObj *pAcct = NULL;
+  while (1) {
+    pIter = mnodeGetNextAcct(pIter, &pAcct);
+    if (pAcct == NULL) {
+      break;
+    }
+    pAcctInfo->numOfDbs += pAcct->acctInfo.numOfDbs;
+    pAcctInfo->numOfTimeSeries += pAcct->acctInfo.numOfTimeSeries;
+    mnodeDecAcctRef(pAcct);
+  }
+  sdbFreeIter(pIter);
+
+  SVgObj *pVgroup = NULL;
+  pIter = NULL;
+  while (1) {
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) {
+       break;
+    }
+    pAcctInfo->totalStorage += pVgroup->totalStorage;
+    pAcctInfo->compStorage += pVgroup->compStorage;
+    pAcctInfo->totalPoints += pVgroup->pointsWritten;
+    mnodeDecVgroupRef(pVgroup);
+  }
+  sdbFreeIter(pIter);
+}
+
 void *mnodeGetAcct(char *name) {
  return sdbGetRow(tsAcctSdb, name);
 }
--- a/src/mnode/src/mnodeDb.c
+++ b/src/mnode/src/mnodeDb.c
@ -61,6 +61,10 @@ static int32_t mnodeDbActionDestroy(SSdbOper *pOper) {
  return TSDB_CODE_SUCCESS;
 }

+int64_t mnodeGetDbNum() {
+  return sdbGetNumOfRows(tsDbSdb);
+}
+
 static int32_t mnodeDbActionInsert(SSdbOper *pOper) {
  SDbObj *pDb = pOper->pObj;
  SAcctObj *pAcct = mnodeGetAcct(pDb->acct);
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
@ -331,18 +331,50 @@ static void mnodeProcessCfgDnodeMsgRsp(SRpcMsg *rpcMsg) {
 }

 static bool mnodeCheckClusterCfgPara(const SClusterCfg *clusterCfg) {
-  if (clusterCfg->numOfMnodes        != htonl(tsNumOfMnodes))        return false;
-  if (clusterCfg->enableBalance      != htonl(tsEnableBalance))        return false;
-  if (clusterCfg->mnodeEqualVnodeNum != htonl(tsMnodeEqualVnodeNum)) return false;
-  if (clusterCfg->offlineThreshold   != htonl(tsOfflineThreshold))   return false;
-  if (clusterCfg->statusInterval     != htonl(tsStatusInterval))     return false;
-  if (clusterCfg->maxtablesPerVnode  != htonl(tsMaxTablePerVnode))   return false;
-  if (clusterCfg->maxVgroupsPerDb    != htonl(tsMaxVgroupsPerDb))    return false;
-
-  if (0 != strncasecmp(clusterCfg->arbitrator, tsArbitrator, strlen(tsArbitrator))) return false;
-  if (0 != strncasecmp(clusterCfg->timezone, tsTimezone, strlen(tsTimezone)))       return false;
-  if (0 != strncasecmp(clusterCfg->locale, tsLocale, strlen(tsLocale)))             return false;
-  if (0 != strncasecmp(clusterCfg->charset, tsCharset, strlen(tsCharset)))          return false;
+  if (clusterCfg->numOfMnodes != htonl(tsNumOfMnodes)) {
+    mError("\"numOfMnodes\"[%d - %d] cfg parameters inconsistent", clusterCfg->numOfMnodes, htonl(tsNumOfMnodes));
+    return false;
+  }  
+  if (clusterCfg->enableBalance      != htonl(tsEnableBalance)) {
+    mError("\"balance\"[%d - %d] cfg parameters inconsistent", clusterCfg->enableBalance, htonl(tsEnableBalance));
+    return false;
+  }
+  if (clusterCfg->mnodeEqualVnodeNum != htonl(tsMnodeEqualVnodeNum)) {
+    mError("\"mnodeEqualVnodeNum\"[%d - %d] cfg parameters inconsistent", clusterCfg->mnodeEqualVnodeNum, htonl(tsMnodeEqualVnodeNum));
+    return false;
+  }
+  if (clusterCfg->offlineThreshold   != htonl(tsOfflineThreshold)) {
+    mError("\"offlineThreshold\"[%d - %d] cfg parameters inconsistent", clusterCfg->offlineThreshold, htonl(tsOfflineThreshold));
+    return false;
+  }
+  if (clusterCfg->statusInterval     != htonl(tsStatusInterval)) {
+    mError("\"statusInterval\"[%d - %d] cfg parameters inconsistent", clusterCfg->statusInterval, htonl(tsStatusInterval));
+    return false;
+  }
+  if (clusterCfg->maxtablesPerVnode  != htonl(tsMaxTablePerVnode)) {
+    mError("\"maxTablesPerVnode\"[%d - %d] cfg parameters inconsistent", clusterCfg->maxtablesPerVnode, htonl(tsMaxTablePerVnode));
+    return false;
+  }
+  if (clusterCfg->maxVgroupsPerDb    != htonl(tsMaxVgroupsPerDb)) {
+    mError("\"maxVgroupsPerDb\"[%d - %d]  cfg parameters inconsistent", clusterCfg->maxVgroupsPerDb, htonl(tsMaxVgroupsPerDb));
+    return false;
+  }
+  if (0 != strncasecmp(clusterCfg->arbitrator, tsArbitrator, strlen(tsArbitrator))) {
+    mError("\"arbitrator\"[%s - %s]  cfg parameters inconsistent", clusterCfg->arbitrator, tsArbitrator);
+    return false;
+  }
+  if (0 != strncasecmp(clusterCfg->timezone, tsTimezone, strlen(tsTimezone))) {
+    mError("\"timezone\"[%s - %s]  cfg parameters inconsistent", clusterCfg->timezone, tsTimezone);
+    return false;
+  }
+  if (0 != strncasecmp(clusterCfg->locale, tsLocale, strlen(tsLocale))) {
+    mError("\"locale\"[%s - %s]  cfg parameters inconsistent", clusterCfg->locale, tsLocale);
+    return false;
+  }
+  if (0 != strncasecmp(clusterCfg->charset, tsCharset, strlen(tsCharset))) {
+    mError("\"charset\"[%s - %s] cfg parameters inconsistent.", clusterCfg->charset, tsCharset);
+    return false;
+  }
    
  return true;
 }
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@ -375,6 +375,14 @@ static void mnodeCleanupChildTables() {
  tsChildTableSdb = NULL;
 }

+int64_t mnodeGetSuperTableNum() {
+  return sdbGetNumOfRows(tsSuperTableSdb);
+}
+
+int64_t mnodeGetChildTableNum() {
+  return sdbGetNumOfRows(tsChildTableSdb);
+}
+
 static void mnodeAddTableIntoStable(SSuperTableObj *pStable, SChildTableObj *pCtable) {
  atomic_add_fetch_32(&pStable->numOfTables, 1);

@ -1345,7 +1353,7 @@ int32_t mnodeRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows,

    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
  
-    int16_t len = strnlen(stableName, TSDB_DB_NAME_LEN - 1);
+    int16_t len = strnlen(stableName, TSDB_TABLE_NAME_LEN - 1);
    *(int16_t*) pWrite = len;
    pWrite += sizeof(int16_t); // todo refactor
  
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@ -309,7 +309,7 @@ void mnodeUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVl
  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
    SVnodeGid *pVgid = &pVgroup->vnodeGid[i];
    if (pVgid->pDnode == pDnode) {
-      mTrace("dnode:%d, receive status from dnode, vgId:%d status is %d", pVgroup->vgId, pDnode->dnodeId, pVgid->role);
+      mTrace("dnode:%d, receive status from dnode, vgId:%d status is %d", pDnode->dnodeId, pVgroup->vgId, pVgid->role);
      pVgid->role = pVload->role;
      if (pVload->role == TAOS_SYNC_ROLE_MASTER) {
        pVgroup->inUse = i;
@ -605,6 +605,10 @@ void mnodeCleanupVgroups() {
  tsVgroupSdb = NULL;
 }

+int64_t mnodeGetVgroupNum() {
+  return sdbGetNumOfRows(tsVgroupSdb);
+}
+
 static int32_t mnodeGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
  SDbObj *pDb = mnodeGetDb(pShow->db);
  if (pDb == NULL) {
--- a/src/os/inc/osDarwin.h
+++ b/src/os/inc/osDarwin.h
@ -13,8 +13,8 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef TDENGINE_PLATFORM_LINUX_H
-#define TDENGINE_PLATFORM_LINUX_H
+#ifndef TDENGINE_OS_DARWIN_H
+#define TDENGINE_OS_DARWIN_H

 #ifdef __cplusplus
 extern "C" {
--- a/src/os/inc/osFile.h
+++ b/src/os/inc/osFile.h
@ -56,6 +56,22 @@ int32_t taosFileRename(char *fullPath, char *suffix, char delimiter, char **dstP
 // TAOS_OS_FUNC_FILE_GETTMPFILEPATH
 void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath);

+#ifdef TAOS_OS_FUNC_FILE_ISDIR
+  #define S_ISDIR(m) (((m) & 0170000) == (0040000))  
+#endif
+
+#ifdef TAOS_OS_FUNC_FILE_ISREG
+  #define S_ISREG(m) !(S_ISDIR(m))
+#endif
+
+#ifdef TAOS_OS_FUNC_FILE_ISLNK
+  #define S_ISLNK(m) 0
+#endif
+
+#ifndef TAOS_OS_FUNC_FILE_FTRUNCATE
+  #define taosFtruncate ftruncate
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/src/os/inc/osLinux32.h
+++ b/src/os/inc/osLinux32.h
@ -13,8 +13,8 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef TDENGINE_OS_LINUX64_H
-#define TDENGINE_OS_LINUX64_H
+#ifndef TDENGINE_OS_LINUX32_H
+#define TDENGINE_OS_LINUX32_H

 #ifdef __cplusplus
 extern "C" {
--- a/src/os/inc/osMemory.h
+++ b/src/os/inc/osMemory.h
@ -74,9 +74,9 @@ void   taosTMemset(void *ptr, int c);
    #define taosCalloc(num, size) taos_calloc(num, size, __FILE__, __LINE__)
    #define taosRealloc(ptr, size) taos_realloc(ptr, size, __FILE__, __LINE__)
    #define taosFree(ptr) taos_free(ptr, __FILE__, __LINE__)
-    #define taosStrdup(str) taos_strdup(str, __FILE__, __LINE__)
-    #define taosStrndup(str, size) taos_strndup(str, size, __FILE__, __LINE__)
-    #define taosGetline(lineptr, n, stream) taos_getline(lineptr, n, stream, __FILE__, __LINE__)
+    //#define taosStrdup(str) taos_strdup(str, __FILE__, __LINE__)
+    //#define taosStrndup(str, size) taos_strndup(str, size, __FILE__, __LINE__)
+    //#define taosGetline(lineptr, n, stream) taos_getline(lineptr, n, stream, __FILE__, __LINE__)
  #endif  
 #endif 

--- a/src/os/inc/osSemphone.h
+++ b/src/os/inc/osSemphone.h
@ -31,6 +31,7 @@ extern "C" {
 // TAOS_OS_FUNC_SEMPHONE_PTHREAD
 bool taosCheckPthreadValid(pthread_t thread);
 int64_t taosGetPthreadId();
+void taosResetPthread(pthread_t *thread);

 #ifdef __cplusplus
 }
--- a/src/os/inc/osWindows.h
+++ b/src/os/inc/osWindows.h
@ -13,8 +13,8 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef TDENGINE_PLATFORM_WINDOWS_H
-#define TDENGINE_PLATFORM_WINDOWS_H
+#ifndef TDENGINE_OS_WINDOWS_H
+#define TDENGINE_OS_WINDOWS_H

 #include <assert.h>
 #include <ctype.h>
@ -60,10 +60,15 @@ extern "C" {
 #define TAOS_OS_FUNC_DIR

 #define TAOS_OS_FUNC_FILE
+#define TAOS_OS_FUNC_FILE_ISREG
+#define TAOS_OS_FUNC_FILE_ISDIR
+#define TAOS_OS_FUNC_FILE_ISLNK
 #define TAOS_OS_FUNC_FILE_SENDIFLE
  #define taosFSendFile(outfile, infile, offset, count) taosFSendFileImp(outfile, infile, offset, size)
  #define taosTSendFile(dfd, sfd, offset, size) taosTSendFileImp(dfd, sfd, offset, size)
 #define TAOS_OS_FUNC_FILE_GETTMPFILEPATH
+#define TAOS_OS_FUNC_FILE_FTRUNCATE
+  extern int taosFtruncate(int fd, int64_t length); 

 #define TAOS_OS_FUNC_MATH
  #define SWAP(a, b, c)      \
@ -87,6 +92,7 @@ extern "C" {
  #define taosCloseSocket(fd) closesocket(fd)

 #define TAOS_OS_FUNC_STRING_WCHAR
+  int twcslen(const wchar_t *wcs);
 #define TAOS_OS_FUNC_STRING_GETLINE
 #define TAOS_OS_FUNC_STRING_STR2INT64
  #ifdef _TD_GO_DLL_
@ -97,7 +103,7 @@ extern "C" {
  #endif
 #define TAOS_OS_FUNC_STRING_STRDUP
  #define taosStrdupImp(str) _strdup(str)
-  #define taosStrndupImp(str, size) _strndup(str, size)
+  #define taosStrndupImp(str, size) _strndup(str, size)  

 #define TAOS_OS_FUNC_SYSINFO

@ -154,6 +160,9 @@ char *     strndup(const char *s, size_t n);
 #define TCP_KEEPCNT              0x1234
 #define TCP_KEEPIDLE             0x1234
 #define TCP_KEEPINTVL            0x1234
+#define SHUT_RDWR                SD_BOTH
+#define SHUT_RD                  SD_RECEIVE
+#define SHUT_WR                  SD_SEND

 #define LOCK_EX 1
 #define LOCK_NB 2
--- a/src/os/src/darwin/darwinSysInfo.c
+++ b/src/os/src/darwin/darwinSysInfo.c
@ -41,7 +41,7 @@ static void taosGetSystemLocale() {
  if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
    char *locale = setlocale(LC_CTYPE, "chs");
    if (locale != NULL) {
-      strncpy(tsLocale, locale, TSDB_LOCALE_LEN - 1);
+      tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
      cfg_locale->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
      uInfo("locale not configured, set to default:%s", tsLocale);
    }
--- a/src/os/src/detail/CMakeLists.txt
+++ b/src/os/src/detail/CMakeLists.txt
@ -1,6 +1,12 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)

+IF (TD_WINDOWS)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/iconv)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
+ENDIF ()
+
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/os/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
--- a/src/os/src/detail/osFile.c
+++ b/src/os/src/detail/osFile.c
@ -70,7 +70,7 @@ ssize_t taosTReadImp(int fd, void *buf, size_t count) {
  char *  tbuf = (char *)buf;

  while (leftbytes > 0) {
-    readbytes = read(fd, (void *)tbuf, leftbytes);
+    readbytes = read(fd, (void *)tbuf, (uint32_t)leftbytes);
    if (readbytes < 0) {
      if (errno == EINTR) {
        continue;
@ -94,7 +94,7 @@ ssize_t taosTWriteImp(int fd, void *buf, size_t n) {
  char *  tbuf = (char *)buf;

  while (nleft > 0) {
-    nwritten = write(fd, (void *)tbuf, nleft);
+    nwritten = write(fd, (void *)tbuf, (uint32_t)nleft);
    if (nwritten < 0) {
      if (errno == EINTR) {
        continue;
@ -105,7 +105,7 @@ ssize_t taosTWriteImp(int fd, void *buf, size_t n) {
    tbuf += nwritten;
  }

-  return n;
+  return (ssize_t)n;
 }

 #ifndef TAOS_OS_FUNC_FILE_SENDIFLE
--- a/src/os/src/detail/osRand.c
+++ b/src/os/src/detail/osRand.c
@ -26,11 +26,11 @@ uint32_t taosSafeRand(void) {

  fd = open("/dev/urandom", 0);
  if (fd < 0) {
-    seed = time(0);
+    seed = (int)time(0);
  } else {
    int len = read(fd, &seed, sizeof(seed));
    if (len < 0) {
-      seed = time(0);
+      seed = (int)time(0);
    }
    close(fd);
  }
--- a/src/os/src/detail/osSemphone.c
+++ b/src/os/src/detail/osSemphone.c
@ -20,5 +20,6 @@

 bool    taosCheckPthreadValid(pthread_t thread) { return thread != 0; }
 int64_t taosGetPthreadId() { return (int64_t)pthread_self(); }
+void    taosResetPthread(pthread_t *thread) { *thread = 0; }

 #endif
--- a/src/os/src/detail/osTime.c
+++ b/src/os/src/detail/osTime.c
@ -165,7 +165,7 @@ int32_t parseTimezone(char* str, int64_t* tzOffset) {

  char* sep = strchr(&str[i], ':');
  if (sep != NULL) {
-    int32_t len = sep - &str[i];
+    int32_t len = (int32_t)(sep - &str[i]);

    hour = strnatoi(&str[i], len);
    i += len + 1;
@ -212,7 +212,8 @@ int32_t parseTimeWithTz(char* timestr, int64_t* time, int32_t timePrec) {

 /* mktime will be affected by TZ, set by using taos_options */
 #ifdef WINDOWS
-  int64_t seconds = gmtime(&tm); 
+  int64_t seconds = user_mktime64(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+  //int64_t seconds = gmtime(&tm); 
 #else
  int64_t seconds = timegm(&tm);
 #endif
--- a/src/os/src/windows/w64File.c
+++ b/src/os/src/windows/w64File.c
@ -15,6 +15,7 @@

 #define _DEFAULT_SOURCE
 #include "os.h"
+#include "tulog.h"

 void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath) {
  const char* tdengineTmpFileNamePrefix = "tdengine-";
@ -77,4 +78,9 @@ int taosFSendFileImp(FILE* out_file, FILE* in_file, int64_t* offset, int32_t cou
 ssize_t taosTSendFileImp(int dfd, int sfd, off_t *offset, size_t size) {
  uError("taosTSendFileImp no implemented yet");
  return 0;
+}
+
+int taosFtruncate(int fd, int64_t length) {
+  uError("taosFtruncate no implemented yet");
+  return 0;
 }
--- a/src/os/src/windows/w64Socket.c
+++ b/src/os/src/windows/w64Socket.c
@ -13,6 +13,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#include "os.h"
 #include <WS2tcpip.h>  
 #include <IPHlpApi.h>  
 #include <winsock2.h>  
@ -33,7 +34,7 @@ void taosWinSocketInit() {
  }
 }

-int taosSetNonblocking(SOCKET sock, int on) {
+int taosSetNonblocking(int sock, int on) {
  u_long mode;
  if (on) {
    mode = 1;
--- a/src/os/src/windows/w64String.c
+++ b/src/os/src/windows/w64String.c
@ -67,7 +67,7 @@ char *getpass(const char *prefix) {
 }

 char *strndup(const char *s, size_t n) {
-  int len = strlen(s);
+  size_t len = strlen(s);
  if (len >= n) {
    len = n;
  }
@ -78,13 +78,13 @@ char *strndup(const char *s, size_t n) {
  return r;
 }

-size_t twcslen(const wchar_t *wcs) {
+int twcslen(const wchar_t *wcs) {
  int *wstr = (int *)wcs;
  if (NULL == wstr) {
    return 0;
  }

-  size_t n = 0;
+  int n = 0;
  while (1) {
    if (0 == *wstr++) {
      break;
--- a/src/os/src/windows/w64Sysinfo.c
+++ b/src/os/src/windows/w64Sysinfo.c
@ -43,7 +43,7 @@ static void taosGetSystemLocale() {
  if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
    char *locale = setlocale(LC_CTYPE, "chs");
    if (locale != NULL) {
-      tstrncpy(tsLocale, locale, sizeof(tsLocale));
+      tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);;
      cfg_locale->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
      uInfo("locale not configured, set to default:%s", tsLocale);
    }
--- a/src/rpc/src/rpcCache.c
+++ b/src/rpc/src/rpcCache.c
@ -82,7 +82,7 @@ void *rpcOpenConnCache(int maxSessions, void (*cleanFp)(void *), void *tmrCtrl,
  pCache->cleanFp = cleanFp;
  pCache->tmrCtrl = tmrCtrl;
  pCache->lockedBy = calloc(sizeof(int64_t), maxSessions);
-  taosTmrReset(rpcCleanConnCache, pCache->keepTimer * 2, pCache, pCache->tmrCtrl, &pCache->pTimer);
+  taosTmrReset(rpcCleanConnCache, (int32_t)(pCache->keepTimer * 2), pCache, pCache->tmrCtrl, &pCache->pTimer);

  pthread_mutex_init(&pCache->mutex, NULL);

@ -226,7 +226,7 @@ static void rpcCleanConnCache(void *handle, void *tmrId) {
  }

  // tTrace("timer, total connections in cache:%d", pCache->total);
-  taosTmrReset(rpcCleanConnCache, pCache->keepTimer * 2, pCache, pCache->tmrCtrl, &pCache->pTimer);
+  taosTmrReset(rpcCleanConnCache, (int32_t)(pCache->keepTimer * 2), pCache, pCache->tmrCtrl, &pCache->pTimer);
 }

 static void rpcRemoveExpiredNodes(SConnCache *pCache, SConnHash *pNode, int hash, uint64_t time) {
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@ -33,7 +33,7 @@
 #include "rpcHead.h"

 #define RPC_MSG_OVERHEAD (sizeof(SRpcReqContext) + sizeof(SRpcHead) + sizeof(SRpcDigest)) 
-#define rpcHeadFromCont(cont) ((SRpcHead *) (cont - sizeof(SRpcHead)))
+#define rpcHeadFromCont(cont) ((SRpcHead *) ((char*)cont - sizeof(SRpcHead)))
 #define rpcContFromHead(msg) (msg + sizeof(SRpcHead))
 #define rpcMsgLenFromCont(contLen) (contLen + sizeof(SRpcHead))
 #define rpcContLenFromMsg(msgLen) (msgLen - sizeof(SRpcHead))
@ -359,7 +359,7 @@ void rpcSendRequest(void *shandle, const SRpcEpSet *pEpSet, SRpcMsg *pMsg) {
  SRpcReqContext *pContext;

  int contLen = rpcCompressRpcMsg(pMsg->pCont, pMsg->contLen);
-  pContext = (SRpcReqContext *) (pMsg->pCont-sizeof(SRpcHead)-sizeof(SRpcReqContext));
+  pContext = (SRpcReqContext *) ((char*)pMsg->pCont-sizeof(SRpcHead)-sizeof(SRpcReqContext));
  pContext->ahandle = pMsg->ahandle;
  pContext->signature = pContext;
  pContext->pRpc = (SRpcInfo *)shandle;
@ -492,7 +492,7 @@ int rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo) {

 void rpcSendRecv(void *shandle, SRpcEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
  SRpcReqContext *pContext;
-  pContext = (SRpcReqContext *) (pMsg->pCont-sizeof(SRpcHead)-sizeof(SRpcReqContext));
+  pContext = (SRpcReqContext *) ((char*)pMsg->pCont-sizeof(SRpcHead)-sizeof(SRpcReqContext));

  memset(pRsp, 0, sizeof(SRpcMsg));
  
@ -654,7 +654,7 @@ static SRpcConn *rpcAllocateClientConn(SRpcInfo *pRpc) {

    pConn->pRpc = pRpc;
    pConn->sid = sid;
-    pConn->tranId = (uint16_t)(random() & 0xFFFF);
+    pConn->tranId = (uint16_t)(taosRand() & 0xFFFF);
    pConn->ownId = htonl(pConn->sid);
    pConn->linkUid = (uint32_t)((int64_t)pConn + (int64_t)getpid() + (int64_t)pConn->tranId);
    pConn->spi = pRpc->spi;
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@ -81,7 +81,7 @@ void *taosInitTcpServer(uint32_t ip, uint16_t port, char *label, int numOfThread
  }

  pServerObj->fd = -1;
-  pServerObj->thread = 0;
+  taosResetPthread(&pServerObj->thread);
  pServerObj->ip = ip;
  pServerObj->port = port;
  tstrncpy(pServerObj->label, label, sizeof(pServerObj->label));
@ -104,7 +104,7 @@ void *taosInitTcpServer(uint32_t ip, uint16_t port, char *label, int numOfThread
  pThreadObj = pServerObj->pThreadObj;
  for (int i = 0; i < numOfThreads; ++i) {
    pThreadObj->pollFd = -1;
-    pThreadObj->thread = 0;
+    taosResetPthread(&pThreadObj->thread);
    pThreadObj->processData = fp;
    tstrncpy(pThreadObj->label, label, sizeof(pThreadObj->label));
    pThreadObj->shandle = shandle;
--- a/src/rpc/src/rpcUdp.c
+++ b/src/rpc/src/rpcUdp.c
@ -144,7 +144,9 @@ void taosStopUdpConnection(void *handle) {

  for (int i = 0; i < pSet->threads; ++i) {
    pConn = pSet->udpConn + i;
-    if (pConn->thread) pthread_join(pConn->thread, NULL);
+    if (taosCheckPthreadValid(pConn->thread)) {
+      pthread_join(pConn->thread, NULL);
+    }
    taosTFree(pConn->buffer);
    // tTrace("%s UDP thread is closed, index:%d", pConn->label, i);
  }
--- a/src/tsdb/tests/CMakeLists.txt
+++ b/src/tsdb/tests/CMakeLists.txt
@ -1,4 +1,4 @@
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)

 add_executable(tsdbTests ${SOURCE_LIST})
 target_link_libraries(tsdbTests gtest gtest_main pthread common tsdb tutil trpc)
--- a/src/util/inc/tchecksum.h
+++ b/src/util/inc/tchecksum.h
@ -53,7 +53,12 @@ static FORCE_INLINE int taosCheckChecksum(const uint8_t *stream, uint32_t ssize,

 static FORCE_INLINE int taosCheckChecksumWhole(const uint8_t *stream, uint32_t ssize) {
  if (ssize < sizeof(TSCKSUM)) return 0;
+
+#if (_WIN64)
+  return 1;
+#else
  return *((TSCKSUM *)(stream + ssize - sizeof(TSCKSUM))) == (*crc32c)(0, stream, (size_t)(ssize - sizeof(TSCKSUM)));
+#endif
 }

 #ifdef __cplusplus
--- a/src/util/inc/tcoding.h
+++ b/src/util/inc/tcoding.h
@ -196,14 +196,14 @@ static FORCE_INLINE void *taosDecodeFixedI64(void *buf, int64_t *value) {
 static FORCE_INLINE int taosEncodeVariantU16(void **buf, uint16_t value) {
  int i = 0;
  while (value >= ENCODE_LIMIT) {
-    if (buf != NULL) ((uint8_t *)(*buf))[i] = (value | ENCODE_LIMIT);
+    if (buf != NULL) ((uint8_t *)(*buf))[i] = (uint8_t)(value | ENCODE_LIMIT);
    value >>= 7;
    i++;
    ASSERT(i < 3);
  }

  if (buf != NULL) {
-    ((uint8_t *)(*buf))[i] = value;
+    ((uint8_t *)(*buf))[i] = (uint8_t)value;
    *buf = POINTER_SHIFT(*buf, i + 1);
  }

@ -292,14 +292,14 @@ static FORCE_INLINE void *taosDecodeVariantI32(void *buf, int32_t *value) {
 static FORCE_INLINE int taosEncodeVariantU64(void **buf, uint64_t value) {
  int i = 0;
  while (value >= ENCODE_LIMIT) {
-    if (buf != NULL) ((uint8_t *)(*buf))[i] = (value | ENCODE_LIMIT);
+    if (buf != NULL) ((uint8_t *)(*buf))[i] = (uint8_t)(value | ENCODE_LIMIT);
    value >>= 7;
    i++;
    ASSERT(i < 10);
  }

  if (buf != NULL) {
-    ((uint8_t *)(*buf))[i] = value;
+    ((uint8_t *)(*buf))[i] = (uint8_t)value;
    *buf = POINTER_SHIFT(*buf, i + 1);
  }

@ -346,7 +346,7 @@ static FORCE_INLINE int taosEncodeString(void **buf, char *value) {
    memcpy(*buf, value, size);
    *buf = POINTER_SHIFT(*buf, size);
  }
-  tlen += size;
+  tlen += (int)size;

  return tlen;
 }
--- a/src/util/inc/tconfig.h
+++ b/src/util/inc/tconfig.h
@ -68,7 +68,7 @@ typedef struct {
  int8_t   cfgStatus;
  int8_t   unitType;
  int8_t   valType;
-  uint32_t ptrLength;
+  int32_t  ptrLength;
 } SGlobalCfg;

 extern SGlobalCfg tsGlobalConfig[];
--- a/src/util/inc/tstoken.h
+++ b/src/util/inc/tstoken.h
@ -82,7 +82,7 @@ static FORCE_INLINE int32_t isValidNumber(const SSQLToken* pToken) {
  const char* z = pToken->z;
  int32_t type = TK_ILLEGAL;

-  int32_t i = 0;
+  uint32_t i = 0;
  for(; i < pToken->n; ++i) {
    switch (z[i]) {
      case '+':
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
@ -69,7 +69,7 @@ static FORCE_INLINE void __wr_unlock(void *lock, int32_t type) {
 static FORCE_INLINE int32_t taosHashCapacity(int32_t length) {
  int32_t len = MIN(length, HASH_MAX_CAPACITY);

-  uint32_t i = 4;
+  int32_t i = 4;
  while (i < len) i = (i << 1u);
  return i;
 }
@ -167,7 +167,7 @@ SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool update, SHashLockTyp
  }

  // the max slots is not defined by user
-  pHashObj->capacity = taosHashCapacity(capacity);
+  pHashObj->capacity = taosHashCapacity((int32_t)capacity);
  assert((pHashObj->capacity & (pHashObj->capacity - 1)) == 0);

  pHashObj->hashFp = fn;
--- a/src/util/src/talgo.c
+++ b/src/util/src/talgo.c
@ -24,7 +24,7 @@
 } while (0);

 static void median(void *src, size_t size, size_t s, size_t e, const void *param, __ext_compar_fn_t comparFn, void* buf) {
-  int32_t mid = ((e - s) >> 1u) + s;
+  int32_t mid = ((int32_t)(e - s) >> 1u) + (int32_t)s;
  
  if (comparFn(elePtrAt(src, size, mid), elePtrAt(src, size, s), param) == 1) {
    doswap(elePtrAt(src, size, mid), elePtrAt(src, size, s), size, buf);
@ -152,14 +152,14 @@ static void tqsortImpl(void *src, int32_t start, int32_t end, size_t size, const

 void taosqsort(void *src, size_t numOfElem, size_t size, const void* param, __ext_compar_fn_t comparFn) {
  char *buf = calloc(1, size);   // prepare the swap buffer
-  tqsortImpl(src, 0, numOfElem - 1, size, param, comparFn, buf);
+  tqsortImpl(src, 0, (int32_t)numOfElem - 1, (int32_t)size, param, comparFn, buf);
  taosTFree(buf);
 }

 void * taosbsearch(const void *key, const void *base, size_t nmemb, size_t size, __compar_fn_t compar, int flags) {
  // TODO: need to check the correctness of this function
  int l = 0;
-  int r = nmemb;
+  int r = (int)nmemb;
  int idx = 0;
  int comparison;
  
--- a/src/util/src/tarray.c
+++ b/src/util/src/tarray.c
@ -120,8 +120,8 @@ void* taosArrayInsert(SArray* pArray, size_t index, void* pData) {

  void* dst = TARRAY_GET_ELEM(pArray, index);

-  int32_t remain = pArray->size - index;
-  memmove(dst + pArray->elemSize, dst, pArray->elemSize * remain);
+  int32_t remain = (int32_t)(pArray->size - index);
+  memmove((char*)dst + pArray->elemSize, (char*)dst, pArray->elemSize * remain);
  memcpy(dst, pData, pArray->elemSize);

  pArray->size += 1;
@ -138,7 +138,7 @@ void taosArrayRemove(SArray* pArray, size_t index) {
  }
  
  size_t remain = pArray->size - index - 1;
-  memmove(pArray->pData + index * pArray->elemSize, pArray->pData + (index + 1) * pArray->elemSize, remain * pArray->elemSize);
+  memmove((char*)pArray->pData + index * pArray->elemSize, (char*)pArray->pData + (index + 1) * pArray->elemSize, remain * pArray->elemSize);
  pArray->size -= 1;
 }

--- a/src/util/src/tbuffer.c
+++ b/src/util/src/tbuffer.c
@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <memory.h>
 #include <assert.h>
-#include <arpa/inet.h>
 #include "tbuffer.h"
 #include "exception.h"
 #include <taoserror.h>
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@ -101,7 +101,7 @@ static FORCE_INLINE void taosCacheReleaseNode(SCacheObj *pCacheObj, SCacheDataNo
    assert(0);
    return;
  }
-  
+
  pCacheObj->totalSize -= pNode->size;
  int32_t size = taosHashGetSize(pCacheObj->pHashTable);
  assert(size > 0);
@ -472,7 +472,7 @@ SCacheDataNode *taosCreateCacheNode(const char *key, size_t keyLen, const char *
  memcpy(pNewNode->data, pData, size);

  pNewNode->key = (char *)pNewNode + sizeof(SCacheDataNode) + size;
-  pNewNode->keySize = keyLen;
+  pNewNode->keySize = (uint16_t)keyLen;

  memcpy(pNewNode->key, key, keyLen);

--- a/src/util/src/tcompression.c
+++ b/src/util/src/tcompression.c
@ -52,14 +52,13 @@
 #include "tscompression.h"
 #include "taosdef.h"

-const int TEST_NUMBER = 1;
+static const int TEST_NUMBER = 1;
 #define is_bigendian() ((*(char *)&TEST_NUMBER) == 0)
 #define SIMPLE8B_MAX_INT64 ((uint64_t)2305843009213693951L)

-bool safeInt64Add(int64_t a, int64_t b) {
-  if ((a > 0 && b > INT64_MAX - a) || (a < 0 && b < INT64_MIN - a)) return false;
-  return true;
-}
+#define safeInt64Add(a, b) (((a >= 0) && (b <= INT64_MAX - a)) || ((a < 0) && (b >= INT64_MIN - a)))
+#define ZIGZAG_ENCODE(T, v) ((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1)  // zigzag encode
+#define ZIGZAG_DECODE(T, v) ((v) >> 1) ^ -((T)((v)&1))                                 // zigzag decode

 /*
 * Compress Integer (Simple8B).
@ -90,7 +89,7 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o
      break;
    default:
      perror("Wrong integer types.\n");
-      exit(1);
+      return -1;
  }

  int     byte_limit = nelements * word_length + 1;
@ -125,11 +124,11 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o

      int64_t diff = curr_value - prev_value_tmp;
      // Zigzag encode the value.
-      uint64_t zigzag_value = (diff >> (LONG_BYTES * BITS_PER_BYTE - 1)) ^ (diff << 1);
+      uint64_t zigzag_value = ZIGZAG_ENCODE(int64_t, diff);

      if (zigzag_value >= SIMPLE8B_MAX_INT64) goto _copy_and_exit;

-      char tmp_bit;
+      int64_t tmp_bit;
      if (zigzag_value == 0) {
        // Take care here, __builtin_clzl give wrong anser for value 0;
        tmp_bit = 0;
@ -171,7 +170,7 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o
          break;
      }
      int64_t  diff = curr_value - prev_value;
-      uint64_t zigzag_value = (diff >> (LONG_BYTES * BITS_PER_BYTE - 1)) ^ (diff << 1);
+      uint64_t zigzag_value = ZIGZAG_ENCODE(int64_t, diff);
      buffer |= ((zigzag_value & INT64MASK(bit)) << (bit * k + 4));
      i++;
      prev_value = curr_value;
@ -211,7 +210,7 @@ int tsDecompressINTImp(const char *const input, const int nelements, char *const
      break;
    default:
      perror("Wrong integer types.\n");
-      exit(1);
+      return -1;
  }

  // If not compressed.
@ -248,30 +247,30 @@ int tsDecompressINTImp(const char *const input, const int nelements, char *const
      } else {
        zigzag_value = ((w >> (4 + bit * i)) & INT64MASK(bit));
      }
-      int64_t diff = (zigzag_value >> 1) ^ -(zigzag_value & 1);
+      int64_t diff = ZIGZAG_DECODE(int64_t, zigzag_value);
      int64_t curr_value = diff + prev_value;
      prev_value = curr_value;

      switch (type) {
        case TSDB_DATA_TYPE_BIGINT:
-          *((int64_t *)output + _pos) = curr_value;
+          *((int64_t *)output + _pos) = (int64_t)curr_value;
          _pos++;
          break;
        case TSDB_DATA_TYPE_INT:
-          *((int32_t *)output + _pos) = curr_value;
+          *((int32_t *)output + _pos) = (int32_t)curr_value;
          _pos++;
          break;
        case TSDB_DATA_TYPE_SMALLINT:
-          *((int16_t *)output + _pos) = curr_value;
+          *((int16_t *)output + _pos) = (int16_t)curr_value;
          _pos++;
          break;
        case TSDB_DATA_TYPE_TINYINT:
-          *((int8_t *)output + _pos) = curr_value;
+          *((int8_t *)output + _pos) = (int8_t)curr_value;
          _pos++;
          break;
        default:
          perror("Wrong integer types.\n");
-          exit(1);
+          return -1;
      }
      count++;
      if (count == nelements) break;
@ -309,7 +308,7 @@ int tsCompressBoolImp(const char *const input, const int nelements, char *const
      output[pos] |= t;
    } else {
      perror("Wrong bool value.\n");
-      exit(1);
+      return -1;
    }
  }

@ -365,7 +364,7 @@ int tsCompressBoolRLEImp(const char *const input, const int nelements, char *con
      output[_pos++] = (counter << 1) | INT8MASK(0);
    } else {
      perror("Wrong bool value!\n");
-      exit(1);
+      return -1;
    }
  }

@ -417,7 +416,7 @@ int tsDecompressStringImp(const char *const input, int compressedSize, char *con
      char msg[128] = {0};
      sprintf(msg, "decomp_size:%d, Error decompress in LZ4 algorithm!\n", decompressed_size);
      perror(msg);
-      exit(EXIT_FAILURE);
+      return -1;
    }

    return decompressed_size;
@ -427,7 +426,7 @@ int tsDecompressStringImp(const char *const input, int compressedSize, char *con
    return compressedSize - 1;
  } else {
    perror("Wrong compressed string indicator!\n");
-    exit(EXIT_FAILURE);
+    return -1;
  }
 }

@ -454,21 +453,21 @@ int tsCompressTimestampImp(const char *const input, const int nelements, char *c
    if (!safeInt64Add(curr_delta, -prev_delta)) goto _exit_over;
    int64_t delta_of_delta = curr_delta - prev_delta;
    // zigzag encode the value.
-    uint64_t zigzag_value = (delta_of_delta >> (LONG_BYTES * BITS_PER_BYTE - 1)) ^ (delta_of_delta << 1);
+    uint64_t zigzag_value = ZIGZAG_ENCODE(int64_t, delta_of_delta);
    if (i % 2 == 0) {
      flags = 0;
      dd1 = zigzag_value;
      if (dd1 == 0) {
        flag1 = 0;
      } else {
-        flag1 = LONG_BYTES - BUILDIN_CLZL(dd1) / BITS_PER_BYTE;
+        flag1 = (uint8_t)(LONG_BYTES - BUILDIN_CLZL(dd1) / BITS_PER_BYTE);
      }
    } else {
      dd2 = zigzag_value;
      if (dd2 == 0) {
        flag2 = 0;
      } else {
-        flag2 = LONG_BYTES - BUILDIN_CLZL(dd2) / BITS_PER_BYTE;
+        flag2 = (uint8_t)(LONG_BYTES - BUILDIN_CLZL(dd2) / BITS_PER_BYTE);
      }
      flags = flag1 | (flag2 << 4);
      // Encode the flag.
@ -555,7 +554,7 @@ int tsDecompressTimestampImp(const char *const input, const int nelements, char
        } else {
          memcpy(&dd1, input + ipos, nbytes);
        }
-        delta_of_delta = (dd1 >> 1) ^ -(dd1 & 1);
+        delta_of_delta = ZIGZAG_DECODE(int64_t, dd1);
      }
      ipos += nbytes;
      if (opos == 0) {
@ -581,7 +580,7 @@ int tsDecompressTimestampImp(const char *const input, const int nelements, char
          memcpy(&dd2, input + ipos, nbytes);
        }
        // zigzag_decoding
-        delta_of_delta = (dd2 >> 1) ^ -(dd2 & 1);
+        delta_of_delta = ZIGZAG_DECODE(int64_t, dd2);
      }
      ipos += nbytes;
      prev_delta = delta_of_delta + prev_delta;
@ -643,12 +642,12 @@ int tsCompressDoubleImp(const char *const input, const int nelements, char *cons
    uint8_t flag;

    if (trailing_zeros > leading_zeros) {
-      nbytes = LONG_BYTES - trailing_zeros / BITS_PER_BYTE;
+      nbytes = (uint8_t)(LONG_BYTES - trailing_zeros / BITS_PER_BYTE);

      if (nbytes > 0) nbytes--;
      flag = ((uint8_t)1 << 3) | nbytes;
    } else {
-      nbytes = LONG_BYTES - leading_zeros / BITS_PER_BYTE;
+      nbytes = (uint8_t)(LONG_BYTES - leading_zeros / BITS_PER_BYTE);
      if (nbytes > 0) nbytes--;
      flag = nbytes;
    }
@ -790,12 +789,12 @@ int tsCompressFloatImp(const char *const input, const int nelements, char *const
    uint8_t flag;

    if (trailing_zeros > leading_zeros) {
-      nbytes = FLOAT_BYTES - trailing_zeros / BITS_PER_BYTE;
+      nbytes = (uint8_t)(FLOAT_BYTES - trailing_zeros / BITS_PER_BYTE);

      if (nbytes > 0) nbytes--;
      flag = ((uint8_t)1 << 3) | nbytes;
    } else {
-      nbytes = FLOAT_BYTES - leading_zeros / BITS_PER_BYTE;
+      nbytes = (uint8_t)(FLOAT_BYTES - leading_zeros / BITS_PER_BYTE);
      if (nbytes > 0) nbytes--;
      flag = nbytes;
    }
--- a/src/util/src/tconfig.c
+++ b/src/util/src/tconfig.c
@ -98,7 +98,7 @@ static void taosReadInt16Config(SGlobalCfg *cfg, char *input_value) {
 }

 static void taosReadDirectoryConfig(SGlobalCfg *cfg, char *input_value) {
-  int   length = strlen(input_value);
+  int   length = (int)strlen(input_value);
  char *option = (char *)cfg->ptr;
  if (length <= 0 || length > cfg->ptrLength) {
    uError("config option:%s, input value:%s, length out of range[0, %d], use default value:%s",
@ -150,7 +150,7 @@ static void taosReadIpStrConfig(SGlobalCfg *cfg, char *input_value) {
 }

 static void taosReadStringConfig(SGlobalCfg *cfg, char *input_value) {
-  int   length = strlen(input_value);
+  int   length = (int) strlen(input_value);
  char *option = (char *)cfg->ptr;
  if (length <= 0 || length > cfg->ptrLength) {
    uError("config option:%s, input value:%s, length out of range[0, %d], use default value:%s",
@ -283,7 +283,7 @@ void taosReadGlobalLogCfg() {
    option = value = NULL;
    olen = vlen = 0;

-    getline(&line, &len, fp);
+	taosGetline(&line, &len, fp);
    line[len - 1] = 0;
    
    paGetToken(line, &option, &olen);
@ -329,7 +329,7 @@ bool taosReadGlobalCfg() {
    option = value = NULL;
    olen = vlen = 0;

-    getline(&line, &len, fp);
+    taosGetline(&line, &len, fp);
    line[len - 1] = 0;
    
    paGetToken(line, &option, &olen);
--- a/src/util/src/tcrc32c.c
+++ b/src/util/src/tcrc32c.c
@ -1353,12 +1353,12 @@ uint32_t crc32c_hw(uint32_t crc, crc_stream buf, size_t len) {
 #endif // #ifndef _TD_ARM_

 void taosResolveCRC() {
-#ifndef _TD_ARM_
+#if defined _TD_ARM_ || defined WINDOWS
+  crc32c = crc32c_sf;
+#else
  int sse42;
  SSE42(sse42);
  crc32c = sse42 ? crc32c_hw : crc32c_sf;
-#else
-  crc32c = crc32c_sf;
 #endif  
  /* return sse42 ? crc32c_hw(crci, bytes, len) : crc32c_sf(crci, bytes, len);
   */
--- a/src/util/src/terror.c
+++ b/src/util/src/terror.c
@ -49,7 +49,7 @@ static int tsCompareTaosError(const void* a, const void* b) {
 }

 static pthread_once_t tsErrorInit = PTHREAD_ONCE_INIT;
-static void tsSortError() {
+static void tsSortError(void) {
  qsort(errors, sizeof(errors)/sizeof(errors[0]), sizeof(errors[0]), tsCompareTaosError);
 }

--- a/src/util/src/thashutil.c
+++ b/src/util/src/thashutil.c
@ -78,7 +78,7 @@ uint32_t taosIntHash_64(const char *key, uint32_t UNUSED_PARAM(len)) {
  uint64_t hash = val >> 16U;
  hash += (val & 0xFFFFU);
  
-  return hash;
+  return (uint32_t)hash;
 }

 _hash_fn_t taosGetDefaultHashFunction(int32_t type) {
--- a/src/util/src/tkvstore.c
+++ b/src/util/src/tkvstore.c
@ -120,7 +120,7 @@ SKVStore *tdOpenKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH
               version, KVSTORE_FILE_VERSION);
      }

-      if (ftruncate(pStore->fd, info.size) < 0) {
+      if (taosFtruncate(pStore->fd, info.size) < 0) {
        uError("failed to truncate %s to %" PRId64 " size since %s", pStore->fname, info.size, strerror(errno));
        terrno = TAOS_SYSTEM_ERROR(errno);
        goto _err;
@ -296,7 +296,7 @@ int tdDropKVStoreRecord(SKVStore *pStore, uint64_t uid) {
    return -1;
  }

-  pStore->info.magic = taosCalcChecksum(pStore->info.magic, (uint8_t *)buf, POINTER_DISTANCE(pBuf, buf));
+  pStore->info.magic = taosCalcChecksum(pStore->info.magic, (uint8_t *)buf, (uint32_t)POINTER_DISTANCE(pBuf, buf));
  pStore->info.size += POINTER_DISTANCE(pBuf, buf);
  pStore->info.nDels++;
  pStore->info.nRecords--;
@ -498,7 +498,7 @@ static void *tdDecodeKVRecord(void *buf, SKVRecord *pRecord) {
 static int tdRestoreKVStore(SKVStore *pStore) {
  char                  tbuf[128] = "\0";
  void *                buf = NULL;
-  int                   maxBufSize = 0;
+  int64_t               maxBufSize = 0;
  SKVRecord             rInfo = {0};
  SHashMutableIterator *pIter = NULL;

@ -535,7 +535,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {

      maxBufSize = MAX(maxBufSize, rInfo.size);

-      if (lseek(pStore->fd, rInfo.size, SEEK_CUR) < 0) {
+      if (lseek(pStore->fd, (off_t)rInfo.size, SEEK_CUR) < 0) {
        uError("failed to lseek file %s since %s", pStore->fname, strerror(errno));
        terrno = TAOS_SYSTEM_ERROR(errno);
        goto _err;
@ -548,7 +548,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {

  buf = malloc(maxBufSize);
  if (buf == NULL) {
-    uError("failed to allocate %d bytes in KV store %s", maxBufSize, pStore->fname);
+    uError("failed to allocate %" PRId64 " bytes in KV store %s", maxBufSize, pStore->fname);
    terrno = TAOS_SYSTEM_ERROR(errno);
    goto _err;
  }
@ -563,7 +563,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
  while (taosHashIterNext(pIter)) {
    SKVRecord *pRecord = taosHashIterGet(pIter);

-    if (lseek(pStore->fd, pRecord->offset + sizeof(SKVRecord), SEEK_SET) < 0) {
+    if (lseek(pStore->fd, (off_t)(pRecord->offset + sizeof(SKVRecord)), SEEK_SET) < 0) {
      uError("failed to lseek file %s since %s, offset %" PRId64, pStore->fname, strerror(errno), pRecord->offset);
      terrno = TAOS_SYSTEM_ERROR(errno);
      goto _err;
@ -577,7 +577,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
    }

    if (pStore->iFunc) {
-      if ((*pStore->iFunc)(pStore->appH, buf, pRecord->size) < 0) {
+      if ((*pStore->iFunc)(pStore->appH, buf, (int)pRecord->size) < 0) {
        uError("failed to restore record uid %" PRIu64 " in kv store %s at offset %" PRId64 " size %" PRId64
               " since %s",
               pRecord->uid, pStore->fname, pRecord->offset, pRecord->size, tstrerror(terrno));
--- a/src/util/src/tlog.c
+++ b/src/util/src/tlog.c
@ -65,7 +65,7 @@ typedef struct {
 int32_t tsAsyncLog = 1;
 float   tsTotalLogDirGB = 0;
 float   tsAvailLogDirGB = 0;
-float   tsMinimalLogDirGB = 0.1;
+float   tsMinimalLogDirGB = 0.1f;
 char    tsLogDir[TSDB_FILENAME_LEN] = "/var/log/taos";

 static SLogObj   tsLogObj = { .fileNum = 1 };
--- a/src/util/src/tmempool.c
+++ b/src/util/src/tmempool.c
@ -13,11 +13,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "os.h"
 #include "tulog.h"
 #include "tmempool.h"
 #include "tutil.h"
--- a/src/util/src/tsched.c
+++ b/src/util/src/tsched.c
@ -192,12 +192,12 @@ void taosCleanUpScheduler(void *param) {

  pSched->stop = true;
  for (int i = 0; i < pSched->numOfThreads; ++i) {
-    if (pSched->qthread[i]) {
+  if (taosCheckPthreadValid(pSched->qthread[i])) {
      tsem_post(&pSched->fullSem);
    }
  }
  for (int i = 0; i < pSched->numOfThreads; ++i) {
-    if (pSched->qthread[i]) {
+    if (taosCheckPthreadValid(pSched->qthread[i])) {
      pthread_join(pSched->qthread[i], NULL);
    }
  }
--- a/src/util/src/tskiplist.c
+++ b/src/util/src/tskiplist.c
@ -19,7 +19,7 @@
 #include "tutil.h"
 #include "tcompare.h"

-__attribute__ ((unused)) static FORCE_INLINE void recordNodeEachLevel(SSkipList *pSkipList, int32_t level) {  // record link count in each level
+UNUSED_FUNC static FORCE_INLINE void recordNodeEachLevel(SSkipList *pSkipList, int32_t level) {  // record link count in each level
 #if SKIP_LIST_RECORD_PERFORMANCE
  for (int32_t i = 0; i < level; ++i) {
    pSkipList->state.nLevelNodeCnt[i]++;
@ -27,7 +27,7 @@ __attribute__ ((unused)) static FORCE_INLINE void recordNodeEachLevel(SSkipList
 #endif
 }

-__attribute__ ((unused)) static FORCE_INLINE void removeNodeEachLevel(SSkipList *pSkipList, int32_t level) {
+UNUSED_FUNC static FORCE_INLINE void removeNodeEachLevel(SSkipList *pSkipList, int32_t level) {
 #if SKIP_LIST_RECORD_PERFORMANCE
  for (int32_t i = 0; i < level; ++i) {
    pSkipList->state.nLevelNodeCnt[i]--;
@ -132,7 +132,7 @@ static bool initForwardBackwardPtr(SSkipList* pSkipList) {
  pSkipList->pTail = (SSkipListNode*) ((char*) pSkipList->pHead + SL_NODE_HEADER_SIZE(maxLevel));
  pSkipList->pTail->level = pSkipList->maxLevel;
  
-  for(int32_t i = 0; i < maxLevel; ++i) {
+  for (uint32_t i = 0; i < maxLevel; ++i) {
    SL_GET_FORWARD_POINTER(pSkipList->pHead, i) = pSkipList->pTail;
    SL_GET_BACKWARD_POINTER(pSkipList->pTail, i) = pSkipList->pHead;
  }
@ -177,7 +177,7 @@ SSkipList *tSkipListCreate(uint8_t maxLevel, uint8_t keyType, uint8_t keyLen, ui
    }
  }

-  srand(time(NULL));
+  srand((uint32_t)time(NULL));

 #if SKIP_LIST_RECORD_PERFORMANCE
  pSkipList->state.nTotalMemSize += sizeof(SSkipList);
--- a/src/util/src/ttimer.c
+++ b/src/util/src/ttimer.c
@ -445,7 +445,7 @@ bool taosTmrStopA(tmr_h* timerId) {
 bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle, tmr_h* pTmrId) {
  tmr_ctrl_t* ctrl = (tmr_ctrl_t*)handle;
  if (ctrl == NULL || ctrl->label[0] == 0) {
-    return NULL;
+    return false;
  }

  uintptr_t  id = (uintptr_t)*pTmrId;
@ -491,7 +491,7 @@ static void taosTmrModuleInit(void) {
    return;
  }

-  for (int i = 0; i < tsMaxTmrCtrl - 1; ++i) {
+  for (uint32_t i = 0; i < tsMaxTmrCtrl - 1; ++i) {
    tmr_ctrl_t* ctrl = tmrCtrls + i;
    ctrl->next = ctrl + 1;
  }
--- a/Show More
+++ b/Show More