From 1a52be002fdbcd089df27a5d13c65551d326a9a0 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Tue, 24 Mar 2020 23:54:22 +0800
Subject: [PATCH] =?UTF-8?q?[TD-9]=20update=20show=20tables=E2=80=99=20tabl?=
 =?UTF-8?q?eId=20len?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/inc/taosdef.h              | 2 +-
 src/mnode/inc/mgmtSuperTable.h | 3 ++-
 src/mnode/src/mgmtSuperTable.c | 5 +++++
 src/mnode/src/mgmtTable.c      | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index 570e2e1acd..d6a9447e3d 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -176,7 +176,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_MAX_COLUMNS          256
 #define TSDB_MIN_COLUMNS          2       //PRIMARY COLUMN(timestamp) + other columns
 
-#define TSDB_DNODE_NAME_LEN       63
+#define TSDB_DNODE_NAME_LEN       64
 #define TSDB_TABLE_NAME_LEN       192
 #define TSDB_DB_NAME_LEN          32
 #define TSDB_COL_NAME_LEN         64
diff --git a/src/mnode/inc/mgmtSuperTable.h b/src/mnode/inc/mgmtSuperTable.h
index 922aafed7f..6d0c565c30 100644
--- a/src/mnode/inc/mgmtSuperTable.h
+++ b/src/mnode/inc/mgmtSuperTable.h
@@ -45,7 +45,8 @@ void *  mgmtGetSuperTableVgroup(SSuperTableObj *pStable);
 int32_t mgmtFindSuperTableTagIndex(SSuperTableObj *pTable, const char *tagName);
 int32_t mgmtSetSchemaFromSuperTable(SSchema *pSchema, SSuperTableObj *pTable);
 
-void mgmtDropAllSuperTables(SDbObj *pDropDb);
+void    mgmtDropAllSuperTables(SDbObj *pDropDb);
+int32_t mgmtExtractTableName(const char* tableId, char* name);
 
 #ifdef __cplusplus
 }
diff --git a/src/mnode/src/mgmtSuperTable.c b/src/mnode/src/mgmtSuperTable.c
index f2b54ec000..7c98556e99 100644
--- a/src/mnode/src/mgmtSuperTable.c
+++ b/src/mnode/src/mgmtSuperTable.c
@@ -624,3 +624,8 @@ int32_t mgmtGetSuperTableMeta(SDbObj *pDb, SSuperTableObj *pTable, STableMetaMsg
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t mgmtExtractTableName(const char* tableId, char* name) {
+  char* r = skipSegments(tableId, TS_PATH_DELIMITER[0], 2);
+  return copy(name, r, TS_PATH_DELIMITER[0]);
+}
+
diff --git a/src/mnode/src/mgmtTable.c b/src/mnode/src/mgmtTable.c
index 675de57924..491e65979a 100644
--- a/src/mnode/src/mgmtTable.c
+++ b/src/mnode/src/mgmtTable.c
@@ -310,7 +310,7 @@ int32_t mgmtRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, void *
     numOfRead++;
 
     // pattern compare for meter name
-    extractTableName(tableId, tableName);
+    mgmtExtractTableName(tableId, tableName);
 
     if (pShow->payloadLen > 0 &&
         patternMatch(pShow->payload, tableName, TSDB_TABLE_NAME_LEN, &info) != TSDB_PATTERN_MATCH) {
@@ -333,7 +333,7 @@ int32_t mgmtRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, void *
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
     if (superTableId != NULL) {
-      extractTableName(superTableId, pWrite);
+      mgmtExtractTableName(superTableId, pWrite);
     }
     cols++;
 
-- 
GitLab