diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 54bb83d244..fe5f8cf7ed 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -18,15 +18,15 @@ target_sources(demoapi
 )
 
 target_link_libraries(tmq
-    taos
+    taos_static
 )
 
 target_link_libraries(tstream
-    taos
+    taos_static
 )
 
 target_link_libraries(demoapi
-    taos
+    taos_static
 )
 
 target_include_directories(tmq
diff --git a/packaging/make_install.sh b/packaging/make_install.sh
index e9d719eefc..f70f176a40 100755
--- a/packaging/make_install.sh
+++ b/packaging/make_install.sh
@@ -4,7 +4,7 @@
 # is required to use systemd to manage services at boot
 
 set -e
-# set -x
+#set -x
 
 # -----------------------Variables definition
 source_dir=$1
@@ -13,40 +13,52 @@ osType=$3
 verNumber=$4
 
 if [ "$osType" != "Darwin" ]; then
-    script_dir=$(dirname $(readlink -f "$0"))
+  script_dir=$(dirname $(readlink -f "$0"))
 else
-    script_dir=${source_dir}/packaging/tools
+  script_dir=${source_dir}/packaging/tools
 fi
 
 # Dynamic directory
+clientName="taos"
+serverName="taosd"
+logDir="/var/log/taos"
+dataDir="/var/lib/taos"
+configDir="/etc/taos"
+configFile="taos.cfg"
+installDir="/usr/local/taos"
+productName="TDengine"
+emailName="taosdata.com"
+uninstallScript="rmtaos"
 
 if [ "$osType" != "Darwin" ]; then
-    data_dir="/var/lib/taos"
-    log_dir="/var/log/taos"
+  data_dir=${dataDir}
+  log_dir=${logDir}
 
-    cfg_install_dir="/etc/taos"
+  cfg_install_dir=${configDir}
 
-    bin_link_dir="/usr/bin"
-    lib_link_dir="/usr/lib"
-    lib64_link_dir="/usr/lib64"
-    inc_link_dir="/usr/include"
+  bin_link_dir="/usr/bin"
+  lib_link_dir="/usr/lib"
+  lib64_link_dir="/usr/lib64"
+  inc_link_dir="/usr/include"
 
-    install_main_dir="/usr/local/taos"
+  install_main_dir=${installDir}
 
-    bin_dir="/usr/local/taos/bin"
+  bin_dir="${installDir}/bin"
 else
-    data_dir="/usr/local/var/lib/taos"
-    log_dir="/usr/local/var/log/taos"
+  data_dir="/usr/local${dataDir}"
+  log_dir="/usr/local${logDir}"
 
-    cfg_install_dir="/usr/local/etc/taos"
+  cfg_install_dir="/usr/local${configDir}"
 
-    bin_link_dir="/usr/local/bin"
-    lib_link_dir="/usr/local/lib"
-    inc_link_dir="/usr/local/include"
+  bin_link_dir="/usr/local/bin"
+  lib_link_dir="/usr/local/lib"
+  inc_link_dir="/usr/local/include"
 
-    install_main_dir="/usr/local/Cellar/tdengine/${verNumber}"
+  install_main_dir="/usr/local/Cellar/tdengine/${verNumber}"
+  install_main_2_dir="/usr/local/Cellar/tdengine@${verNumber}/${verNumber}"
 
-    bin_dir="/usr/local/Cellar/tdengine/${verNumber}/bin"
+  bin_dir="/usr/local/Cellar/tdengine/${verNumber}/bin"
+  bin_2_dir="/usr/local/Cellar/tdengine@${verNumber}/${verNumber}/bin"
 fi
 
 service_config_dir="/etc/systemd/system"
@@ -60,479 +72,586 @@ NC='\033[0m'
 
 csudo=""
 
-if [ "$osType" != "Darwin" ]; then
-    if command -v sudo > /dev/null; then
-    csudo="sudo"
-    fi
-    initd_mod=0
-    service_mod=2
-    if pidof systemd &> /dev/null; then
-        service_mod=0
-    elif $(which service &> /dev/null); then
-        service_mod=1
-        service_config_dir="/etc/init.d"
-        if $(which chkconfig &> /dev/null); then
-            initd_mod=1
-        elif $(which insserv &> /dev/null); then
-            initd_mod=2
-        elif $(which update-rc.d &> /dev/null); then
-            initd_mod=3
-        else
-            service_mod=2
-        fi
-    else
-        service_mod=2
-    fi
+service_mod=2
+os_type=0
 
-    # get the operating system type for using the corresponding init file
-    # ubuntu/debian(deb), centos/fedora(rpm), others: opensuse, redhat, ..., no verification
-    #osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
-    osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2)
-    #echo "osinfo: ${osinfo}"
-    os_type=0
-    if echo $osinfo | grep -qwi "ubuntu" ; then
-        echo "this is ubuntu system"
-        os_type=1
-    elif echo $osinfo | grep -qwi "debian" ; then
-        echo "this is debian system"
-        os_type=1
-    elif echo $osinfo | grep -qwi "Kylin" ; then
-        echo "this is Kylin system"
-        os_type=1
-    elif  echo $osinfo | grep -qwi "centos" ; then
-        echo "this is centos system"
-        os_type=2
-    elif echo $osinfo | grep -qwi "fedora" ; then
-        echo "this is fedora system"
-        os_type=2
+if [ "$osType" != "Darwin" ]; then
+  if command -v sudo >/dev/null; then
+    csudo="sudo "
+  fi
+  initd_mod=0
+  if pidof systemd &>/dev/null; then
+    service_mod=0
+  elif $(which service &>/dev/null); then
+    service_mod=1
+    service_config_dir="/etc/init.d"
+    if $(which chkconfig &>/dev/null); then
+      initd_mod=1
+    elif $(which insserv &>/dev/null); then
+      initd_mod=2
+    elif $(which update-rc.d &>/dev/null); then
+      initd_mod=3
     else
-        echo "${osinfo}: This is an officially unverified linux system, If there are any problems with the installation and operation, "
-        echo "please feel free to contact taosdata.com for support."
-        os_type=1
+      service_mod=2
     fi
+  else
+    service_mod=2
+  fi
+
+  # get the operating system type for using the corresponding init file
+  # ubuntu/debian(deb), centos/fedora(rpm), others: opensuse, redhat, ..., no verification
+  #osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+  osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2)
+  #echo "osinfo: ${osinfo}"
+  if echo $osinfo | grep -qwi "ubuntu"; then
+    echo "this is ubuntu system"
+    os_type=1
+  elif echo $osinfo | grep -qwi "debian"; then
+    echo "this is debian system"
+    os_type=1
+  elif echo $osinfo | grep -qwi "Kylin"; then
+    echo "this is Kylin system"
+    os_type=1
+  elif echo $osinfo | grep -qwi "centos"; then
+    echo "this is centos system"
+    os_type=2
+  elif echo $osinfo | grep -qwi "fedora"; then
+    echo "this is fedora system"
+    os_type=2
+  else
+    echo "${osinfo}: This is an officially unverified linux system, If there are any problems with the installation and operation, "
+    echo "please feel free to contact ${emailName} for support."
+    os_type=1
+  fi
 fi
 
+function kill_taosadapter() {
+  pid=$(ps -ef | grep "taosadapter" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo}kill -9 $pid || :
+  fi
+}
+
 function kill_taosd() {
-    pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
-    if [ -n "$pid" ]; then
-        ${csudo} kill -9 $pid   || :
-    fi
+  ps -ef | grep ${serverName}
+  pid=$(ps -ef | grep -w ${serverName} | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo}kill -9 $pid || :
+  fi
 }
 
 function install_main_path() {
-    #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/cfg
-    ${csudo} mkdir -p ${install_main_dir}/bin
-    ${csudo} mkdir -p ${install_main_dir}/connector
-    ${csudo} mkdir -p ${install_main_dir}/driver
-    ${csudo} mkdir -p ${install_main_dir}/examples
-    ${csudo} mkdir -p ${install_main_dir}/include
-    if [ "$osType" != "Darwin" ]; then
-        ${csudo} mkdir -p ${install_main_dir}/init.d
-    fi
+  #create install main dir and all sub dir
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}rm -rf ${install_main_dir} || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/cfg
+    ${csudo}mkdir -p ${install_main_dir}/bin
+    #    ${csudo}mkdir -p ${install_main_dir}/connector
+    ${csudo}mkdir -p ${install_main_dir}/driver
+    ${csudo}mkdir -p ${install_main_dir}/examples
+    ${csudo}mkdir -p ${install_main_dir}/include
+    #    ${csudo}mkdir -p ${install_main_dir}/init.d
+  else
+    ${csudo}rm -rf ${install_main_dir} || ${csudo}rm -rf ${install_main_2_dir} || :
+    ${csudo}mkdir -p ${install_main_dir} || ${csudo}mkdir -p ${install_main_2_dir}
+    ${csudo}mkdir -p ${install_main_dir}/cfg || ${csudo}mkdir -p ${install_main_2_dir}/cfg
+    ${csudo}mkdir -p ${install_main_dir}/bin || ${csudo}mkdir -p ${install_main_2_dir}/bin
+    #    ${csudo}mkdir -p ${install_main_dir}/connector || ${csudo}mkdir -p ${install_main_2_dir}/connector
+    ${csudo}mkdir -p ${install_main_dir}/driver || ${csudo}mkdir -p ${install_main_2_dir}/driver
+    ${csudo}mkdir -p ${install_main_dir}/examples || ${csudo}mkdir -p ${install_main_2_dir}/examples
+    ${csudo}mkdir -p ${install_main_dir}/include || ${csudo}mkdir -p ${install_main_2_dir}/include
+  fi
 }
 
 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}/taosdemo || :
-    ${csudo} rm -f ${bin_link_dir}/taosdump || :
+  # Remove links
+  ${csudo}rm -f ${bin_link_dir}/${clientName} || :
+  ${csudo}rm -f ${bin_link_dir}/${serverName} || :
+  ${csudo}rm -f ${bin_link_dir}/taosadapter || :
+  ${csudo}rm -f ${bin_link_dir}/taosdemo || :
+  ${csudo}rm -f ${bin_link_dir}/taosdump || :
 
-    if [ "$osType" != "Darwin" ]; then
-        ${csudo} rm -f ${bin_link_dir}/perfMonitor || :
-        ${csudo} rm -f ${bin_link_dir}/set_core || :
-        ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
-    fi
-    
-    ${csudo} cp -r ${binary_dir}/build/bin/* ${install_main_dir}/bin || :
-    ${csudo} cp -r ${script_dir}/taosd-dump-cfg.gdb   ${install_main_dir}/bin || :
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}rm -f ${bin_link_dir}/perfMonitor || :
+    ${csudo}rm -f ${bin_link_dir}/set_core || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
+    ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || :
 
-    if [ "$osType" != "Darwin" ]; then
-        ${csudo} cp -r ${script_dir}/remove.sh     ${install_main_dir}/bin || :
-        ${csudo} cp -r ${script_dir}/set_core.sh   ${install_main_dir}/bin || :
-        ${csudo} cp -r ${script_dir}/startPre.sh   ${install_main_dir}/bin || :
-    else
-        ${csudo} cp -r ${script_dir}/remove_client.sh   ${install_main_dir}/bin || :
-    fi
-    ${csudo} chmod 0555 ${install_main_dir}/bin/* || :
+    ${csudo}cp -r ${binary_dir}/build/bin/${clientName} ${install_main_dir}/bin || :
+    [ -f ${binary_dir}/build/bin/taosBenchmark ] && ${csudo}cp -r ${binary_dir}/build/bin/taosBenchmark ${install_main_dir}/bin || :
+    [ -f ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -sf ${install_main_dir}/bin/taosBenchmark ${install_main_dir}/bin/taosdemo || :
+    [ -f ${binary_dir}/build/bin/taosdump ] && ${csudo}cp -r ${binary_dir}/build/bin/taosdump ${install_main_dir}/bin || :
+    [ -f ${binary_dir}/build/bin/taosadapter ] && ${csudo}cp -r ${binary_dir}/build/bin/taosadapter ${install_main_dir}/bin || :
+    ${csudo}cp -r ${binary_dir}/build/bin/${serverName} ${install_main_dir}/bin || :
+    ${csudo}cp -r ${binary_dir}/build/bin/tarbitrator ${install_main_dir}/bin || :
 
+    ${csudo}cp -r ${script_dir}/taosd-dump-cfg.gdb ${install_main_dir}/bin || :
+    ${csudo}cp -r ${script_dir}/remove.sh ${install_main_dir}/bin || :
+    ${csudo}cp -r ${script_dir}/set_core.sh ${install_main_dir}/bin || :
+    ${csudo}cp -r ${script_dir}/run_taosd_and_taosadapter.sh ${install_main_dir}/bin || :
+    ${csudo}cp -r ${script_dir}/startPre.sh ${install_main_dir}/bin || :
+
+    ${csudo}chmod 0555 ${install_main_dir}/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/${clientName} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName} || :
+    [ -x ${install_main_dir}/bin/${serverName} ] && ${csudo}ln -s ${install_main_dir}/bin/${serverName} ${bin_link_dir}/${serverName} || :
+    [ -x ${install_main_dir}/bin/taosadapter ] && ${csudo}ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter || :
+    [ -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/perfMonitor ] && ${csudo}ln -s ${install_main_dir}/bin/perfMonitor ${bin_link_dir}/perfMonitor || :
+    [ -x ${install_main_dir}/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+    [ -x ${install_main_dir}/run_taosd_and_taosadapter.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
+    [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :
+  else
 
-    if [ "$osType" != "Darwin" ]; then
-        [ -x ${install_main_dir}/bin/perfMonitor ]  && ${csudo} ln -s ${install_main_dir}/bin/perfMonitor ${bin_link_dir}/perfMonitor || :
-        [ -x ${install_main_dir}/set_core.sh ]  && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
-    fi
-    
-    if [ "$osType" != "Darwin" ]; then
-       [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos  || :
-    fi
+    ${csudo}cp -r ${binary_dir}/build/bin/* ${install_main_dir}/bin || ${csudo}cp -r ${binary_dir}/build/bin/* ${install_main_2_dir}/bin || :
+    ${csudo}cp -r ${script_dir}/taosd-dump-cfg.gdb ${install_main_dir}/bin || ${csudo}cp -r ${script_dir}/taosd-dump-cfg.gdb ${install_main_2_dir} || :
+    ${csudo}cp -r ${script_dir}/remove_client.sh ${install_main_dir}/bin || ${csudo}cp -r ${script_dir}/remove_client.sh ${install_main_2_dir}/bin || :
+    ${csudo}chmod 0555 ${install_main_dir}/bin/* || ${csudo}chmod 0555 ${install_main_2_dir}/bin/*
+    #Make link
+    [ -x ${install_main_dir}/bin/${clientName} ] || [ -x ${install_main_2_dir}/bin/${clientName} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName} || ${csudo}ln -s ${install_main_2_dir}/bin/${clientName} || :
+    [ -x ${install_main_dir}/bin/${serverName} ] || [ -x ${install_main_2_dir}/bin/${serverName} ] && ${csudo}ln -s ${install_main_dir}/bin/${serverName} ${bin_link_dir}/${serverName} || ${csudo}ln -s ${install_main_2_dir}/bin/${serverName} || :
+    [ -x ${install_main_dir}/bin/taosadapter ] || [ -x ${install_main_2_dir}/bin/taosadapter ] && ${csudo}ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter || ${csudo}ln -s ${install_main_2_dir}/bin/taosadapter || :
+    [ -x ${install_main_dir}/bin/taosdump ] || [ -x ${install_main_2_dir}/bin/taosdump ] && ${csudo}ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || ln -s ${install_main_2_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
+    [ -x ${install_main_dir}/bin/taosdemo ] || [ -x ${install_main_2_dir}/bin/taosdemo ] && ${csudo}ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || ln -s ${install_main_2_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
+  fi
 }
 
 function install_jemalloc() {
-    if [ "$osType" != "Darwin" ]; then
-        /usr/bin/install -c -d /usr/local/bin
+  if [ "$osType" != "Darwin" ]; then
+    /usr/bin/install -c -d /usr/local/bin
 
-        if [ -f ${binary_dir}/build/bin/jemalloc-config ]; then
-            /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc-config /usr/local/bin
-        fi
-        if [ -f ${binary_dir}/build/bin/jemalloc.sh ]; then
-            /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc.sh /usr/local/bin
-        fi
-        if [ -f ${binary_dir}/build/bin/jeprof ]; then
-            /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jeprof /usr/local/bin
-        fi
-        if [ -f ${binary_dir}/build/include/jemalloc/jemalloc.h ]; then
-            /usr/bin/install -c -d /usr/local/include/jemalloc
-            /usr/bin/install -c -m 644 ${binary_dir}/build/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
-        fi
-        if [ -f ${binary_dir}/build/lib/libjemalloc.so.2 ]; then
-            /usr/bin/install -c -d /usr/local/lib
-            /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.so.2 /usr/local/lib
-            ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
-            /usr/bin/install -c -d /usr/local/lib
-            if [ -f ${binary_dir}/build/lib/libjemalloc.a ]; then
-                /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.a /usr/local/lib
-            fi
-            if [ -f ${binary_dir}/build/lib/libjemalloc_pic.a ]; then
-                /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc_pic.a /usr/local/lib
-            fi
-            if [ -f ${binary_dir}/build/lib/pkgconfig/jemalloc.pc ]; then
-                /usr/bin/install -c -d /usr/local/lib/pkgconfig
-                /usr/bin/install -c -m 644 ${binary_dir}/build/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
-            fi
-        fi
-        if [ -f ${binary_dir}/build/share/doc/jemalloc/jemalloc.html ]; then
-            /usr/bin/install -c -d /usr/local/share/doc/jemalloc
-            /usr/bin/install -c -m 644 ${binary_dir}/build/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
-        fi
-        if [ -f ${binary_dir}/build/share/man/man3/jemalloc.3 ]; then
-            /usr/bin/install -c -d /usr/local/share/man/man3
-            /usr/bin/install -c -m 644 ${binary_dir}/build/share/man/man3/jemalloc.3 /usr/local/share/man/man3
-        fi
-
-        if [ -d /etc/ld.so.conf.d ]; then
-            echo "/usr/local/lib" | ${csudo} tee /etc/ld.so.conf.d/jemalloc.conf
-            ${csudo} ldconfig
-        else
-            echo "/etc/ld.so.conf.d not found!"
-        fi
+    if [ -f "${binary_dir}/build/bin/jemalloc-config" ]; then
+      ${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc-config /usr/local/bin
     fi
+    if [ -f "${binary_dir}/build/bin/jemalloc.sh" ]; then
+      ${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc.sh /usr/local/bin
+    fi
+    if [ -f "${binary_dir}/build/bin/jeprof" ]; then
+      ${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/bin/jeprof /usr/local/bin
+    fi
+    if [ -f "${binary_dir}/build/include/jemalloc/jemalloc.h" ]; then
+      ${csudo}/usr/bin/install -c -d /usr/local/include/jemalloc
+      ${csudo}/usr/bin/install -c -m 644 ${binary_dir}/build/include/jemalloc/jemalloc.h \
+        /usr/local/include/jemalloc
+    fi
+    if [ -f "${binary_dir}/build/lib/libjemalloc.so.2" ]; then
+      ${csudo}/usr/bin/install -c -d /usr/local/lib
+      ${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.so.2 /usr/local/lib
+      ${csudo}ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
+      ${csudo}/usr/bin/install -c -d /usr/local/lib
+      [ -f ${binary_dir}/build/lib/libjemalloc.a ] &&
+        ${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.a /usr/local/lib
+      [ -f ${binary_dir}/build/lib/libjemalloc_pic.a ] &&
+        ${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc_pic.a /usr/local/lib
+      if [ -f "${binary_dir}/build/lib/pkgconfig/jemalloc.pc" ]; then
+        ${csudo}/usr/bin/install -c -d /usr/local/lib/pkgconfig
+        ${csudo}/usr/bin/install -c -m 644 ${binary_dir}/build/lib/pkgconfig/jemalloc.pc \
+          /usr/local/lib/pkgconfig
+      fi
+      if [ -d /etc/ld.so.conf.d ]; then
+        echo "/usr/local/lib" | ${csudo}tee /etc/ld.so.conf.d/jemalloc.conf >/dev/null || echo -e "failed to write /etc/ld.so.conf.d/jemalloc.conf"
+        ${csudo}ldconfig
+      else
+        echo "/etc/ld.so.conf.d not found!"
+      fi
+    fi
+    if [ -f "${binary_dir}/build/share/doc/jemalloc/jemalloc.html" ]; then
+      ${csudo}/usr/bin/install -c -d /usr/local/share/doc/jemalloc
+      ${csudo}/usr/bin/install -c -m 644 ${binary_dir}/build/share/doc/jemalloc/jemalloc.html \
+        /usr/local/share/doc/jemalloc
+    fi
+    if [ -f "${binary_dir}/build/share/man/man3/jemalloc.3" ]; then
+      ${csudo}/usr/bin/install -c -d /usr/local/share/man/man3
+      ${csudo}/usr/bin/install -c -m 644 ${binary_dir}/build/share/man/man3/jemalloc.3 \
+        /usr/local/share/man/man3
+    fi
+  fi
+}
+
+function install_avro() {
+  if [ "$osType" != "Darwin" ]; then
+    if [ -f "${binary_dir}/build/$1/libavro.so.23.0.0" ] && [ -d /usr/local/$1 ]; then
+      ${csudo}/usr/bin/install -c -d /usr/local/$1
+      ${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/$1/libavro.so.23.0.0 /usr/local/$1
+      ${csudo}ln -sf libavro.so.23.0.0 /usr/local/$1/libavro.so.23
+      ${csudo}ln -sf libavro.so.23 /usr/local/$1/libavro.so
+      ${csudo}/usr/bin/install -c -d /usr/local/$1
+      [ -f ${binary_dir}/build/$1/libavro.a ] &&
+        ${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/$1/libavro.a /usr/local/$1
+
+      if [ -d /etc/ld.so.conf.d ]; then
+        echo "/usr/local/$1" | ${csudo}tee /etc/ld.so.conf.d/libavro.conf >/dev/null || echo -e "failed to write /etc/ld.so.conf.d/libavro.conf"
+        ${csudo}ldconfig
+      else
+        echo "/etc/ld.so.conf.d not found!"
+      fi
+    fi
+  fi
 }
 
 function install_lib() {
-    # Remove links
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*     || :
-    if [ "$osType" != "Darwin" ]; then
-      ${csudo} rm -f ${lib64_link_dir}/libtaos.*   || :
+  # Remove links
+  ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
+  fi
+
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}cp ${binary_dir}/build/lib/libtaos.so.${verNumber} \
+      ${install_main_dir}/driver &&
+      ${csudo}chmod 777 ${install_main_dir}/driver/*
+
+    ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
+    ${csudo}ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+
+    if [ -d "${lib64_link_dir}" ]; then
+      ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1
+      ${csudo}ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so
     fi
+  else
+    ${csudo}cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib \
+      ${install_main_dir}/driver ||
+      ${csudo}cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib \
+        ${install_main_2_dir}/driver &&
+      ${csudo}chmod 777 ${install_main_dir}/driver/* ||
+      ${csudo}chmod 777 ${install_main_2_dir}/driver/*
 
-    if [ "$osType" != "Darwin" ]; then
-        ${csudo} cp ${binary_dir}/build/lib/libtaos.so ${install_main_dir}/driver/libtaos.so.${verNumber} && ${csudo} chmod 777 ${install_main_dir}/driver/*
-        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
-        ${csudo} ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+    ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* \
+      ${install_main_dir}/driver/libtaos.1.dylib ||
+      ${csudo}ln -sf ${install_main_2_dir}/driver/libtaos.* \
+        ${install_main_2_dir}/driver/libtaos.1.dylib || :
 
-        if [ -d "${lib64_link_dir}" ]; then
-          ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1
-          ${csudo} ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so
-        fi
-    else
-        ${csudo} cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+    ${csudo}ln -sf ${install_main_dir}/driver/libtaos.1.dylib \
+      ${install_main_dir}/driver/libtaos.dylib ||
+      ${csudo}ln -sf ${install_main_2_dir}/driver/libtaos.1.dylib \
+        ${install_main_2_dir}/driver/libtaos.dylib || :
 
-        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
-        ${csudo} ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
-    fi
-    
-    install_jemalloc
+    ${csudo}ln -sf ${install_main_dir}/driver/libtaos.${verNumber}.dylib \
+      ${lib_link_dir}/libtaos.1.dylib ||
+      ${csudo}ln -sf ${install_main_2_dir}/driver/libtaos.${verNumber}.dylib \
+        ${lib_link_dir}/libtaos.1.dylib || :
 
-    if [ "$osType" != "Darwin" ]; then
-        ${csudo} ldconfig
-    fi
+    ${csudo}ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib || :
+  fi
+
+  install_jemalloc
+  install_avro lib
+  install_avro lib64
+
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}ldconfig
+  fi
 }
 
 function install_header() {
 
-    if [ "$osType" != "Darwin" ]; then
-        ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
-    fi
-    ${csudo} cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/util/taoserror.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    if [ "$osType" != "Darwin" ]; then
-        ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-        ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
-    fi
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h || :
+    ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h \
+      ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+  else
+    ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h \
+      ${install_main_dir}/include ||
+      ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h \
+        ${install_main_2_dir}/include &&
+      ${csudo}chmod 644 ${install_main_dir}/include/* ||
+      ${csudo}chmod 644 ${install_main_2_dir}/include/*
+  fi
 }
 
 function install_config() {
-    #${csudo} rm -f ${install_main_dir}/cfg/taos.cfg     || :
+  if [ ! -f ${cfg_install_dir}/${configFile} ]; then
+    ${csudo}mkdir -p ${cfg_install_dir}
+    [ -f ${script_dir}/../cfg/${configFile} ] &&
+      ${csudo}cp ${script_dir}/../cfg/${configFile} ${cfg_install_dir} || :
+    ${csudo}chmod 644 ${cfg_install_dir}/${configFile}
+    ${csudo}cp -f ${script_dir}/../cfg/${configFile} \
+      ${cfg_install_dir}/${configFile}.${verNumber} || :
+    ${csudo}ln -s ${cfg_install_dir}/${configFile} \
+      ${install_main_dir}/cfg/${configFile}
+  else
+    ${csudo}cp -f ${script_dir}/../cfg/${configFile} \
+      ${cfg_install_dir}/${configFile}.${verNumber} || :
+  fi
+}
 
-    if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
-        ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${script_dir}/../cfg/taos.cfg ] &&
-        ${csudo} cp ${script_dir}/../cfg/taos.cfg ${cfg_install_dir} || :
-        ${csudo} chmod 644 ${cfg_install_dir}/*
-    fi
-
-    ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org || :
-    
-    if [ "$osType" != "Darwin" ]; then ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+function install_taosadapter_config() {
+  if [ ! -f "${cfg_install_dir}/taosadapter.toml" ]; then
+    ${csudo}mkdir -p ${cfg_install_dir} || :
+    [ -f ${binary_dir}/test/cfg/taosadapter.toml ] &&
+      ${csudo}cp ${binary_dir}/test/cfg/taosadapter.toml ${cfg_install_dir} || :
+    [ -f ${cfg_install_dir}/taosadapter.toml ] &&
+      ${csudo}chmod 644 ${cfg_install_dir}/taosadapter.toml || :
+    [ -f ${binary_dir}/test/cfg/taosadapter.toml ] &&
+      ${csudo}cp -f ${binary_dir}/test/cfg/taosadapter.toml \
+        ${cfg_install_dir}/taosadapter.toml.${verNumber} || :
+    [ -f ${cfg_install_dir}/taosadapter.toml ] &&
+      ${csudo}ln -s ${cfg_install_dir}/taosadapter.toml \
+        ${install_main_dir}/cfg/taosadapter.toml || :
+  else
+    if [ -f "${binary_dir}/test/cfg/taosadapter.toml" ]; then
+      ${csudo}cp -f ${binary_dir}/test/cfg/taosadapter.toml \
+        ${cfg_install_dir}/taosadapter.toml.${verNumber} || :
     fi
+  fi
 }
 
 function install_log() {
-    ${csudo} rm -rf ${log_dir}  || :
-    ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
-    ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+  ${csudo}rm -rf ${log_dir} || :
+  ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}ln -s ${log_dir} ${install_main_dir}/log
+  else
+    ${csudo}ln -s ${log_dir} ${install_main_dir}/log || ${csudo}ln -s ${log_dir} ${install_main_2_dir}/log
+  fi
 }
 
 function install_data() {
-    ${csudo} mkdir -p ${data_dir}
-    ${csudo} ln -s ${data_dir} ${install_main_dir}/data
+  ${csudo}mkdir -p ${data_dir}
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}ln -s ${data_dir} ${install_main_dir}/data
+  else
+    ${csudo}ln -s ${data_dir} ${install_main_dir}/data || ${csudo}ln -s ${data_dir} ${install_main_2_dir}/data
+  fi
 }
 
 function install_connector() {
-    if [ -d "${source_dir}/src/connector/grafanaplugin/dist" ]; then
-        ${csudo} cp -rf ${source_dir}/src/connector/grafanaplugin/dist ${install_main_dir}/connector/grafanaplugin
-    else
-        echo "WARNING: grafanaplugin bundled dir not found, please check if want to use it!"
-    fi
-    if find ${source_dir}/src/connector/go -mindepth 1 -maxdepth 1 | read; then
-        ${csudo} cp -r ${source_dir}/src/connector/go ${install_main_dir}/connector
-    else
-        echo "WARNING: go connector not found, please check if want to use it!"
-    fi
-    ${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector || :
-    ${csudo} cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &> /dev/null && ${csudo} chmod 777 ${install_main_dir}/connector/*.jar || echo &> /dev/null
+  if find ${source_dir}/src/connector/go -mindepth 1 -maxdepth 1 | read; then
+    ${csudo}cp -r ${source_dir}/src/connector/go ${install_main_dir}/connector || :
+  else
+    echo "WARNING: go connector not found, please check if want to use it!"
+  fi
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector || :
+    ${csudo}cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &>/dev/null && ${csudo}chmod 777 ${install_main_dir}/connector/*.jar || echo &>/dev/null || :
+  else
+    ${csudo}cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector || ${csudo}cp -rf ${source_dir}/src/connector/python ${install_main_2_dir}/connector || :
+    ${csudo}cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &>/dev/null && ${csudo}chmod 777 ${install_main_dir}/connector/*.jar || echo &>/dev/null || :
+    ${csudo}cp ${binary_dir}/build/lib/*.jar ${install_main_2_dir}/connector &>/dev/null && ${csudo}chmod 777 ${install_main_2_dir}/connector/*.jar || echo &>/dev/null || :
+  fi
 }
 
 function install_examples() {
-    ${csudo} cp -rf ${source_dir}/tests/examples/* ${install_main_dir}/examples || :
+  if [ "$osType" != "Darwin" ]; then
+    ${csudo}cp -rf ${source_dir}/examples/* ${install_main_dir}/examples || :
+  else
+    ${csudo}cp -rf ${source_dir}/examples/* ${install_main_dir}/examples || ${csudo}cp -rf ${source_dir}/examples/* ${install_main_2_dir}/examples || :
+  fi
 }
 
 function clean_service_on_sysvinit() {
-    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
-    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
+  if pidof ${serverName} &>/dev/null; then
+    ${csudo}service ${serverName} stop || :
+  fi
 
-    if pidof taosd &> /dev/null; then
-        ${csudo} service taosd stop || :
-    fi
+  if ((${initd_mod} == 1)); then
+    ${csudo}chkconfig --del ${serverName} || :
+  elif ((${initd_mod} == 2)); then
+    ${csudo}insserv -r ${serverName} || :
+  elif ((${initd_mod} == 3)); then
+    ${csudo}update-rc.d -f ${serverName} remove || :
+  fi
 
-    if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --del taosd || :
-    elif ((${initd_mod}==2)); then
-        ${csudo} insserv -r taosd || :
-    elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d -f taosd remove || :
-    fi
+  ${csudo}rm -f ${service_config_dir}/${serverName} || :
 
-    ${csudo} rm -f ${service_config_dir}/taosd || :
-
-    if $(which init &> /dev/null); then
-        ${csudo} init q || :
-    fi
+  if $(which init &>/dev/null); then
+    ${csudo}init q || :
+  fi
 }
 
 function install_service_on_sysvinit() {
-    clean_service_on_sysvinit
+  clean_service_on_sysvinit
 
-    sleep 1
+  sleep 1
 
-    # Install taosd service
-    if ((${os_type}==1)); then
-    ${csudo} cp -f ${script_dir}/../deb/taosd ${install_main_dir}/init.d || :
-    ${csudo} cp    ${script_dir}/../deb/taosd ${service_config_dir} && ${csudo} chmod a+x ${service_config_dir}/taosd || :
-    elif ((${os_type}==2)); then
-    ${csudo} cp -f ${script_dir}/../rpm/taosd ${install_main_dir}/init.d || :
-    ${csudo} cp    ${script_dir}/../rpm/taosd ${service_config_dir} && ${csudo} chmod a+x ${service_config_dir}/taosd || :
-    fi
+  if ((${os_type} == 1)); then
+    #    ${csudo}cp -f ${script_dir}/../deb/${serverName} ${install_main_dir}/init.d
+    ${csudo}cp ${script_dir}/../deb/${serverName} ${service_config_dir} && ${csudo}chmod a+x ${service_config_dir}/${serverName} || :
+  elif ((${os_type} == 2)); then
+    #    ${csudo}cp -f ${script_dir}/../rpm/${serverName} ${install_main_dir}/init.d
+    ${csudo}cp ${script_dir}/../rpm/${serverName} ${service_config_dir} && ${csudo}chmod a+x ${service_config_dir}/${serverName} || :
+  fi
 
-    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
-    #${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
-
-    if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --add taosd || :
-        ${csudo} chkconfig --level 2345 taosd on || :
-    elif ((${initd_mod}==2)); then
-        ${csudo} insserv taosd || :
-        ${csudo} insserv -d taosd || :
-    elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d taosd defaults || :
-    fi
+  if ((${initd_mod} == 1)); then
+    ${csudo}chkconfig --add ${serverName} || :
+    ${csudo}chkconfig --level 2345 ${serverName} on || :
+  elif ((${initd_mod} == 2)); then
+    ${csudo}insserv ${serverName} || :
+    ${csudo}insserv -d ${serverName} || :
+  elif ((${initd_mod} == 3)); then
+    ${csudo}update-rc.d ${serverName} defaults || :
+  fi
 }
 
 function clean_service_on_systemd() {
-    taosd_service_config="${service_config_dir}/taosd.service"
+  taosd_service_config="${service_config_dir}/${serverName}.service"
 
-    if systemctl is-active --quiet taosd; then
-        echo "TDengine is running, stopping it..."
-        ${csudo} systemctl stop taosd &> /dev/null || echo &> /dev/null
-    fi
-    ${csudo} systemctl disable taosd &> /dev/null || echo &> /dev/null
+  if systemctl is-active --quiet ${serverName}; then
+    echo "${productName} is running, stopping it..."
+    ${csudo}systemctl stop ${serverName} &>/dev/null || echo &>/dev/null
+  fi
+  ${csudo}systemctl disable ${serverName} &>/dev/null || echo &>/dev/null
 
-    ${csudo} rm -f ${taosd_service_config}
+  ${csudo}rm -f ${taosd_service_config}
 }
 
-# taos:2345:respawn:/etc/init.d/taosd start
-
 function install_service_on_systemd() {
-    clean_service_on_systemd
+  clean_service_on_systemd
 
-    taosd_service_config="${service_config_dir}/taosd.service"
+  taosd_service_config="${service_config_dir}/${serverName}.service"
 
-    ${csudo} bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
-    ${csudo} bash -c "echo '[Service]'                          >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'ExecStartPre=/usr/local/taos/bin/startPre.sh'           >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                  >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                     >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                  >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'             >> ${taosd_service_config}"
-    ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
-    ${csudo} bash -c "echo '[Install]'                          >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
-    ${csudo} systemctl enable taosd
+  ${csudo}bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'Description=${productName} server service' >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
+  ${csudo}bash -c "echo '[Service]'                          >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'ExecStart=/usr/bin/${serverName}'           >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'ExecStartPre=${installDir}/bin/startPre.sh'           >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'TimeoutStartSec=0'                  >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'StandardOutput=null'                >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'Restart=always'                     >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'StartLimitBurst=3'                  >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'StartLimitInterval=60s'             >> ${taosd_service_config}"
+  ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
+  ${csudo}bash -c "echo '[Install]'                          >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
+  ${csudo}systemctl enable ${serverName}
+}
+
+function install_taosadapter_service() {
+  if ((${service_mod} == 0)); then
+    [ -f ${binary_dir}/test/cfg/taosadapter.service ] &&
+      ${csudo}cp ${binary_dir}/test/cfg/taosadapter.service \
+        ${service_config_dir}/ || :
+    ${csudo}systemctl daemon-reload
+  fi
 }
 
 function install_service() {
-    if ((${service_mod}==0)); then
-        install_service_on_systemd
-    elif ((${service_mod}==1)); then
-        install_service_on_sysvinit
-    else
-        # must manual stop taosd
-        kill_taosd
-    fi
+  if ((${service_mod} == 0)); then
+    install_service_on_systemd
+  elif ((${service_mod} == 1)); then
+    install_service_on_sysvinit
+  else
+    kill_taosd
+  fi
 }
 
 function update_TDengine() {
-    echo -e "${GREEN}Start to update TDengine...${NC}"
-    # Stop the service if running
+  echo -e "${GREEN}Start to update ${productName}...${NC}"
+  # Stop the service if running
 
-    if [ "$osType" != "Darwin" ]; then
-      if pidof taosd &> /dev/null; then
-        if ((${service_mod}==0)); then
-            ${csudo} systemctl stop taosd || :
-        elif ((${service_mod}==1)); then
-            ${csudo} service taosd stop || :
-        else
-            kill_taosd
-        fi
-        sleep 1
-      fi
-    fi
-
-    install_main_path
-
-    install_log
-    install_header
-    install_lib
-    install_connector
-    install_examples
-    install_bin
-
-    if [ "$osType" != "Darwin" ]; then
-        install_service
-    fi
-
-    install_config
-
-    if [ "$osType" != "Darwin" ]; then
-        echo
-        echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
-        echo
-
-        echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
-        if ((${service_mod}==0)); then
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} systemctl start taosd${NC}"
-        elif ((${service_mod}==1)); then
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} service taosd start${NC}"
-        else
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ./taosd${NC}"
-        fi
-
-        echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
-        echo
-        echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
+  if pidof ${serverName} &>/dev/null; then
+    if ((${service_mod} == 0)); then
+      ${csudo}systemctl stop ${serverName} || :
+    elif ((${service_mod} == 1)); then
+      ${csudo}service ${serverName} stop || :
     else
-        echo
-        echo -e "\033[44;32;1mTDengine Client is updated successfully!${NC}"
-        echo
-
-        echo -e "${GREEN_DARK}To access TDengine Client   ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
-        echo
-        echo -e "\033[44;32;1mTDengine Client is updated successfully!${NC}"
+      kill_taosadapter
+      kill_taosd
     fi
+    sleep 1
+  fi
+
+  install_main_path
+
+  install_log
+  install_header
+  install_lib
+  #  install_connector
+  install_examples
+  install_bin
+
+  install_service
+  install_taosadapter_service
+
+  install_config
+  install_taosadapter_config
+
+  echo
+  echo -e "\033[44;32;1m${productName} is updated successfully!${NC}"
+  echo
+
+  echo -e "${GREEN_DARK}To configure ${productName} ${NC}: edit ${configDir}/${configFile}"
+  echo -e "${GREEN_DARK}To configure Taos Adapter (if has) ${NC}: edit ${configDir}/taosadapter.toml"
+  if ((${service_mod} == 0)); then
+    echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${csudo}systemctl start ${serverName}${NC}"
+  elif ((${service_mod} == 1)); then
+    echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${csudo}service ${serverName} start${NC}"
+  else
+    echo -e "${GREEN_DARK}To start Taos Adapter (if has)${NC}: taosadapter &${NC}"
+    echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${serverName}${NC}"
+  fi
+
+  echo -e "${GREEN_DARK}To access ${productName}    ${NC}: use ${GREEN_UNDERLINE}${clientName}${NC} in shell${NC}"
+  echo
+  echo -e "\033[44;32;1m${productName} is updated successfully!${NC}"
 }
 
 function install_TDengine() {
-    # Start to install
-    if [ "$osType" != "Darwin" ]; then
-        echo -e "${GREEN}Start to install TDEngine...${NC}"
-    else
-        echo -e "${GREEN}Start to install TDEngine Client ...${NC}"
-    fi
-    
-    install_main_path
+  # Start to install
+  echo -e "${GREEN}Start to install ${productName}...${NC}"
 
-    install_data
-    install_log
-    install_header
-    install_lib
-    install_connector
-    install_examples
-    install_bin
-    
-    if [ "$osType" != "Darwin" ]; then
-        install_service
-    fi
-    
-    install_config
+  install_main_path
 
-    if [ "$osType" != "Darwin" ]; then
-        # Ask if to start the service
-        echo
-        echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
-        echo
-        echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
-        if ((${service_mod}==0)); then
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} systemctl start taosd${NC}"
-        elif ((${service_mod}==1)); then
-                echo -e "${GREEN_DARK}To start TDengine    ${NC}: ${csudo} service taosd start${NC}"
-        else
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ./taosd${NC}"
-        fi
+  install_data
+  install_log
+  install_header
+  install_lib
+  #  install_connector
+  install_examples
+  install_bin
 
-        echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
-        echo
-        echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
-    else
-        echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
-        echo
-        echo -e "\033[44;32;1mTDengine Client is installed successfully!${NC}"
-    fi
+  install_service
+  install_taosadapter_service
+
+  install_config
+  install_taosadapter_config
+
+  # Ask if to start the service
+  echo
+  echo -e "\033[44;32;1m${productName} is installed successfully!${NC}"
+  echo
+  echo -e "${GREEN_DARK}To configure ${productName} ${NC}: edit ${configDir}/${configFile}"
+  echo -e "${GREEN_DARK}To configure taosadapter (if has) ${NC}: edit ${configDir}/taosadapter.toml"
+  if ((${service_mod} == 0)); then
+    echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${csudo}systemctl start ${serverName}${NC}"
+  elif ((${service_mod} == 1)); then
+    echo -e "${GREEN_DARK}To start ${productName}    ${NC}: ${csudo}service ${serverName} start${NC}"
+  else
+    echo -e "${GREEN_DARK}To start Taos Adapter (if has)${NC}: taosadapter &${NC}"
+    echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ./${serverName}${NC}"
+  fi
+
+  echo -e "${GREEN_DARK}To access ${productName}    ${NC}: use ${GREEN_UNDERLINE}${clientName}${NC} in shell${NC}"
+  echo
+  echo -e "\033[44;32;1m${productName} is installed successfully!${NC}"
 }
 
 ## ==============================Main program starts from here============================
 echo source directory: $1
 echo binary directory: $2
-echo $bin_dir
-if [ -x ${bin_dir}/taos ]; then
+if [ "$osType" != "Darwin" ]; then
+  if [ -x ${bin_dir}/${clientName} ]; then
     update_TDengine
-else
+  else
     install_TDengine
+  fi
+else
+  if [ -x ${bin_dir}/${clientName} ] || [ -x ${bin_2_dir}/${clientName} ]; then
+    update_TDengine
+  else
+    install_TDengine
+  fi
 fi
diff --git a/source/client/CMakeLists.txt b/source/client/CMakeLists.txt
index bbceaa8fed..3ff671d536 100644
--- a/source/client/CMakeLists.txt
+++ b/source/client/CMakeLists.txt
@@ -1,5 +1,5 @@
 aux_source_directory(src CLIENT_SRC)
-add_library(taos ${CLIENT_SRC})
+add_library(taos SHARED ${CLIENT_SRC})
 target_include_directories(
     taos
     PUBLIC "${TD_SOURCE_DIR}/include/client"
@@ -11,6 +11,25 @@ target_link_libraries(
     PRIVATE os util common transport nodes parser command planner catalog scheduler function qcom
 )
 
+set_target_properties(
+    taos
+    PROPERTIES
+    VERSION ${TD_VER_NUMBER}
+    SOVERSION ${TD_VER_NUMBER}
+)
+
+add_library(taos_static STATIC ${CLIENT_SRC})
+target_include_directories(
+    taos_static
+    PUBLIC "${TD_SOURCE_DIR}/include/client"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+)
+target_link_libraries(
+    taos_static
+    INTERFACE api
+    PRIVATE os util common transport nodes parser command planner catalog scheduler function qcom
+)
+
 if(${BUILD_TEST})
     ADD_SUBDIRECTORY(test)
 endif(${BUILD_TEST})
\ No newline at end of file
diff --git a/source/client/test/CMakeLists.txt b/source/client/test/CMakeLists.txt
index 73e11caa95..9df6b260f6 100644
--- a/source/client/test/CMakeLists.txt
+++ b/source/client/test/CMakeLists.txt
@@ -8,13 +8,13 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 ADD_EXECUTABLE(clientTest clientTests.cpp)
 TARGET_LINK_LIBRARIES(
         clientTest
-        PUBLIC os util common transport parser catalog scheduler function gtest taos qcom
+        PUBLIC os util common transport parser catalog scheduler function gtest taos_static qcom
 )
 
 ADD_EXECUTABLE(tmqTest tmqTest.cpp)
 TARGET_LINK_LIBRARIES(
         tmqTest
-        PUBLIC os util common transport parser catalog scheduler function gtest taos qcom
+        PUBLIC os util common transport parser catalog scheduler function gtest taos_static qcom
 )
 
 TARGET_INCLUDE_DIRECTORIES(
diff --git a/source/dnode/mgmt/interface/CMakeLists.txt b/source/dnode/mgmt/interface/CMakeLists.txt
index 69cb6e040f..a99fc2703d 100644
--- a/source/dnode/mgmt/interface/CMakeLists.txt
+++ b/source/dnode/mgmt/interface/CMakeLists.txt
@@ -6,5 +6,5 @@ target_include_directories(
     PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 target_link_libraries(
-    dnode_interface cjson mnode vnode qnode snode bnode wal sync taos tfs monitor
+    dnode_interface cjson mnode vnode qnode snode bnode wal sync taos_static tfs monitor
 )
\ No newline at end of file
diff --git a/source/libs/catalog/test/CMakeLists.txt b/source/libs/catalog/test/CMakeLists.txt
index 3ffb420b4b..d74eef7855 100644
--- a/source/libs/catalog/test/CMakeLists.txt
+++ b/source/libs/catalog/test/CMakeLists.txt
@@ -8,7 +8,7 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 ADD_EXECUTABLE(catalogTest ${SOURCE_LIST})
 TARGET_LINK_LIBRARIES(
         catalogTest
-        PUBLIC os util common catalog transport gtest qcom taos
+        PUBLIC os util common catalog transport gtest qcom taos_static
 )
 
 TARGET_INCLUDE_DIRECTORIES(
diff --git a/source/libs/executor/test/CMakeLists.txt b/source/libs/executor/test/CMakeLists.txt
index b07ff89d90..b1f379585b 100644
--- a/source/libs/executor/test/CMakeLists.txt
+++ b/source/libs/executor/test/CMakeLists.txt
@@ -8,7 +8,7 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 ADD_EXECUTABLE(executorTest ${SOURCE_LIST})
 TARGET_LINK_LIBRARIES(
         executorTest
-        PRIVATE os util common transport gtest taos qcom executor function planner scalar nodes
+        PRIVATE os util common transport gtest taos_static qcom executor function planner scalar nodes
 )
 
 TARGET_INCLUDE_DIRECTORIES(
diff --git a/source/libs/scheduler/test/CMakeLists.txt b/source/libs/scheduler/test/CMakeLists.txt
index 4018f73ee2..0b0aafebb9 100644
--- a/source/libs/scheduler/test/CMakeLists.txt
+++ b/source/libs/scheduler/test/CMakeLists.txt
@@ -8,7 +8,7 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 ADD_EXECUTABLE(schedulerTest ${SOURCE_LIST})
 TARGET_LINK_LIBRARIES(
         schedulerTest
-        PUBLIC os util common catalog transport gtest qcom taos planner scheduler
+        PUBLIC os util common catalog transport gtest qcom taos_static planner scheduler
 )
 
 TARGET_INCLUDE_DIRECTORIES(
diff --git a/tests/test/c/CMakeLists.txt b/tests/test/c/CMakeLists.txt
index 804894a69d..41e9382379 100644
--- a/tests/test/c/CMakeLists.txt
+++ b/tests/test/c/CMakeLists.txt
@@ -3,21 +3,21 @@ add_executable(tmq_demo tmqDemo.c)
 add_executable(tmq_sim tmqSim.c)
 target_link_libraries(
     create_table
-    PUBLIC taos
+    PUBLIC taos_static
     PUBLIC util
     PUBLIC common
     PUBLIC os
 )
 target_link_libraries(
     tmq_demo
-    PUBLIC taos
+    PUBLIC taos_static
     PUBLIC util
     PUBLIC common
     PUBLIC os
 )
 target_link_libraries(
     tmq_sim
-    PUBLIC taos
+    PUBLIC taos_static
     PUBLIC util
     PUBLIC common
     PUBLIC os
diff --git a/tests/tsim/CMakeLists.txt b/tests/tsim/CMakeLists.txt
index 81737809d9..c2cf7ac3c5 100644
--- a/tests/tsim/CMakeLists.txt
+++ b/tests/tsim/CMakeLists.txt
@@ -2,7 +2,7 @@ aux_source_directory(src TSIM_SRC)
 add_executable(tsim ${TSIM_SRC})
 target_link_libraries(
     tsim
-    PUBLIC taos
+    PUBLIC taos_static
     PUBLIC util
     PUBLIC common
     PUBLIC os
diff --git a/tools/shell/CMakeLists.txt b/tools/shell/CMakeLists.txt
index 284693795e..3b22b30852 100644
--- a/tools/shell/CMakeLists.txt
+++ b/tools/shell/CMakeLists.txt
@@ -3,7 +3,7 @@ aux_source_directory(src SHELL_SRC)
 add_executable(shell ${SHELL_SRC})
 target_link_libraries(
     shell
-    PUBLIC taos
+    PUBLIC taos_static
     PRIVATE os common transport util
 )
 target_include_directories(