Hotfix/sangshuduo/td 13440 add taos benchmark back for2.4 (#10308)

* cherry pick from develop branch

* update taos-tools

* cherry pick 77f7bca2dc0358aff615e6dcf2fe60105ebbcfe0

packaging/deb/makedeb.sh

@@ -59,6 +59,7 @@ cp ${compile_dir}/../packaging/tools/set_core.sh    ${pkg_dir}${install_home_pat
 cp ${compile_dir}/../packaging/tools/taosd-dump-cfg.gdb    ${pkg_dir}${install_home_path}/bin
 
 cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_path}/bin
+cp ${compile_dir}/build/bin/taosBenchmark           ${pkg_dir}${install_home_path}/bin
 
 if [ -f "${compile_dir}/build/bin/taosadapter" ]; then
     cp ${compile_dir}/build/bin/taosadapter                    ${pkg_dir}${install_home_path}/bin ||:

packaging/release.sh

@@ -311,9 +311,11 @@ if [ "$osType" != "Darwin" ]; then
   echo "====do tar.gz package for all systems===="
   cd ${script_dir}/tools
 
-  ${csudo} ./makepkg.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp} ${dbName}
-  ${csudo} ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
-  ${csudo} ./makearbi.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+  if [ "$verMode" == "cluster" ]; then
+    ${csudo} ./makepkg.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp} ${dbName}
+#  ${csudo}./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+#  ${csudo}./makearbi.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+  fi
 
 else
   # only make client for Darwin

packaging/rpm/tdengine.spec

@@ -68,6 +68,8 @@ cp %{_compiledir}/../packaging/tools/set_core.sh    %{buildroot}%{homepath}/bin
 cp %{_compiledir}/../packaging/tools/taosd-dump-cfg.gdb    %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taos                    %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosd                   %{buildroot}%{homepath}/bin
+cp %{_compiledir}/build/bin/taosBenchmark           %{buildroot}%{homepath}/bin
+
 if [ -f %{_compiledir}/build/bin/taosadapter ]; then
     cp %{_compiledir}/build/bin/taosadapter                    %{buildroot}%{homepath}/bin ||:
 fi

packaging/tools/install.sh

@@ -194,6 +194,7 @@ function install_bin() {
   ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
   ${csudo}rm -f ${bin_link_dir}/set_core || :
   ${csudo}rm -f ${bin_link_dir}/run_${serverName}_and_${adapterName}.sh || :
+  ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
 
   ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
@@ -201,6 +202,9 @@ function install_bin() {
   [ -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/${adapterName} ] && ${csudo}ln -s ${install_main_dir}/bin/${adapterName} ${bin_link_dir}/${adapterName} || :
+  [ -x ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -s ${install_main_dir}/bin/taosBenchmark ${bin_link_dir}/taosdemo || :
+  [ -x ${install_main_dir}/bin/taosdump ] && ${csudo}ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
+  [ -x ${install_main_dir}/bin/TDinsight.sh ] && ${csudo}ln -s ${install_main_dir}/bin/TDinsight.sh ${bin_link_dir}/TDinsight.sh || :
   [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.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 || :
   [ -x ${install_main_dir}/bin/run_${serverName}_and_${adapterName}.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_${serverName}_and_${adapterName}.sh ${bin_link_dir}/run_${serverName}_and_${adapterName}.sh || :
@@ -800,9 +804,6 @@ function updateProduct() {
   install_log
   install_header
   install_lib
-  #  if [ "$pagMode" != "lite" ]; then
-  #    install_connector
-  #  fi
   install_examples
   if [ -z $1 ]; then
     install_bin

packaging/tools/makepkg.sh

@@ -3,7 +3,7 @@
 # Generate tar.gz package for all os system
 
 set -e
-#set -x
+set -x
 
 curr_dir=$(pwd)
 compile_dir=$1
@@ -60,11 +60,21 @@ if [ "$pagMode" == "lite" ]; then
   strip ${build_dir}/bin/${serverName}
   strip ${build_dir}/bin/${clientName}
   # lite version doesn't include taosadapter,  which will lead to no restful interface
-  bin_files="${build_dir}/bin/${serverName} ${build_dir}/bin/${clientName} ${script_dir}/remove.sh ${script_dir}/startPre.sh"
+  bin_files="${build_dir}/bin/${serverName} ${build_dir}/bin/${clientName} ${script_dir}/remove.sh ${script_dir}/startPre.sh ${build_dir}/bin/taosBenchmark"
   taostools_bin_files=""
 else
+
+  wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${build_dir}/bin/TDinsight.sh \
+      && echo "TDinsight.sh downloaded!" \
+      || echo "failed to download TDinsight.sh"
+
+  taostools_bin_files=" ${build_dir}/bin/taosdump \
+      ${build_dir}/bin/TDinsight.sh "
+
   bin_files="${build_dir}/bin/${serverName} \
       ${build_dir}/bin/${clientName} \
+      ${build_dir}/bin/taosBenchmark \
+      ${taostools_bin_files} \
       ${build_dir}/bin/taosadapter \
       ${build_dir}/bin/tarbitrator\
       ${script_dir}/remove.sh \
@@ -72,9 +82,6 @@ else
       ${script_dir}/run_taosd_and_taosadapter.sh \
       ${script_dir}/startPre.sh \
       ${script_dir}/taosd-dump-cfg.gdb"
-
-  taostools_bin_files=" ${build_dir}/bin/${dumpName} \
-      ${build_dir}/bin/${benchmarkName}"
 fi
 
 lib_files="${build_dir}/lib/libtaos.so.${version}"
@@ -139,36 +146,36 @@ if [ $adapterName != "taosadapter" ]; then
   mv ${install_dir}/bin/taosd-dump-cfg.gdb ${install_dir}/bin/${serverName}-dump-cfg.gdb
 fi
 
-if [ -n "${taostools_bin_files}" ]; then
-  mkdir -p ${taostools_install_dir} || echo -e "failed to create ${taostools_install_dir}"
-  mkdir -p ${taostools_install_dir}/bin &&
-    cp ${taostools_bin_files} ${taostools_install_dir}/bin &&
-    chmod a+x ${taostools_install_dir}/bin/* || :
-
-  if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/install-${toolsName}.sh ]; then
-    cp ${top_dir}/src/kit/taos-tools/packaging/tools/install-${toolsName}.sh \
-      ${taostools_install_dir}/ >/dev/null &&
-      chmod a+x ${taostools_install_dir}/install-${toolsName}.sh ||
-      echo -e "failed to copy install-${toolsName}.sh"
-  else
-    echo -e "install-${toolsName}.sh not found"
-  fi
-
-  if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-${toolsName}.sh ]; then
-    cp ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-${toolsName}.sh \
-      ${taostools_install_dir}/ >/dev/null &&
-      chmod a+x ${taostools_install_dir}/uninstall-${toolsName}.sh ||
-      echo -e "failed to copy uninstall-${toolsName}.sh"
-  else
-    echo -e "uninstall-${toolsName}.sh not found"
-  fi
-
-  if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then
-    mkdir -p ${taostools_install_dir}/avro/{lib,lib/pkgconfig} || echo -e "failed to create ${taostools_install_dir}/avro"
-    cp ${build_dir}/lib/libavro.* ${taostools_install_dir}/avro/lib
-    cp ${build_dir}/lib/pkgconfig/avro-c.pc ${taostools_install_dir}/avro/lib/pkgconfig
-  fi
-fi
+#if [ -n "${taostools_bin_files}" ]; then
+#    mkdir -p ${taostools_install_dir} || echo -e "failed to create ${taostools_install_dir}"
+#    mkdir -p ${taostools_install_dir}/bin \
+#        && cp ${taostools_bin_files} ${taostools_install_dir}/bin \
+#        && chmod a+x ${taostools_install_dir}/bin/* || :
+
+#    if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh ]; then
+#        cp ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh \
+#            ${taostools_install_dir}/ > /dev/null \
+#            && chmod a+x ${taostools_install_dir}/install-taostools.sh \
+#            || echo -e "failed to copy install-taostools.sh"
+#    else
+#        echo -e "install-taostools.sh not found"
+#    fi
+
+#    if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh ]; then
+#        cp ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh \
+#            ${taostools_install_dir}/ > /dev/null \
+#            && chmod a+x ${taostools_install_dir}/uninstall-taostools.sh \
+#            || echo -e "failed to copy uninstall-taostools.sh"
+#    else
+#        echo -e "uninstall-taostools.sh not found"
+#    fi
+
+#    if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then
+#        mkdir -p ${taostools_install_dir}/avro/{lib,lib/pkgconfig} || echo -e "failed to create ${taostools_install_dir}/avro"
+#        cp ${build_dir}/lib/libavro.* ${taostools_install_dir}/avro/lib
+#        cp ${build_dir}/lib/pkgconfig/avro-c.pc ${taostools_install_dir}/avro/lib/pkgconfig
+#    fi
+#fi
 
 if [ -f ${build_dir}/bin/jemalloc-config ]; then
   mkdir -p ${install_dir}/jemalloc/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}
@@ -333,13 +340,14 @@ if [ "$exitcode" != "0" ]; then
   exit $exitcode
 fi
 
-if [ -n "${taostools_bin_files}" ]; then
-  tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || :
-  exitcode=$?
-  if [ "$exitcode" != "0" ]; then
-    echo "tar ${taostools_pkg_name}.tar.gz error !!!"
-    exit $exitcode
-  fi
-fi
+#if [ -n "${taostools_bin_files}" ]; then
+#    wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${taostools_install_dir}/bin/TDinsight.sh && echo "TDinsight.sh downloaded!"|| echo "failed to download TDinsight.sh"
+#    tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || :
+#    exitcode=$?
+#    if [ "$exitcode" != "0" ]; then
+#        echo "tar ${taostools_pkg_name}.tar.gz error !!!"
+#        exit $exitcode
+#    fi
+#fi
 
 cd ${curr_dir}

packaging/tools/post.sh

@@ -107,6 +107,7 @@ function install_bin() {
     ${csudo}rm -f ${bin_link_dir}/taos     || :
     ${csudo}rm -f ${bin_link_dir}/taosd    || :
     ${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}/rmtaos   || :
@@ -118,7 +119,8 @@ function install_bin() {
     [ -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}/taosadapter ] && ${csudo}ln -s ${bin_dir}/taosadapter ${bin_link_dir}/taosadapter             || :
-    [ -x ${bin_dir}/taosdemo ] && ${csudo}ln -s ${bin_dir}/taosdemo ${bin_link_dir}/taosdemo || :
+    [ -x ${bin_dir}/taosBenchmark ] && ${csudo}ln -sf ${bin_dir}/taosBenchmark ${bin_link_dir}/taosdemo || :
+    [ -x ${bin_dir}/TDinsight.sh ] && ${csudo}ln -sf ${bin_dir}/TDinsight.sh ${bin_link_dir}/TDinsight.sh || :
     [ -x ${bin_dir}/taosdump ] && ${csudo}ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || :
     [ -x ${bin_dir}/set_core.sh ] && ${csudo}ln -s ${bin_dir}/set_core.sh ${bin_link_dir}/set_core || :
 }

packaging/tools/preun.sh

@@ -121,6 +121,7 @@ clean_service
 ${csudo}rm -f ${bin_link_dir}/taos       || :
 ${csudo}rm -f ${bin_link_dir}/taosd      || :
 ${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}/set_core   || :
 ${csudo}rm -f ${cfg_link_dir}/*.new      || :

packaging/tools/remove.sh

@@ -71,10 +71,14 @@ function clean_bin() {
   ${csudo}rm -f ${bin_link_dir}/${clientName} || :
   ${csudo}rm -f ${bin_link_dir}/${serverName} || :
   ${csudo}rm -f ${bin_link_dir}/${adapterName} || :
+  ${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}/tarbitrator || :
   ${csudo}rm -f ${bin_link_dir}/set_core || :
   ${csudo}rm -f ${bin_link_dir}/run_${serverName}_and_${adapterName}.sh || :
+  ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
 }
 
 function clean_lib() {

taos-tools @ ecc3f50c

-Subproject commit 28ff2899fd0238f81c14cb76ea6dbdefa83570b3
+Subproject commit ecc3f50cfb868da22c716ffbcda7b6c40c9180fa