Merge branch '3.0' into test/TD-22830-3.0

31828ae3 · Alex Duan · 3f694e38 · 8eb6cff7 · 31828ae3 · 31828ae3
9 changed file
--- a/cmake/taostools_CMakeLists.txt.in
+++ b/cmake/taostools_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
        GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG d194dc9
+        GIT_TAG 273a3fe
        SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
        BINARY_DIR ""
        #BUILD_IN_SOURCE TRUE

--- a/docs/zh/12-taos-sql/20-keywords.md
+++ b/docs/zh/12-taos-sql/20-keywords.md
@@ -269,7 +269,7 @@ description: TDengine 保留关键字的详细列表
 - SPLIT
 - STABLE
 - STABLES
- STAR
+- START
 - STATE
 - STATE_WINDOW
 - STATEMENT

--- a/packaging/cfg/taosd.service
+++ b/packaging/cfg/taosd.service
 [Unit]
-Description=TDengine server service
+Description=server service
 After=network-online.target
 Wants=network-online.target


--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -4,7 +4,7 @@
 # is required to use systemd to manage services at boot

 set -e
-#set -x
+# set -x

 verMode=edge
 pagMode=full
@@ -34,21 +34,25 @@ benchmarkName="taosBenchmark"
 dumpName="taosdump"
 demoName="taosdemo"
 xname="taosx"
-explorerName="${clientName}-explorer"

 clientName2="taos"
-serverName2="taosd"
+serverName2="${clientName2}d"
+configFile2="${clientName2}.cfg"
 productName2="TDengine"
 emailName2="taosdata.com"
+xname2="${clientName2}x"
+adapterName2="${clientName2}adapter"

+explorerName="${clientName2}-explorer"
 benchmarkName2="${clientName2}Benchmark"
+demoName2="${clientName2}demo"
 dumpName2="${clientName2}dump"
 uninstallScript2="rm${clientName2}"

 historyFile="${clientName2}_history"
 logDir="/var/log/${clientName2}"
 configDir="/etc/${clientName2}"
-installDir="/usr/local/${clientName}"
+installDir="/usr/local/${clientName2}"

 data_dir=${dataDir}
 log_dir=${logDir}
@@ -206,15 +210,15 @@ function install_main_path() {

 function install_bin() {
  # Remove links
-  ${csudo}rm -f ${bin_link_dir}/${clientName} || :
-  ${csudo}rm -f ${bin_link_dir}/${serverName} || :
+  ${csudo}rm -f ${bin_link_dir}/${clientName2} || :
+  ${csudo}rm -f ${bin_link_dir}/${serverName2} || :
  ${csudo}rm -f ${bin_link_dir}/${udfdName} || :
  ${csudo}rm -f ${bin_link_dir}/${adapterName} || :
-  ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || :
-  ${csudo}rm -f ${bin_link_dir}/${demoName} || :
-  ${csudo}rm -f ${bin_link_dir}/${benchmarkName} || :
-  ${csudo}rm -f ${bin_link_dir}/${dumpName} || :
-  ${csudo}rm -f ${bin_link_dir}/${xname} || :
+  ${csudo}rm -f ${bin_link_dir}/${uninstallScript2} || :
+  ${csudo}rm -f ${bin_link_dir}/${demoName2} || :
+  ${csudo}rm -f ${bin_link_dir}/${benchmarkName2} || :
+  ${csudo}rm -f ${bin_link_dir}/${dumpName2} || :
+  ${csudo}rm -f ${bin_link_dir}/${xname2} || :
  ${csudo}rm -f ${bin_link_dir}/${explorerName} || :
  ${csudo}rm -f ${bin_link_dir}/set_core || :
  ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
@@ -222,24 +226,23 @@ function install_bin() {
  ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*

  #Make link
-  [ -x ${install_main_dir}/bin/${clientName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName} || :
-  [ -x ${install_main_dir}/bin/${serverName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${serverName} ${bin_link_dir}/${serverName} || :
+  [ -x ${install_main_dir}/bin/${clientName2} ] && ${csudo}ln -sf ${install_main_dir}/bin/${clientName2} ${bin_link_dir}/${clientName2} || :
+  [ -x ${install_main_dir}/bin/${serverName2} ] && ${csudo}ln -sf ${install_main_dir}/bin/${serverName2} ${bin_link_dir}/${serverName2} || :
  [ -x ${install_main_dir}/bin/${udfdName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${udfdName} ${bin_link_dir}/${udfdName} || :
-  [ -x ${install_main_dir}/bin/${adapterName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${adapterName} ${bin_link_dir}/${adapterName} || :
-  [ -x ${install_main_dir}/bin/${benchmarkName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${benchmarkName} ${bin_link_dir}/${demoName} || :
-  [ -x ${install_main_dir}/bin/${benchmarkName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${benchmarkName} ${bin_link_dir}/${benchmarkName} || :
-  [ -x ${install_main_dir}/bin/${dumpName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${dumpName} ${bin_link_dir}/${dumpName} || :
-  [ -x ${install_main_dir}/bin/${xname} ] && ${csudo}ln -sf ${install_main_dir}/bin/${xname} ${bin_link_dir}/${xname} || :
+  [ -x ${install_main_dir}/bin/${adapterName2} ] && ${csudo}ln -sf ${install_main_dir}/bin/${adapterName2} ${bin_link_dir}/${adapterName2} || :
+  [ -x ${install_main_dir}/bin/${benchmarkName2} ] && ${csudo}ln -sf ${install_main_dir}/bin/${benchmarkName2} ${bin_link_dir}/${demoName2} || :
+  [ -x ${install_main_dir}/bin/${benchmarkName2} ] && ${csudo}ln -sf ${install_main_dir}/bin/${benchmarkName2} ${bin_link_dir}/${benchmarkName2} || :
+  [ -x ${install_main_dir}/bin/${dumpName2} ] && ${csudo}ln -sf ${install_main_dir}/bin/${dumpName2} ${bin_link_dir}/${dumpName2} || :
+  [ -x ${install_main_dir}/bin/${xname2} ] && ${csudo}ln -sf ${install_main_dir}/bin/${xname2} ${bin_link_dir}/${xname2} || :
  [ -x ${install_main_dir}/bin/${explorerName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${explorerName} ${bin_link_dir}/${explorerName} || :
  [ -x ${install_main_dir}/bin/TDinsight.sh ] && ${csudo}ln -sf ${install_main_dir}/bin/TDinsight.sh ${bin_link_dir}/TDinsight.sh || :
-  [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -sf ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :
-  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -sf ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+  if [ "$clientName2" == "${clientName}" ]; then
+    [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :
+  fi
+  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :

  if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
-    [ -x ${install_main_dir}/bin/${clientName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName2} || :
-    [ -x ${install_main_dir}/bin/${benchmarkName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${benchmarkName} ${bin_link_dir}/${benchmarkName2} || :
-    [ -x ${install_main_dir}/bin/${dumpName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${dumpName} ${bin_link_dir}/${dumpName2} || :
-    [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -sf ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript2} || :
+    [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript2} || :
  fi
 }

@@ -399,7 +402,7 @@ function set_hostname() {
    ${csudo}sed -i -r "s/#*\s*(HOSTNAME=\s*).*/\1$newHostname/" /etc/sysconfig/network || :
  fi

-  ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$newHostname/" ${cfg_install_dir}/${configFile}
+  ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$newHostname/" ${cfg_install_dir}/${configFile2}
  serverFqdn=$newHostname

  if [[ -e /etc/hosts ]]; then
@@ -433,7 +436,7 @@ function set_ipAsFqdn() {
    echo -e -n "${GREEN}Unable to get local ip, use 127.0.0.1${NC}"
    localFqdn="127.0.0.1"
    # Write the local FQDN to configuration file
-    ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/${configFile}
+    ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/${configFile2}
    serverFqdn=$localFqdn
    echo
    return
@@ -455,7 +458,7 @@ function set_ipAsFqdn() {
        read -p "Please choose an IP from local IP list:" localFqdn
      else
        # Write the local FQDN to configuration file
-        ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/${configFile}
+        ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/${configFile2}
        serverFqdn=$localFqdn
        break
      fi
@@ -519,15 +522,15 @@ function install_adapter_config() {

 function install_config() {

-  if [ ! -f "${cfg_install_dir}/${configFile}" ]; then
+  if [ ! -f "${cfg_install_dir}/${configFile2}" ]; then
    ${csudo}mkdir -p ${cfg_install_dir}
-    [ -f ${script_dir}/cfg/${configFile} ] && ${csudo}cp ${script_dir}/cfg/${configFile} ${cfg_install_dir}
+    [ -f ${script_dir}/cfg/${configFile2} ] && ${csudo}cp ${script_dir}/cfg/${configFile2} ${cfg_install_dir}
    ${csudo}chmod 644 ${cfg_install_dir}/*
  else
-    ${csudo}cp -f ${script_dir}/cfg/${configFile} ${cfg_install_dir}/${configFile}.new
+    ${csudo}cp -f ${script_dir}/cfg/${configFile2} ${cfg_install_dir}/${configFile2}.new
  fi

-  ${csudo}ln -sf ${cfg_install_dir}/${configFile} ${install_main_dir}/cfg
+  ${csudo}ln -sf ${cfg_install_dir}/${configFile2} ${install_main_dir}/cfg

  [ ! -z $1 ] && return 0 || : # only install client

@@ -548,7 +551,7 @@ function install_config() {
  read firstEp
  while true; do
    if [ ! -z "$firstEp" ]; then
-      ${csudo}sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/${configFile}
+      ${csudo}sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/${configFile2}
      break
    else
      break
@@ -600,8 +603,8 @@ function install_web() {


 function clean_service_on_sysvinit() {
-  if ps aux | grep -v grep | grep ${serverName} &>/dev/null; then
-    ${csudo}service ${serverName} stop || :
+  if ps aux | grep -v grep | grep ${serverName2} &>/dev/null; then
+    ${csudo}service ${serverName2} stop || :
  fi

  if ps aux | grep -v grep | grep tarbitrator &>/dev/null; then
@@ -609,30 +612,30 @@ function clean_service_on_sysvinit() {
  fi

  if ((${initd_mod} == 1)); then
-    if [ -e ${service_config_dir}/${serverName} ]; then
-      ${csudo}chkconfig --del ${serverName} || :
+    if [ -e ${service_config_dir}/${serverName2} ]; then
+      ${csudo}chkconfig --del ${serverName2} || :
    fi

    if [ -e ${service_config_dir}/tarbitratord ]; then
      ${csudo}chkconfig --del tarbitratord || :
    fi
  elif ((${initd_mod} == 2)); then
-    if [ -e ${service_config_dir}/${serverName} ]; then
-      ${csudo}insserv -r ${serverName} || :
+    if [ -e ${service_config_dir}/${serverName2} ]; then
+      ${csudo}insserv -r ${serverName2} || :
    fi
    if [ -e ${service_config_dir}/tarbitratord ]; then
      ${csudo}insserv -r tarbitratord || :
    fi
  elif ((${initd_mod} == 3)); then
-    if [ -e ${service_config_dir}/${serverName} ]; then
-      ${csudo}update-rc.d -f ${serverName} remove || :
+    if [ -e ${service_config_dir}/${serverName2} ]; then
+      ${csudo}update-rc.d -f ${serverName2} remove || :
    fi
    if [ -e ${service_config_dir}/tarbitratord ]; then
      ${csudo}update-rc.d -f tarbitratord remove || :
    fi
  fi

-  ${csudo}rm -f ${service_config_dir}/${serverName} || :
+  ${csudo}rm -f ${service_config_dir}/${serverName2} || :
  ${csudo}rm -f ${service_config_dir}/tarbitratord || :

  if $(which init &>/dev/null); then
@@ -653,24 +656,24 @@ function install_service_on_sysvinit() {
  fi

  if ((${initd_mod} == 1)); then
-    ${csudo}chkconfig --add ${serverName} || :
-    ${csudo}chkconfig --level 2345 ${serverName} on || :
+    ${csudo}chkconfig --add ${serverName2} || :
+    ${csudo}chkconfig --level 2345 ${serverName2} on || :
  elif ((${initd_mod} == 2)); then
-    ${csudo}insserv ${serverName} || :
-    ${csudo}insserv -d ${serverName} || :
+    ${csudo}insserv ${serverName2} || :
+    ${csudo}insserv -d ${serverName2} || :
  elif ((${initd_mod} == 3)); then
-    ${csudo}update-rc.d ${serverName} defaults || :
+    ${csudo}update-rc.d ${serverName2} defaults || :
  fi
 }

 function clean_service_on_systemd() {
-  taosd_service_config="${service_config_dir}/${serverName}.service"
-  if systemctl is-active --quiet ${serverName}; then
+  service_config="${service_config_dir}/${serverName2}.service"
+  if systemctl is-active --quiet ${serverName2}; then
    echo "${productName} is running, stopping it..."
-    ${csudo}systemctl stop ${serverName} &>/dev/null || echo &>/dev/null
+    ${csudo}systemctl stop ${serverName2} &>/dev/null || echo &>/dev/null
  fi
-  ${csudo}systemctl disable ${serverName} &>/dev/null || echo &>/dev/null
-  ${csudo}rm -f ${taosd_service_config}
+  ${csudo}systemctl disable ${serverName2} &>/dev/null || echo &>/dev/null
+  ${csudo}rm -f ${service_config}

  tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
  if systemctl is-active --quiet tarbitratord; then
@@ -687,19 +690,19 @@ function clean_service_on_systemd() {
 function install_service_on_systemd() {
  clean_service_on_systemd

-  [ -f ${script_dir}/cfg/${serverName}.service ] &&
-    ${csudo}cp ${script_dir}/cfg/${serverName}.service \
+  [ -f ${script_dir}/cfg/${serverName2}.service ] &&
+    ${csudo}cp ${script_dir}/cfg/${serverName2}.service \
      ${service_config_dir}/ || :

  # if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
-  #   [ -f ${script_dir}/cfg/${serverName}.service ] &&
-  #   ${csudo}cp ${script_dir}/cfg/${serverName}.service \
+  #   [ -f ${script_dir}/cfg/${serverName2}.service ] &&
+  #   ${csudo}cp ${script_dir}/cfg/${serverName2}.service \
  #     ${service_config_dir}/${serverName2}.service || :
  # fi

  ${csudo}systemctl daemon-reload

-  ${csudo}systemctl enable ${serverName}
+  ${csudo}systemctl enable ${serverName2}

  ${csudo}systemctl daemon-reload
 }
@@ -719,7 +722,7 @@ function install_service() {
  elif ((${service_mod} == 1)); then
    install_service_on_sysvinit
  else
-    kill_process ${serverName}
+    kill_process ${serverName2}
  fi
 }

@@ -756,10 +759,10 @@ function is_version_compatible() {
  if [ -f ${script_dir}/driver/vercomp.txt ]; then
    min_compatible_version=$(cat ${script_dir}/driver/vercomp.txt)
  else
-    min_compatible_version=$(${script_dir}/bin/${serverName} -V | head -1 | cut -d ' ' -f 5)
+    min_compatible_version=$(${script_dir}/bin/${serverName2} -V | head -1 | cut -d ' ' -f 5)
  fi

-  exist_version=$(${installDir}/bin/${serverName} -V | head -1 | cut -d ' ' -f 3)
+  exist_version=$(${installDir}/bin/${serverName2} -V | head -1 | cut -d ' ' -f 3)
  vercomp $exist_version "3.0.0.0"
  case $? in
  2)
@@ -829,13 +832,13 @@ function updateProduct() {

  echo -e "${GREEN}Start to update ${productName2}...${NC}"
  # Stop the service if running
-  if ps aux | grep -v grep | grep ${serverName} &>/dev/null; then
+  if ps aux | grep -v grep | grep ${serverName2} &>/dev/null; then
    if ((${service_mod} == 0)); then
-      ${csudo}systemctl stop ${serverName} || :
+      ${csudo}systemctl stop ${serverName2} || :
    elif ((${service_mod} == 1)); then
-      ${csudo}service ${serverName} stop || :
+      ${csudo}service ${serverName2} stop || :
    else
-      kill_process ${serverName}
+      kill_process ${serverName2}
    fi
    sleep 1
  fi
@@ -862,21 +865,21 @@ function updateProduct() {
    openresty_work=false

    echo
-    echo -e "${GREEN_DARK}To configure ${productName2} ${NC}: edit ${cfg_install_dir}/${configFile}"
-    [ -f ${configDir}/taosadapter.toml ] && [ -f ${installDir}/bin/taosadapter ] && \
-      echo -e "${GREEN_DARK}To configure ${clientName2} Adapter ${NC}: edit ${configDir}/taosadapter.toml"
+    echo -e "${GREEN_DARK}To configure ${productName2} ${NC}: edit ${cfg_install_dir}/${configFile2}"
+    [ -f ${configDir}/${clientName2}adapter.toml ] && [ -f ${installDir}/bin/${clientName2}adapter ] && \
+      echo -e "${GREEN_DARK}To configure ${clientName2} Adapter ${NC}: edit ${configDir}/${clientName2}adapter.toml"
    if ((${service_mod} == 0)); then
-      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${csudo}systemctl start ${serverName}${NC}"
-      [ -f ${service_config_dir}/taosadapter.service ] && [ -f ${installDir}/bin/taosadapter ] && \
-        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${csudo}systemctl start taosadapter ${NC}"
+      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${csudo}systemctl start ${serverName2}${NC}"
+      [ -f ${service_config_dir}/${clientName2}adapter.service ] && [ -f ${installDir}/bin/${clientName2}adapter ] && \
+        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${csudo}systemctl start ${clientName2}adapter ${NC}"
    elif ((${service_mod} == 1)); then
-      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${csudo}service ${serverName} start${NC}"
-      [ -f ${service_config_dir}/taosadapter.service ] && [ -f ${installDir}/bin/taosadapter ] && \
-        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${csudo}service taosadapter start${NC}"
+      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${csudo}service ${serverName2} start${NC}"
+      [ -f ${service_config_dir}/${clientName2}adapter.service ] && [ -f ${installDir}/bin/${clientName2}adapter ] && \
+        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${csudo}service ${clientName2}adapter start${NC}"
    else
-      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ./${serverName}${NC}"
-      [ -f ${installDir}/bin/taosadapter ] && \
-        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: taosadapter &${NC}"
+      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ./${serverName2}${NC}"
+      [ -f ${installDir}/bin/${clientName2}adapter ] && \
+        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${clientName2}adapter &${NC}"
    fi

    if [ ${openresty_work} = 'true' ]; then
@@ -887,7 +890,7 @@ function updateProduct() {

    if ((${prompt_force} == 1)); then
      echo ""
-      echo -e "${RED}Please run '${serverName} --force-keep-file' at first time for the exist ${productName2} $exist_version!${NC}"
+      echo -e "${RED}Please run '${serverName2} --force-keep-file' at first time for the exist ${productName2} $exist_version!${NC}"
    fi
    echo
    echo -e "\033[44;32;1m${productName2} is updated successfully!${NC}"
@@ -899,7 +902,7 @@ function updateProduct() {
    echo -e "\033[44;32;1m${productName2} client is updated successfully!${NC}"
  fi

-  rm -rf $(tar -tf ${tarName} | grep -v "^\./$")
+  rm -rf $(tar -tf ${tarName} | grep -Ev "^\./$|^\/")
 }

 function installProduct() {
@@ -944,21 +947,21 @@ function installProduct() {

    # Ask if to start the service
    echo
-    echo -e "${GREEN_DARK}To configure ${productName2} ${NC}: edit ${cfg_install_dir}/${configFile}"
-    [ -f ${configDir}/taosadapter.toml ] && [ -f ${installDir}/bin/taosadapter ] && \
-      echo -e "${GREEN_DARK}To configure ${clientName2} Adapter ${NC}: edit ${configDir}/taosadapter.toml"
+    echo -e "${GREEN_DARK}To configure ${productName2} ${NC}: edit ${cfg_install_dir}/${configFile2}"
+    [ -f ${configDir}/${clientName2}adapter.toml ] && [ -f ${installDir}/bin/${clientName2}adapter ] && \
+      echo -e "${GREEN_DARK}To configure ${clientName2} Adapter ${NC}: edit ${configDir}/${clientName2}adapter.toml"
    if ((${service_mod} == 0)); then
-      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${csudo}systemctl start ${serverName}${NC}"
-      [ -f ${service_config_dir}/taosadapter.service ] && [ -f ${installDir}/bin/taosadapter ] && \
-        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${csudo}systemctl start taosadapter ${NC}"
+      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${csudo}systemctl start ${serverName2}${NC}"
+      [ -f ${service_config_dir}/${clientName2}adapter.service ] && [ -f ${installDir}/bin/${clientName2}adapter ] && \
+        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${csudo}systemctl start ${clientName2}adapter ${NC}"
    elif ((${service_mod} == 1)); then
-      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${csudo}service ${serverName} start${NC}"
-      [ -f ${service_config_dir}/taosadapter.service ] && [ -f ${installDir}/bin/taosadapter ] && \
-        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${csudo}service taosadapter start${NC}"
+      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${csudo}service ${serverName2} start${NC}"
+      [ -f ${service_config_dir}/${clientName2}adapter.service ] && [ -f ${installDir}/bin/${clientName2}adapter ] && \
+        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${csudo}service ${clientName2}adapter start${NC}"
    else
-      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${serverName}${NC}"
-      [ -f ${installDir}/bin/taosadapter ] && \
-        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: taosadapter &${NC}"
+      echo -e "${GREEN_DARK}To start ${productName2}     ${NC}: ${serverName2}${NC}"
+      [ -f ${installDir}/bin/${clientName2}adapter ] && \
+        echo -e "${GREEN_DARK}To start ${clientName2} Adapter ${NC}: ${clientName2}adapter &${NC}"
    fi

    if [ ! -z "$firstEp" ]; then
@@ -991,7 +994,7 @@ function installProduct() {
  fi

  touch ~/.${historyFile}
-  rm -rf $(tar -tf ${tarName} | grep -v "^\./$")
+  rm -rf $(tar -tf ${tarName} | grep -Ev "^\./$|^\/")
 }

 ## ==============================Main program starts from here============================
@@ -1002,7 +1005,7 @@ if [ "$verType" == "server" ]; then
    echo -e "\033[44;31;5mThe default data directory ${data_dir} contains old data of ${productName2} 2.x, please clear it before installing!\033[0m"
  else
    # Install server and client
-    if [ -x ${bin_dir}/${serverName} ]; then
+    if [ -x ${bin_dir}/${serverName2} ]; then
      update_flag=1
      updateProduct
    else
@@ -1012,7 +1015,7 @@ if [ "$verType" == "server" ]; then
 elif [ "$verType" == "client" ]; then
  interactiveFqdn=no
  # Only install client
-  if [ -x ${bin_dir}/${clientName} ]; then
+  if [ -x ${bin_dir}/${clientName2} ]; then
    update_flag=1
    updateProduct client
  else

--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -95,7 +95,7 @@ function install_main_path() {
  ${csudo}mkdir -p ${install_main_dir}/cfg
  ${csudo}mkdir -p ${install_main_dir}/bin
  ${csudo}mkdir -p ${install_main_dir}/driver
-  if [ $productName == "TDengine" ]; then
+  if [ "$productName2" == "TDengine" ]; then
    ${csudo}mkdir -p ${install_main_dir}/examples
  fi
  ${csudo}mkdir -p ${install_main_dir}/include
@@ -118,18 +118,19 @@ function install_bin() {
  #Make link
  [ -x ${install_main_dir}/bin/${clientName} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName}                 || :
  if [ "$osType" != "Darwin" ]; then
-      [ -x ${install_main_dir}/bin/taosdemo ] && ${csudo}ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
+      [ -x ${install_main_dir}/bin/${demoName2} ] && ${csudo}ln -s ${install_main_dir}/bin/${demoName2} ${bin_link_dir}/${demoName2}  || :
  fi
  [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/${uninstallScript} || :
  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :

  if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
    #Make link
-    [ -x ${install_main_dir}/bin/${clientName} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName2}                 || :
+    [ -x ${install_main_dir}/bin/${clientName2} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName2} ${bin_link_dir}/${clientName2}                 || :
    if [ "$osType" != "Darwin" ]; then
-        [ -x ${install_main_dir}/bin/taosdemo ] && ${csudo}ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/${demoName2}  || :
+        [ -x ${install_main_dir}/bin/${demoName2} ] && ${csudo}ln -s ${install_main_dir}/bin/${demoName2} ${bin_link_dir}/${demoName2}  || :
+        [ -x ${install_main_dir}/bin/${benchmarkName2} ] && ${csudo}ln -s ${install_main_dir}/bin/${benchmarkName2} ${bin_link_dir}/${benchmarkName2}  || :
    fi
-    [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/${uninstallScript2} || :
+    [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo}ln -sf ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/${uninstallScript2} || :
  fi
 }

@@ -305,7 +306,7 @@ function update_TDengine() {
    echo
    echo -e "\033[44;32;1m${productName2} client is updated successfully!${NC}"

-    rm -rf $(tar -tf ${tarName})
+    rm -rf $(tar -tf ${tarName} | grep -Ev "^\./$|^\/")
 }

 function install_TDengine() {
@@ -332,7 +333,7 @@ function install_TDengine() {
    echo
    echo -e "\033[44;32;1m${productName2} client is installed successfully!${NC}"

-    rm -rf $(tar -tf ${tarName})
+    rm -rf $(tar -tf ${tarName} | grep -Ev "^\./$|^\/")
 }



--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -2,7 +2,7 @@
 #
 # Generate tar.gz package for linux client in all os system
 set -e
-# set -x
+set -x

 curr_dir=$(pwd)
 compile_dir=$1
@@ -23,9 +23,12 @@ clientName2="${12}"

 productName="TDengine"
 clientName="taos"
+benchmarkName="taosBenchmark"
 configFile="taos.cfg"
 tarName="package.tar.gz"

+benchmarkName2="${clientName2}Benchmark"
+
 if [ "$osType" != "Darwin" ]; then
  script_dir="$(dirname $(readlink -f $0))"
  top_dir="$(readlink -f ${script_dir}/../..)"
@@ -53,11 +56,12 @@ fi

 # Directories and files.

-if [ "$verMode" == "cluster" ]; then
-  sed -i 's/verMode=edge/verMode=cluster/g' ${script_dir}/remove_client.sh
-  sed -i "s/clientName2=\"taos\"/clientName2=\"${clientName2}\"/g" ${script_dir}/remove_client.sh
-  sed -i "s/productName2=\"TDengine\"/productName2=\"${productName2}\"/g" ${script_dir}/remove_client.sh
-fi
+#if [ "$verMode" == "cluster" ]; then
+#  sed -i 's/verMode=edge/verMode=cluster/g' ${script_dir}/remove_client.sh
+#  sed -i "s/clientName2=\"taos\"/clientName2=\"${clientName2}\"/g" ${script_dir}/remove_client.sh
+#  sed -i "s/configFile2=\"taos\"/configFile2=\"${clientName2}\"/g" ${script_dir}/remove_client.sh
+#  sed -i "s/productName2=\"TDengine\"/productName2=\"${productName2}\"/g" ${script_dir}/remove_client.sh
+#fi

 if [ "$osType" != "Darwin" ]; then
  if [ "$pagMode" == "lite" ]; then
@@ -66,6 +70,7 @@ if [ "$osType" != "Darwin" ]; then
        ${script_dir}/remove_client.sh"
  else
    bin_files="${build_dir}/bin/${clientName} \
+        ${build_dir}/bin/${benchmarkName} \
        ${script_dir}/remove_client.sh \
        ${script_dir}/set_core.sh \
        ${script_dir}/get_client.sh"
@@ -153,6 +158,7 @@ if [ "$verMode" == "cluster" ]; then
  sed -i 's/verMode=edge/verMode=cluster/g' install_client_temp.sh
  sed -i "s/serverName2=\"taosd\"/serverName2=\"${serverName2}\"/g" install_client_temp.sh
  sed -i "s/clientName2=\"taos\"/clientName2=\"${clientName2}\"/g" install_client_temp.sh
+  sed -i "s/configFile2=\"taos.cfg\"/configFile2=\"${clientName2}.cfg\"/g" install_client_temp.sh
  sed -i "s/productName2=\"TDengine\"/productName2=\"${productName2}\"/g" install_client_temp.sh
  sed -i "s/emailName2=\"taosdata.com\"/emailName2=\"${cusEmail2}\"/g" install_client_temp.sh


--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -96,7 +96,7 @@ else
      ${taostools_bin_files} \
      ${taosx_bin} \
      ${explorer_bin_files} \
-      ${build_dir}/bin/taosadapter \
+      ${build_dir}/bin/${clientName}adapter \
      ${build_dir}/bin/udfd \
      ${script_dir}/remove.sh \
      ${script_dir}/set_core.sh \
@@ -135,12 +135,12 @@ mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc

 mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/${configFile} ${install_dir}/cfg/${configFile}

-if [ -f "${compile_dir}/test/cfg/taosadapter.toml" ]; then
-  cp ${compile_dir}/test/cfg/taosadapter.toml ${install_dir}/cfg || :
+if [ -f "${compile_dir}/test/cfg/${clientName}adapter.toml" ]; then
+  cp ${compile_dir}/test/cfg/${clientName}adapter.toml ${install_dir}/cfg || :
 fi

-if [ -f "${compile_dir}/test/cfg/taosadapter.service" ]; then
-  cp ${compile_dir}/test/cfg/taosadapter.service ${install_dir}/cfg || :
+if [ -f "${compile_dir}/test/cfg/${clientName}adapter.service" ]; then
+  cp ${compile_dir}/test/cfg/${clientName}adapter.service ${install_dir}/cfg || :
 fi

 if [ -f "${cfg_dir}/${serverName}.service" ]; then
@@ -152,16 +152,16 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/${se
 mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/${serverName}.rpm

 if [ $adapterName != "taosadapter" ]; then
-  mv ${install_dir}/cfg/taosadapter.toml ${install_dir}/cfg/$adapterName.toml
+  mv ${install_dir}/cfg/${clientName2}adapter.toml ${install_dir}/cfg/$adapterName.toml
  sed -i "s/path = \"\/var\/log\/taos\"/path = \"\/var\/log\/${productName}\"/g" ${install_dir}/cfg/$adapterName.toml
  sed -i "s/password = \"taosdata\"/password = \"${defaultPasswd}\"/g" ${install_dir}/cfg/$adapterName.toml

-  mv ${install_dir}/cfg/taosadapter.service ${install_dir}/cfg/$adapterName.service
+  mv ${install_dir}/cfg/${clientName2}adapter.service ${install_dir}/cfg/$adapterName.service
  sed -i "s/TDengine/${productName}/g" ${install_dir}/cfg/$adapterName.service
  sed -i "s/taosAdapter/${adapterName}/g" ${install_dir}/cfg/$adapterName.service
  sed -i "s/taosadapter/${adapterName}/g" ${install_dir}/cfg/$adapterName.service

-  mv ${install_dir}/bin/taosadapter ${install_dir}/bin/${adapterName}
+  mv ${install_dir}/bin/${clientName2}adapter ${install_dir}/bin/${adapterName}
  mv ${install_dir}/bin/taosd-dump-cfg.gdb ${install_dir}/bin/${serverName}-dump-cfg.gdb
 fi

@@ -233,9 +233,9 @@ if [ "$verMode" == "cluster" ]; then
  sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >>remove_temp.sh
  sed -i "s/serverName2=\"taosd\"/serverName2=\"${serverName2}\"/g" remove_temp.sh
  sed -i "s/clientName2=\"taos\"/clientName2=\"${clientName2}\"/g" remove_temp.sh
+  sed -i "s/configFile2=\"taos.cfg\"/configFile2=\"${clientName2}.cfg\"/g" remove_temp.sh
  sed -i "s/productName2=\"TDengine\"/productName2=\"${productName2}\"/g" remove_temp.sh
  cusDomain=`echo "${cusEmail2}" | sed 's/^[^@]*@//'`
-  echo "domain is ${cusDomain}"
  sed -i "s/emailName2=\"taosdata.com\"/emailName2=\"${cusDomain}\"/g" remove_temp.sh
  mv remove_temp.sh ${install_dir}/bin/remove.sh
 fi
@@ -264,8 +264,10 @@ if [ "$verMode" == "cluster" ]; then
  sed -i 's/verMode=edge/verMode=cluster/g' install_temp.sh
  sed -i "s/serverName2=\"taosd\"/serverName2=\"${serverName2}\"/g" install_temp.sh
  sed -i "s/clientName2=\"taos\"/clientName2=\"${clientName2}\"/g" install_temp.sh
+  sed -i "s/configFile2=\"taos.cfg\"/configFile2=\"${clientName2}.cfg\"/g" install_temp.sh
  sed -i "s/productName2=\"TDengine\"/productName2=\"${productName2}\"/g" install_temp.sh
-  sed -i "s/emailName2=\"taosdata.com\"/emailName2=\"${cusEmail2}\"/g" install_temp.sh
+  cusDomain=`echo "${cusEmail2}" | sed 's/^[^@]*@//'`
+  sed -i "s/emailName2=\"taosdata.com\"/emailName2=\"${cusDomain}\"/g" install_temp.sh
  mv install_temp.sh ${install_dir}/install.sh
 fi
 if [ "$verMode" == "cloud" ]; then

--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -40,11 +40,16 @@ serverName2="taosd"
 clientName2="taos"
 productName2="TDengine"

+adapterName2="${clientName2}adapter"
+demoName2="${clientName2}demo"
 benchmarkName2="${clientName2}Benchmark"
 dumpName2="${clientName2}dump"
+keeperName2="${clientName2}keeper"
+xName2="${clientName2}x"
+explorerName2="${clientName2}-explorer"
 uninstallScript2="rm${clientName2}"

-installDir="/usr/local/${clientName}"
+installDir="/usr/local/${clientName2}"

 #install main path
 install_main_dir=${installDir}
@@ -55,8 +60,8 @@ local_bin_link_dir="/usr/local/bin"


 service_config_dir="/etc/systemd/system"
-taos_service_name=${serverName}
-taosadapter_service_name="taosadapter"
+taos_service_name=${serverName2}
+taosadapter_service_name="${clientName2}adapter"
 tarbitrator_service_name="tarbitratord"
 csudo=""
 if command -v sudo >/dev/null; then
@@ -84,14 +89,14 @@ else
 fi

 function kill_taosadapter() {
-  pid=$(ps -ef | grep "taosadapter" | grep -v "grep" | awk '{print $2}')
+  pid=$(ps -ef | grep "${adapterName2}" | grep -v "grep" | awk '{print $2}')
  if [ -n "$pid" ]; then
    ${csudo}kill -9 $pid || :
  fi
 }

 function kill_taosd() {
-  pid=$(ps -ef | grep ${serverName} | grep -v "grep" | awk '{print $2}')
+  pid=$(ps -ef | grep ${serverName2} | grep -v "grep" | awk '{print $2}')
  if [ -n "$pid" ]; then
    ${csudo}kill -9 $pid || :
  fi
@@ -109,17 +114,17 @@ function clean_bin() {
  ${csudo}rm -f ${bin_link_dir}/${clientName} || :
  ${csudo}rm -f ${bin_link_dir}/${serverName} || :
  ${csudo}rm -f ${bin_link_dir}/udfd || :
-  ${csudo}rm -f ${bin_link_dir}/taosadapter || :
-  ${csudo}rm -f ${bin_link_dir}/taosBenchmark || :
-  ${csudo}rm -f ${bin_link_dir}/taosdemo || :
-  ${csudo}rm -f ${bin_link_dir}/taosdump || :
-  ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || :
+  ${csudo}rm -f ${bin_link_dir}/${adapterName2}     || :
+  ${csudo}rm -f ${bin_link_dir}/${benchmarkName2}   || :
+  ${csudo}rm -f ${bin_link_dir}/${demoName2}        || :
+  ${csudo}rm -f ${bin_link_dir}/${dumpName2}        || :
+  ${csudo}rm -f ${bin_link_dir}/${uninstallScript}  || :
  ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
  ${csudo}rm -f ${bin_link_dir}/set_core || :
  ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
-  ${csudo}rm -f ${bin_link_dir}/taoskeeper || :
-  ${csudo}rm -f ${bin_link_dir}/taosx || :
-  ${csudo}rm -f ${bin_link_dir}/taos-explorer || :
+  ${csudo}rm -f ${bin_link_dir}/${keeperName2}      || :
+  ${csudo}rm -f ${bin_link_dir}/${xName2}           || :
+  ${csudo}rm -f ${bin_link_dir}/${explorerName2}    || :

  if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
    ${csudo}rm -f ${bin_link_dir}/${clientName2} || :
@@ -130,8 +135,8 @@ function clean_bin() {
 }

 function clean_local_bin() {
-  ${csudo}rm -f ${local_bin_link_dir}/taosBenchmark || :
-  ${csudo}rm -f ${local_bin_link_dir}/taosdemo || :
+  ${csudo}rm -f ${local_bin_link_dir}/${benchmarkName2} || :
+  ${csudo}rm -f ${local_bin_link_dir}/${demoName2}      || :
 }

 function clean_lib() {
@@ -173,7 +178,7 @@ function clean_service_on_systemd() {
  ${csudo}systemctl disable ${taos_service_name} &>/dev/null || echo &>/dev/null
  ${csudo}rm -f ${taosd_service_config}

-  taosadapter_service_config="${service_config_dir}/taosadapter.service"
+  taosadapter_service_config="${service_config_dir}/${clientName2}adapter.service"
  if systemctl is-active --quiet ${taosadapter_service_name}; then
    echo "${productName2}  ${clientName2}Adapter is running, stopping it..."
    ${csudo}systemctl stop ${taosadapter_service_name} &>/dev/null || echo &>/dev/null
@@ -235,8 +240,8 @@ function clean_service_on_sysvinit() {
 function clean_service_on_launchctl() {
  ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
  ${csudo}rm /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
-  ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.taosadapter.plist > /dev/null 2>&1 || :
-  ${csudo}rm /Library/LaunchDaemons/com.taosdata.taosadapter.plist > /dev/null 2>&1 || :
+  ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.${clientName2}adapter.plist > /dev/null 2>&1 || :
+  ${csudo}rm /Library/LaunchDaemons/com.taosdata.${clientName2}adapter.plist > /dev/null 2>&1 || :
 }

 function clean_service() {

--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
@@ -15,11 +15,12 @@ uninstallScript="rmtaos"
 clientName2="taos"
 productName2="TDengine"

-benchmarkName2="${clientName}Benchmark"
-dumpName2="${clientName}dump"
-uninstallScript2="rm${clientName}"
+benchmarkName2="${clientName2}Benchmark"
+demoName2="${clientName2}demo"
+dumpName2="${clientName2}dump"
+uninstallScript2="rm${clientName2}"

-installDir="/usr/local/${clientName}"
+installDir="/usr/local/${clientName2}"

 #install main path
 install_main_dir=${installDir}
@@ -44,14 +45,17 @@ function kill_client() {

 function clean_bin() {
    # Remove link
-    ${csudo}rm -f ${bin_link_dir}/${clientName}      || :
-    ${csudo}rm -f ${bin_link_dir}/taosdemo  || :
-    ${csudo}rm -f ${bin_link_dir}/taosdump  || :
+    ${csudo}rm -f ${bin_link_dir}/${clientName2}      || :
+    ${csudo}rm -f ${bin_link_dir}/${demoName2}        || :
+    ${csudo}rm -f ${bin_link_dir}/${benchmarkName2}   || :
+    ${csudo}rm -f ${bin_link_dir}/${dumpName2}        || :
    ${csudo}rm -f ${bin_link_dir}/${uninstallScript}    || :
    ${csudo}rm -f ${bin_link_dir}/set_core  || :

    if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
        ${csudo}rm -f ${bin_link_dir}/${clientName2} || :
+        ${csudo}rm -f ${bin_link_dir}/${demoName2}        || :
+        ${csudo}rm -f ${bin_link_dir}/${benchmarkName2}   || :
        ${csudo}rm -f ${bin_link_dir}/${dumpName2} || :
        ${csudo}rm -f ${bin_link_dir}/${uninstallScript2} || :
    fi