From 88c4d44545a6596cd1ea90f9d6f9af64a7791bbf Mon Sep 17 00:00:00 2001 From: tomchon Date: Thu, 8 Sep 2022 11:05:06 +0800 Subject: [PATCH 1/3] modify version of taos-tools --- packaging/testpackage.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packaging/testpackage.sh b/packaging/testpackage.sh index c018a81158..0878c2e792 100755 --- a/packaging/testpackage.sh +++ b/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 + wgetFile taosTools-2.1.3-Linux-x64.tar.gz . + tar xf taosTools-2.1.3-Linux-x64.tar.gz cd taosTools-2.1.2 && 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 =====" From 9465b356e8881785362e32a63fda9c0f2b51ec6c Mon Sep 17 00:00:00 2001 From: tomchon Date: Thu, 8 Sep 2022 11:15:33 +0800 Subject: [PATCH 2/3] modify version of taos-tools --- packaging/testpackage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/testpackage.sh b/packaging/testpackage.sh index 0878c2e792..794b3968fe 100755 --- a/packaging/testpackage.sh +++ b/packaging/testpackage.sh @@ -234,7 +234,7 @@ if [[ ${packgeName} =~ "Lite" ]] || ([[ ${packgeName} =~ "x64" ]] && [[ ${pac cd ${installPath} wgetFile taosTools-2.1.3-Linux-x64.tar.gz . tar xf taosTools-2.1.3-Linux-x64.tar.gz - cd taosTools-2.1.2 && bash install-taostools.sh + 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} From df24670881542ab3e3194b4d6a9744ff79760179 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Thu, 8 Sep 2022 16:16:09 +0800 Subject: [PATCH 3/3] fix: more bits from timestamp & S.N. --- source/util/src/tuuid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/util/src/tuuid.c b/source/util/src/tuuid.c index 9101aec949..7460ccbc82 100644 --- a/source/util/src/tuuid.c +++ b/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; }