diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index 570e2e1acd0391f2f59f56b9b68b52e38310da14..d6a9447e3d192120a2712b46d1b2310c2732344f 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 922aafed7f9344ad908893cb6c7e6278a541bf35..6d0c565c3022f09460a4ec3eb84bc66c797030b7 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 f2b54ec000091914f49a5f1b94b97cffc1bed8e6..7c98556e995d4401ad74b8350ab27f0b396a269a 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 675de57924ccb46650085510079459a6c678f454..491e65979a5fc934970a6d899ac09e7dd06ceb07 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++;