Hotfix/sangshuduo/td 13440 add taos benchmark back (#10460)

* [TD-13440]<fix>: move taosBenchmark back in TDengine package

* update taos-tools

* remove TDinsight.sh too to void failure on second install

* cherry pick with 2.4 branch

* [TD-13440]<fix>: make taosdump/TDinsight be included again.

* fix makeclient.sh dbName

* turn on taosTools tar.gz

* revert script

* checkout tools/makepkg.sh from 2.4

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
@@ -15,6 +15,7 @@ verMode=$6
 verType=$7
 pagMode=$8
 versionComp=$9
+dbName=${10}
 
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -f ${script_dir}/../..)"
@@ -24,6 +25,11 @@ serverName="taosd"
 clientName="taos"
 configFile="taos.cfg"
 tarName="taos.tar.gz"
+dumpName="taosdump"
+benchmarkName="taosBenchmark"
+toolsName="taostools"
+adapterName="taosadapter"
+defaultPasswd="taosdata"
 
 # create compressed install file.
 build_dir="${compile_dir}/build"
@@ -41,12 +47,12 @@ if [ -d ${top_dir}/src/kit/taos-tools/packaging/deb ]; then
   cd ${top_dir}/src/kit/taos-tools/packaging/deb
   [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
 
-    taostools_ver=$(git describe --tags|sed -e 's/ver-//g'|awk -F '-' '{print $1}')
-    taostools_install_dir="${release_dir}/taosTools-${taostools_ver}"
+  taostools_ver=$(git describe --tags | sed -e 's/ver-//g' | awk -F '-' '{print $1}')
+  taostools_install_dir="${release_dir}/${clientName}Tools-${taostools_ver}"
 
   cd ${curr_dir}
 else
-    taostools_install_dir="${release_dir}/taosTools-${version}"
+  taostools_install_dir="${release_dir}/${clientName}Tools-${version}"
 fi
 
 # Directories and files
@@ -68,9 +74,6 @@ else
 
   bin_files="${build_dir}/bin/${serverName} \
       ${build_dir}/bin/${clientName} \
-      ${build_dir}/bin/taosBenchmark \
-      ${build_dir}/bin/taosdump \
-      ${build_dir}/bin/TDinsight.sh \
       ${taostools_bin_files} \
       ${build_dir}/bin/taosadapter \
       ${build_dir}/bin/tarbitrator\
@@ -103,7 +106,6 @@ mkdir -p ${install_dir}
 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 || :
 fi
@@ -130,36 +132,51 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/${se
 mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
 mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
 
-#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 [ $adapterName != "taosadapter" ]; then
+  mv ${install_dir}/cfg/taosadapter.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
 
-#    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
+  mv ${install_dir}/cfg/taosadapter.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
 
-#    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
+  mv ${install_dir}/bin/taosadapter ${install_dir}/bin/${adapterName}
+  mv ${install_dir}/bin/run_taosd_and_taosadapter.sh ${install_dir}/bin/run_${serverName}_and_${adapterName}.sh
+  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-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}
@@ -195,7 +212,7 @@ if [ -f ${build_dir}/bin/jemalloc-config ]; then
 fi
 
 if [ "$verMode" == "cluster" ]; then
-    sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >> remove_temp.sh
+  sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >>remove_temp.sh
   mv remove_temp.sh ${install_dir}/bin/remove.sh
 
   mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
@@ -221,20 +238,21 @@ fi
 cd ${curr_dir}
 cp ${install_files} ${install_dir}
 if [ "$verMode" == "cluster" ]; then
-    sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install.sh >> install_temp.sh
+  sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install.sh >>install_temp.sh
   mv install_temp.sh ${install_dir}/install.sh
 fi
 if [ "$pagMode" == "lite" ]; then
-    sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >> install_temp.sh
+  sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >>install_temp.sh
   mv install_temp.sh ${install_dir}/install.sh
 fi
 chmod a+x ${install_dir}/install.sh
 
-# Copy example code
-mkdir -p ${install_dir}/examples
-examples_dir="${top_dir}/examples"
+if [[ $dbName == "taos" ]]; then
+  # Copy example code
+  mkdir -p ${install_dir}/examples
+  examples_dir="${top_dir}/examples"
   cp -r ${examples_dir}/c ${install_dir}/examples
-if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
     if [ -d ${examples_dir}/JDBC/connectionPools/target ]; then
       rm -rf ${examples_dir}/JDBC/connectionPools/target
     fi
@@ -261,15 +279,17 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
     cp -r ${examples_dir}/go ${install_dir}/examples
     cp -r ${examples_dir}/nodejs ${install_dir}/examples
     cp -r ${examples_dir}/C# ${install_dir}/examples
+  fi
 fi
+
 # Copy driver
-mkdir -p ${install_dir}/driver && cp ${lib_files} ${install_dir}/driver && echo "${versionComp}" > ${install_dir}/driver/vercomp.txt
+mkdir -p ${install_dir}/driver && cp ${lib_files} ${install_dir}/driver && echo "${versionComp}" >${install_dir}/driver/vercomp.txt
 
 # Copy connector
 #connector_dir="${code_dir}/connector"
 #mkdir -p ${install_dir}/connector
 #if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
-#  cp ${build_dir}/lib/*.jar            ${install_dir}/connector ||:
+#  cp ${build_dir}/lib/*.jar ${install_dir}/connector || :
 #  if find ${connector_dir}/go -mindepth 1 -maxdepth 1 | read; then
 #    cp -r ${connector_dir}/go ${install_dir}/connector
 #  else