From cbdeb351dfece5125cb9e8f9967faa0da94865f9 Mon Sep 17 00:00:00 2001 From: slguan Date: Fri, 6 Dec 2019 13:53:26 +0800 Subject: [PATCH 1/6] version.c --- src/util/src/version.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/src/version.c b/src/util/src/version.c index ed83066f80..91c73c9608 100644 --- a/src/util/src/version.c +++ b/src/util/src/version.c @@ -1,4 +1,4 @@ -char version[64] = "1.6.4.0"; +char version[64] = "1.6.4.3"; char compatible_version[64] = "1.6.1.0"; -char gitinfo[128] = "6d27c11e3b23ae69366df366a6517853648c41f7"; -char buildinfo[512] = "Built by ubuntu at 2019-12-01 12:27"; +char gitinfo[128] = "e6445addc77e8c96dcb57221fa6ab5dcde0458f7"; +char buildinfo[512] = "Built by ubuntu at 2019-12-06 13:52"; From c972e1ca8f5c7c2aa271e47f4b5fdf061c6e2358 Mon Sep 17 00:00:00 2001 From: slguan Date: Fri, 6 Dec 2019 13:59:39 +0800 Subject: [PATCH 2/6] version.c --- src/util/src/version.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/src/version.c b/src/util/src/version.c index 91c73c9608..df490eb0aa 100644 --- a/src/util/src/version.c +++ b/src/util/src/version.c @@ -1,4 +1,4 @@ -char version[64] = "1.6.4.3"; +char version[64] = "1.6.4.2"; char compatible_version[64] = "1.6.1.0"; char gitinfo[128] = "e6445addc77e8c96dcb57221fa6ab5dcde0458f7"; -char buildinfo[512] = "Built by ubuntu at 2019-12-06 13:52"; +char buildinfo[512] = "Built by ubuntu at 2019-12-06 13:59"; From 103b8794da28359c9d19533a59625faa6bc3b968 Mon Sep 17 00:00:00 2001 From: lihui Date: Tue, 10 Dec 2019 10:36:12 +0800 Subject: [PATCH 3/6] [TBASE-1142/1319] --- packaging/release.sh | 1 + packaging/tools/install.sh | 4 ++-- packaging/tools/makeclient.sh | 5 ++--- src/inc/tglobalcfg.h | 1 + src/system/detail/src/dnodeService.c | 1 + src/util/src/tglobalcfg.c | 3 +++ src/util/src/version.c | 5 +++-- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packaging/release.sh b/packaging/release.sh index 58f69589d8..08edce249e 100755 --- a/packaging/release.sh +++ b/packaging/release.sh @@ -109,6 +109,7 @@ build_time=$(date +"%F %R") echo "char version[64] = \"${version}\";" > ${versioninfo} echo "char compatible_version[64] = \"${compatible_version}\";" >> ${versioninfo} echo "char gitinfo[128] = \"$(git rev-parse --verify HEAD)\";" >> ${versioninfo} +echo "char gitinfoOfInternal[128] = \"\";" >> ${versioninfo} echo "char buildinfo[512] = \"Built by ${USER} at ${build_time}\";" >> ${versioninfo} # 2. cmake executable file diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh index 019e614e0b..e1bcce401d 100755 --- a/packaging/tools/install.sh +++ b/packaging/tools/install.sh @@ -313,9 +313,9 @@ vercomp () { function is_version_compatible() { - curr_version=$(${bin_dir}/taosd -V | head -1 | cut -d ' ' -f 2) + curr_version=$(${bin_dir}/taosd -V | head -1 | cut -d ' ' -f 3) - min_compatible_version=$(${script_dir}/bin/taosd -V | head -1 | cut -d ' ' -f 4) + min_compatible_version=$(${script_dir}/bin/taosd -V | head -1 | cut -d ' ' -f 5) vercomp $curr_version $min_compatible_version case $? in diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh index b4948bb3a7..f8d21e202b 100755 --- a/packaging/tools/makeclient.sh +++ b/packaging/tools/makeclient.sh @@ -17,7 +17,6 @@ top_dir="$(readlink -m ${script_dir}/../..)" build_dir="${compile_dir}/build" code_dir="${top_dir}/src" release_dir="${top_dir}/release" -community_dir="${script_dir}/../../../community/src" #package_name='linux' install_dir="${release_dir}/TDengine-client-${version}" @@ -25,7 +24,7 @@ install_dir="${release_dir}/TDengine-client-${version}" # Directories and files. bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdump ${script_dir}/remove_client.sh" lib_files="${build_dir}/lib/libtaos.so.${version}" -header_files="${community_dir}/inc/taos.h ${community_dir}/inc/taoserror.h" +header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h" cfg_dir="${top_dir}/packaging/cfg" install_files="${script_dir}/install_client.sh" @@ -55,7 +54,7 @@ mkdir -p ${install_dir}/driver cp ${lib_files} ${install_dir}/driver # Copy connector -connector_dir="${community_dir}/connector" +connector_dir="${code_dir}/connector" mkdir -p ${install_dir}/connector cp ${build_dir}/lib/*.jar ${install_dir}/connector cp -r ${connector_dir}/grafana ${install_dir}/connector/ diff --git a/src/inc/tglobalcfg.h b/src/inc/tglobalcfg.h index ede3c97ce9..63cff06e83 100644 --- a/src/inc/tglobalcfg.h +++ b/src/inc/tglobalcfg.h @@ -179,6 +179,7 @@ extern int tsUdpDelay; extern char version[]; extern char compatible_version[]; extern char gitinfo[]; +extern char gitinfoOfInternal[]; extern char buildinfo[]; extern char tsTimezone[64]; diff --git a/src/system/detail/src/dnodeService.c b/src/system/detail/src/dnodeService.c index f03bd5f3bb..2de60bda91 100644 --- a/src/system/detail/src/dnodeService.c +++ b/src/system/detail/src/dnodeService.c @@ -62,6 +62,7 @@ int main(int argc, char *argv[]) { #endif printf("gitinfo: %s\n", gitinfo); + printf("gitinfoI: %s\n", gitinfoOfInternal); printf("buildinfo: %s\n", buildinfo); return 0; } else if (strcmp(argv[i], "-k") == 0) { diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c index cef11d30cb..00da094d5f 100644 --- a/src/util/src/tglobalcfg.c +++ b/src/util/src/tglobalcfg.c @@ -783,6 +783,9 @@ static void doInitGlobalConfig() { tsInitConfigOption(cfg++, "gitinfo", gitinfo, TSDB_CFG_VTYPE_STRING, TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT, 0, 0, 0, TSDB_CFG_UTYPE_NONE); + tsInitConfigOption(cfg++, "gitinfoOfInternal", gitinfoOfInternal, TSDB_CFG_VTYPE_STRING, + TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT, + 0, 0, 0, TSDB_CFG_UTYPE_NONE); tsInitConfigOption(cfg++, "buildinfo", buildinfo, TSDB_CFG_VTYPE_STRING, TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT, 0, 0, 0, TSDB_CFG_UTYPE_NONE); diff --git a/src/util/src/version.c b/src/util/src/version.c index df490eb0aa..4f88d6170c 100644 --- a/src/util/src/version.c +++ b/src/util/src/version.c @@ -1,4 +1,5 @@ char version[64] = "1.6.4.2"; char compatible_version[64] = "1.6.1.0"; -char gitinfo[128] = "e6445addc77e8c96dcb57221fa6ab5dcde0458f7"; -char buildinfo[512] = "Built by ubuntu at 2019-12-06 13:59"; +char gitinfo[128] = "b9a62d60dc1d4a41452a9bc94e3a0924485c3a75"; +char gitinfoOfInternal[128] = "e6445addc77e8c96dcb57221fa6ab5dcde0458f7"; +char buildinfo[512] = "Built by root at 2019-12-10 10:31"; From e08aa1ab038aa8d2f493d4c407a7280c99935c1c Mon Sep 17 00:00:00 2001 From: haojun Liao Date: Tue, 10 Dec 2019 17:45:41 +0800 Subject: [PATCH 4/6] Update tscUtil.c fix bugs in issue #898 --- src/client/src/tscUtil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index baafb57f6a..52e19ce244 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -236,7 +236,7 @@ bool tscProjectionQueryOnMetric(SSqlCmd* pCmd) { SSqlExpr* pExpr = tscSqlExprGet(pCmd, i); int32_t functionId = pExpr->functionId; if (functionId != TSDB_FUNC_PRJ && functionId != TSDB_FUNC_TAGPRJ && - functionId != TSDB_FUNC_TAG && functionId != TSDB_FUNC_TS) { + functionId != TSDB_FUNC_TAG && functionId != TSDB_FUNC_TS && functionId != TSDB_FUNC_ARITHM) { return false; } } From 7538f4e7553469b28c7a86c9656720e20d75c785 Mon Sep 17 00:00:00 2001 From: haojun Liao Date: Tue, 10 Dec 2019 17:57:06 +0800 Subject: [PATCH 5/6] Update tscSQLParser.c --- src/client/src/tscSQLParser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index ba465c28b9..b6b2c0fd18 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -5336,7 +5336,8 @@ static int32_t checkUpdateTagPrjFunctions(SSqlCmd* pCmd) { for (int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) { int16_t functionId = tscSqlExprGet(pCmd, i)->functionId; - if (functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TS) { + if (functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TS || + functionId == TSDB_FUNC_ARITHM) { continue; } From a26f368c21fbfe48a0fffc7885f5b5b89d4690ba Mon Sep 17 00:00:00 2001 From: slguan Date: Tue, 10 Dec 2019 19:18:16 +0800 Subject: [PATCH 6/6] [TBASE-1325] --- src/system/detail/src/mgmtDnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/system/detail/src/mgmtDnode.c b/src/system/detail/src/mgmtDnode.c index 86550b46e7..8ab8cc13ba 100644 --- a/src/system/detail/src/mgmtDnode.c +++ b/src/system/detail/src/mgmtDnode.c @@ -59,7 +59,7 @@ void mgmtCalcNumOfFreeVnodes(SDnodeObj *pDnode) { if (pVload->vgId != 0) { mTrace("%d-dnode:%s, calc free vnodes, exist vnode:%d, vgroup:%d, state:%d %s, dropstate:%d %s, syncstatus:%d %s", totalVnodes, taosIpStr(pDnode->privateIp), i, pVload->vgId, - pVload->status, taosGetDnodeStatusStr(pVload->status), + pVload->status, taosGetVnodeStatusStr(pVload->status), pVload->dropStatus, taosGetVnodeDropStatusStr(pVload->dropStatus), pVload->syncStatus, taosGetVnodeSyncStatusStr(pVload->syncStatus)); totalVnodes++;