Merge pull request #11100 from taosdata/release/ver-2.4.0.14

[TS-1373]<release>: release script modify

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.4.0.10")
+  SET(TD_VER_NUMBER "2.4.0.14")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

packaging/clean_env.sh

@@ -38,6 +38,12 @@ fi
 if [[ -e packaging/tools/uninstall-prodbtools.sh ]]; then
   rm -f packaging/tools/uninstall-prodbtools.sh
 fi
+if [[ -e packaging/tools/install-powertools.sh ]]; then
+  rm -f packaging/tools/install-powertools.sh
+fi
+if [[ -e packaging/tools/uninstall-powertools.sh ]]; then
+  rm -f packaging/tools/uninstall-powertools.sh
+fi
 
 rm -rf $COMMUNITY_DIR/debug/*
 rm -rf $COMMUNITY_DIR/release/*

packaging/release.bat

@@ -22,23 +22,33 @@ GOTO USAGE
 goto RELEASE
 
 :POWER
+cd %internal_dir%\enterprise\packaging\oem
 call sed_power.bat %community_dir%
+cd %community_dir%\packaging
 goto RELEASE
 
 :TQ
+cd %internal_dir%\enterprise\packaging\oem
 call sed_tq.bat %community_dir%
+cd %community_dir%\packaging
 goto RELEASE
 
 :PRO
+cd %internal_dir%\enterprise\packaging\oem
 call sed_pro.bat %community_dir%
+cd %community_dir%\packaging
 goto RELEASE
 
 :KH
+cd %internal_dir%\enterprise\packaging\oem
 call sed_kh.bat %community_dir%
+cd %community_dir%\packaging
 goto RELEASE
 
 :JH
+cd %internal_dir%\enterprise\packaging\oem
 call sed_jh.bat %community_dir%
+cd %community_dir%\packaging
 goto RELEASE
 
 :RELEASE

packaging/tools/makepkg.sh

@@ -60,7 +60,7 @@ 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 ${build_dir}/bin/taosBenchmark"
+  bin_files="${build_dir}/bin/${serverName} ${build_dir}/bin/${clientName} ${script_dir}/remove.sh ${script_dir}/startPre.sh ${build_dir}/bin/${benchmarkName}"
   taostools_bin_files=""
 else
 
@@ -68,8 +68,8 @@ else
       && echo "TDinsight.sh downloaded!" \
       || echo "failed to download TDinsight.sh"
 
-  taostools_bin_files=" ${build_dir}/bin/taosdump \
-      ${build_dir}/bin/taosBenchmark \
+  taostools_bin_files=" ${build_dir}/bin/${dumpName} \
+      ${build_dir}/bin/${benchmarkName} \
       ${build_dir}/bin/TDinsight.sh "
 
   bin_files="${build_dir}/bin/${serverName} \
@@ -153,22 +153,22 @@ if [ -n "${taostools_bin_files}" ]; then
         && 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 \
+    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-taostools.sh \
-            || echo -e "failed to copy install-taostools.sh"
+            && chmod a+x ${taostools_install_dir}/install-${toolsName}.sh \
+            || echo -e "failed to copy install-${toolsName}.sh"
     else
-        echo -e "install-taostools.sh not found"
+        echo -e "install-${toolsName}.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 \
+    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-taostools.sh \
-            || echo -e "failed to copy uninstall-taostools.sh"
+            && chmod a+x ${taostools_install_dir}/uninstall-${toolsName}.sh \
+            || echo -e "failed to copy uninstall-${toolsName}.sh"
     else
-        echo -e "uninstall-taostools.sh not found"
+        echo -e "uninstall-${toolsName}.sh not found"
     fi
 
     if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then

snap/snapcraft.yaml

 name: tdengine
 base: core20
-version: '2.4.0.10'
+version: '2.4.0.14'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |

src/client/src/tscSubquery.c

@@ -1215,7 +1215,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar
     // sort according to the tag value
     size_t num = taosArrayGetSize(ctxlist[i].res);
 
-    int32_t ret = tidTagsMergeSort(ctxlist[i].res, 0, num - 1, size);
+    int32_t ret = tidTagsMergeSort(ctxlist[i].res, 0, ((int32_t)num) - 1, size);
     if (ret != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_OUT_OF_MEMORY;
     }