Merge pull request #25823 from taosdata/feat/TD-30053-3.0

feat(grant): support industry edition
taosdata · Jun 7, 2024 · 0e512c7 · 0e512c7
2 parents 00f8ea8 + 7de2928
commit 0e512c7
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 39 deletions.
diff --git a/cmake/cmake.version b/cmake/cmake.version
@@ -11,6 +11,10 @@ ELSE ()
   SET(TD_VER_COMPATIBLE "3.0.0.0")
 ENDIF ()
 
+IF (TD_PRODUCT_NAME)
+  ADD_DEFINITIONS(-DTD_PRODUCT_NAME="${TD_PRODUCT_NAME}")
+ENDIF ()
+
 find_program(HAVE_GIT NAMES git)
 
 IF (DEFINED GITINFO)

diff --git a/include/common/tgrant.h b/include/common/tgrant.h
@@ -73,7 +73,7 @@ char   *tGetMachineId();
 #ifdef TD_ENTERPRISE
 #define GRANTS_SCHEMA                                                                                              \
   static const SSysDbTableSchema grantsSchema[] = {                                                                \
-      {.name = "version", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},       \
+      {.name = "version", .bytes = 32 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},      \
       {.name = "expire_time", .bytes = 19 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},  \
       {.name = "service_time", .bytes = 19 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true}, \
       {.name = "expired", .bytes = 5 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},       \
@@ -85,7 +85,7 @@ char   *tGetMachineId();
 #else
 #define GRANTS_SCHEMA                                                                                              \
   static const SSysDbTableSchema grantsSchema[] = {                                                                \
-      {.name = "version", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},       \
+      {.name = "version", .bytes = 32 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},      \
       {.name = "expire_time", .bytes = 19 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},  \
       {.name = "service_time", .bytes = 19 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true}, \
       {.name = "expired", .bytes = 5 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},       \

diff --git a/include/util/tdef.h b/include/util/tdef.h
@@ -78,6 +78,14 @@ extern const int32_t TYPE_BYTES[21];
 #define TSDB_DEFAULT_PASS "taosdata"
 #endif
 
+#ifndef TD_PRODUCT_NAME
+#ifdef TD_ENTERPRISE
+#define TD_PRODUCT_NAME "TDengine Enterprise Edition"
+#else
+#define TD_PRODUCT_NAME "TDengine Community Edition"
+#endif
+#endif
+
 #define TSDB_TRUE  1
 #define TSDB_FALSE 0
 #define TSDB_OK    0

diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c
@@ -258,17 +258,12 @@ static void dmPrintArgs(int32_t argc, char const *argv[]) {
 static void dmGenerateGrant() { mndGenerateMachineCode(); }
 
 static void dmPrintVersion() {
+  printf("%s\ntaosd version: %s compatible_version: %s\n", TD_PRODUCT_NAME, version, compatible_version);
+  printf("git: %s\n", gitinfo);
 #ifdef TD_ENTERPRISE
-  char *releaseName = "enterprise";
-#else
-  char *releaseName = "community";
-#endif
-  printf("%s version: %s compatible_version: %s\n", releaseName, version, compatible_version);
-  printf("gitinfo: %s\n", gitinfo);
-#ifdef TD_ENTERPRISE
-  printf("gitinfoOfInternal: %s\n", gitinfoOfInternal);
+  printf("git: %s\n", gitinfoOfInternal);
 #endif
-  printf("buildInfo: %s\n", buildinfo);
+  printf("build: %s\n", buildinfo);
 }
 
 static void dmPrintHelp() {

diff --git a/source/dnode/mnode/impl/src/mndGrant.c b/source/dnode/mnode/impl/src/mndGrant.c
@@ -36,8 +36,7 @@ static int32_t mndRetrieveGrant(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
   if (pShow->numOfRows < 1) {
     cols = 0;
     SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
-    const char      *src = "community";
-    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, TD_PRODUCT_NAME, 32);
     colDataSetVal(pColInfo, numOfRows, tmp, false);
 
     GRANT_ITEM_SHOW("unlimited");

diff --git a/source/libs/function/src/udfd.c b/source/libs/function/src/udfd.c
@@ -1242,14 +1242,9 @@ static int32_t udfdParseArgs(int32_t argc, char *argv[]) {
 }
 
 static void udfdPrintVersion() {
-#ifdef TD_ENTERPRISE
-  char *releaseName = "enterprise";
-#else
-  char *releaseName = "community";
-#endif
-  printf("%s version: %s compatible_version: %s\n", releaseName, version, compatible_version);
-  printf("gitinfo: %s\n", gitinfo);
-  printf("buildInfo: %s\n", buildinfo);
+  printf("udfd version: %s compatible_version: %s\n", version, compatible_version);
+  printf("git: %s\n", gitinfo);
+  printf("build: %s\n", buildinfo);
 }
 
 static int32_t udfdInitLog() {

diff --git a/source/util/src/version.c.in b/source/util/src/version.c.in
@@ -2,6 +2,6 @@ char version[64] = "${TD_VER_NUMBER}";
 char compatible_version[12] = "${TD_VER_COMPATIBLE}";
 char gitinfo[48] = "${TD_VER_GIT}";
 char gitinfoOfInternal[48] = "${TD_VER_GIT_INTERNAL}";
-char buildinfo[64] = "Built ${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} at ${TD_VER_DATE}";
+char buildinfo[64] = "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}";
 
 void libtaos_${TD_LIB_VER_NUMBER}_${TD_VER_OSTYPE}_${TD_VER_CPUTYPE}_${TD_VER_VERTYPE}() {};
diff --git a/tests/system-test/0-others/information_schema.py b/tests/system-test/0-others/information_schema.py
@@ -269,6 +269,10 @@ def ins_dnodes_check(self):
 
     def ins_grants_check(self):
         grant_name_dict = {
+            'service':'Service Time',
+            'timeseries':'Timeseries',
+            'dnodes':'Dnodes',
+            'cpu_cores':'CPU Cores',
             'stream':'Stream',
             'subscription':'Subscription',
             'view':'View',
@@ -293,6 +297,7 @@ def ins_grants_check(self):
             'mysql':'MySQL',
             'postgres':'PostgreSQL',
             'oracle':'Oracle',
+            'mssql':'SqlServer'
         }
 
         tdSql.execute('drop database if exists db2')
@@ -304,7 +309,7 @@ def ins_grants_check(self):
             if result[i][0] in grant_name_dict:
                 tdSql.checkEqual(result[i][1], grant_name_dict[result[i][0]])
                 index += 1
-        tdSql.checkEqual(index, 24)
+        tdSql.checkEqual(index, len(grant_name_dict))
         tdSql.query(f'select * from information_schema.ins_grants_logs')
         result = tdSql.queryResult
         tdSql.checkEqual(True, len(result) >= 0)

diff --git a/tests/system-test/0-others/show.py b/tests/system-test/0-others/show.py
@@ -186,17 +186,17 @@ def check_gitinfo(self):
         tdSql.query('show dnode 1 variables')
         for i in tdSql.queryResult:
             if i[1].lower() == "gitinfo":
-                taosd_gitinfo_sql = f"gitinfo: {i[2]}"
+                taosd_gitinfo_sql = f"git: {i[2]}"
         taos_gitinfo_sql = ''
         tdSql.query('show local variables')
         for i in tdSql.queryResult:
             if i[0].lower() == "gitinfo":
-                taos_gitinfo_sql = f"gitinfo: {i[1]}"
+                taos_gitinfo_sql = f"git: {i[1]}"
         taos_info = os.popen('taos -V').read()
-        taos_gitinfo = re.findall("^gitinfo.*",taos_info,re.M)
+        taos_gitinfo = re.findall("^git: .*",taos_info,re.M)
         tdSql.checkEqual(taos_gitinfo_sql,taos_gitinfo[0])
         taosd_info = os.popen('taosd -V').read()
-        taosd_gitinfo = re.findall("^gitinfo.*",taosd_info,re.M)
+        taosd_gitinfo = re.findall("^git: .*",taosd_info,re.M)
         tdSql.checkEqual(taosd_gitinfo_sql,taosd_gitinfo[0])
 
     def show_base(self):

diff --git a/tests/system-test/0-others/taosShell.py b/tests/system-test/0-others/taosShell.py
@@ -5,6 +5,7 @@
 import socket
 import os
 import platform
+import re
 if platform.system().lower() == 'windows':
     import wexpect as taosExpect
 else:
@@ -370,10 +371,11 @@ def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstr
         if retCode != "TAOS_OK":
             tdLog.exit("taos -V fail")
 
-        version = 'version: ' + version
-        retVal = retVal.replace("\n", "")
-        retVal = retVal.replace("\r", "")
-        if retVal.startswith(version) == False:
+        version = 'taos version: ' + version
+        # retVal = retVal.replace("\n", "")
+        # retVal = retVal.replace("\r", "")
+        taosVersion = re.findall((f'^%s'%(version)), retVal,re.M)
+        if len(taosVersion) == 0:
             print ("return version: [%s]"%retVal)
             print ("dict version: [%s]"%version)
             tdLog.exit("taos -V version not match")

diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
@@ -435,12 +435,12 @@ int32_t shellParseArgs(int32_t argc, char *argv[]) {
   shell.info.promptSize = strlen(shell.info.promptHeader);
 #ifdef TD_ENTERPRISE
   snprintf(shell.info.programVersion, sizeof(shell.info.programVersion),
-           "version: %s compatible_version: %s\ngitinfo: %s\ngitinfoOfInternal: %s\nbuildInfo: %s", version,
+           "%s\ntaos version: %s compatible_version: %s\ngit: %s\ngit: %s\nbuild: %s", TD_PRODUCT_NAME, version,
            compatible_version, gitinfo, gitinfoOfInternal, buildinfo);
 #else
   snprintf(shell.info.programVersion, sizeof(shell.info.programVersion),
-           "version: %s compatible_version: %s\ngitinfo: %s\nbuildInfo: %s", version, compatible_version, gitinfo,
-           buildinfo);
+           "%s\ntaos version: %s compatible_version: %s\ngit: %s\nbuild: %s", TD_PRODUCT_NAME, version,
+           compatible_version, gitinfo, buildinfo);
 #endif
 
 #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)

diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
@@ -1189,23 +1189,22 @@ bool shellGetGrantInfo(char* buf) {
       fprintf(stderr, "\r\nFailed to get grant information from server. Abort.\r\n");
       exit(0);
     }
-
-    char serverVersion[32] = {0};
+    char serverVersion[64] = {0};
     char expiretime[32] = {0};
     char expired[32] = {0};
 
-    memcpy(serverVersion, row[0], fields[0].bytes);
+    tstrncpy(serverVersion, row[0], 64);
     memcpy(expiretime, row[1], fields[1].bytes);
     memcpy(expired, row[2], fields[2].bytes);
 
     if (strcmp(serverVersion, "community") == 0) {
       community = true;
     } else if (strcmp(expiretime, "unlimited") == 0) {
       community = false;
-      sprintf(buf, "Server is Enterprise %s Edition, %s and will never expire.\r\n", serverVersion, sinfo);
+      sprintf(buf, "Server is %s, %s and will never expire.\r\n", serverVersion, sinfo);
     } else {
       community = false;
-      sprintf(buf, "Server is Enterprise %s Edition, %s and will expire at %s.\r\n", serverVersion, sinfo,
+      sprintf(buf, "Server is %s, %s and will expire at %s.\r\n", serverVersion, sinfo,
               expiretime);
     }