Merge pull request #887 from taosdata/feature/lihui

[TBASE-1319]

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/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/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 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] = "27f51a5cea1bdcb0e7b2ef0df5649e59e6ae38ed";
+char gitinfoOfInternal[128] = "afd592a8d3aedfd7e90d5510840ba3fc73e36160";
+char buildinfo[512] = "Built by root at 2019-12-09 17:39";