Merge branch 'master' into feature/slguan

# Conflicts:
#	src/util/src/version.c

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

src/client/src/tscSQLParser.c

@@ -5373,7 +5373,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;
     }
 

src/client/src/tscUtil.c

@@ -246,7 +246,7 @@ bool tscProjectionQueryOnMetric(SSqlCmd* pCmd) {
   for (int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
     int32_t functionId = tscSqlExprGet(pCmd, i)->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;
     }
   }

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];

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) {

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++;

src/util/src/tglobalcfg.c

@@ -788,6 +788,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);

src/util/src/version.c

-char version[64] = "1.6.4.1";
+
+char version[64] = "1.6.4.2";
 char compatible_version[64] = "1.6.1.0";
-char gitinfo[128] = "893fac9da79ef9b88355fcd18d29057adf909bbd";
-char buildinfo[512] = "Built by ubuntu at 2019-12-02 22:21";
+char gitinfo[128] = "b9a62d60dc1d4a41452a9bc94e3a0924485c3a75";
+char gitinfoOfInternal[128] = "e6445addc77e8c96dcb57221fa6ab5dcde0458f7";
+char buildinfo[512] = "Built by root at 2019-12-10 10:31";
\ No newline at end of file