Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/stt_trigger_config

packaging/testpackage.sh

@@ -7,7 +7,6 @@ originPackageName=$3
 originversion=$4
 testFile=$5
 subFile="taos.tar.gz"
-password=$6
 
 # Color setting
 RED='\033[41;30m'
@@ -233,15 +232,15 @@ cd ${installPath}
 if [[ ${packgeName} =~ "Lite" ]]  ||   ([[ ${packgeName} =~ "x64" ]] && [[ ${packgeName} =~ "client" ]]) ||  ([[ ${packgeName} =~ "deb" ]] && [[ ${packgeName} =~ "server" ]])  || ([[ ${packgeName} =~ "rpm" ]] && [[ ${packgeName} =~ "server" ]]) ;then
     echoColor G "===== install taos-tools when package is lite or client ====="
     cd ${installPath}
-    wgetFile taosTools-2.1.2-Linux-x64.tar.gz .
-    tar xf taosTools-2.1.2-Linux-x64.tar.gz
-    cd taosTools-2.1.2 && bash install-taostools.sh
+    wgetFile taosTools-2.1.3-Linux-x64.tar.gz .
+    tar xf taosTools-2.1.3-Linux-x64.tar.gz
+    cd taosTools-2.1.3 && bash install-taostools.sh
 elif  ([[ ${packgeName} =~ "arm64" ]] && [[ ${packgeName} =~ "client" ]]);then
     echoColor G "===== install taos-tools arm when package is arm64-client ====="
     cd ${installPath}
-    wgetFile taosTools-2.1.2-Linux-arm64.tar.gz .
-    tar xf taosTools-2.1.2-Linux-arm64.tar.gz
-    cd taosTools-2.1.2 && bash install-taostools.sh
+    wgetFile taosTools-2.1.3-Linux-arm64.tar.gz .
+    tar xf taosTools-2.1.3-Linux-arm64.tar.gz
+    cd taosTools-2.1.3 && bash install-taostools.sh
 fi
 
 echoColor G  "===== start TDengine ====="

source/util/src/tuuid.c

@@ -51,11 +51,11 @@ int64_t tGenIdPI64(void) {
   int64_t id;
 
   while (true) {
-    int64_t  ts = taosGetTimestampMs();
+    int64_t  ts = taosGetTimestampMs() >> 8;
     uint64_t pid = taosGetPId();
     int32_t  val = atomic_add_fetch_32(&tUUIDSerialNo, 1);
 
-    id = ((tUUIDHashId & 0x07FF) << 52) | ((pid & 0x0FFF) << 40) | ((ts & 0xFFFFFF) << 16) | (val & 0xFFFF);
+    id = ((tUUIDHashId & 0x07FF) << 52) | ((pid & 0x0F) << 48) | ((ts & 0x3FFFFFF) << 20) | (val & 0xFFFFF);
     if (id) {
       break;
     }