From 97f16ecb65aaf32dbdb2121a000f9b5fb9540a87 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 4 Nov 2021 14:45:48 +0800 Subject: [PATCH] minor changes --- include/common/taosmsg.h | 10 +++++----- include/server/vnode/vnode.h | 2 +- include/util/tdef.h | 3 ++- source/common/src/tname.c | 2 +- source/dnode/mgmt/src/dnodeVnodes.c | 2 +- source/dnode/mnode/inc/mnodeDef.h | 6 +++--- source/libs/parser/src/parserUtil.c | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/common/taosmsg.h b/include/common/taosmsg.h index 822f850018..2ccab41f8f 100644 --- a/include/common/taosmsg.h +++ b/include/common/taosmsg.h @@ -325,7 +325,7 @@ typedef struct { typedef struct { char tableFname[TSDB_TABLE_FNAME_LEN]; - char db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + char db[TSDB_FULL_DB_NAME_LEN]; int16_t type; /* operation type */ int16_t numOfCols; /* number of schema */ int32_t tagValLen; @@ -570,7 +570,7 @@ typedef struct SRetrieveTableRsp { } SRetrieveTableRsp; typedef struct { - char db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + char db[TSDB_FULL_DB_NAME_LEN]; int32_t cacheBlockSize; //MB int32_t totalBlocks; int32_t maxTables; @@ -701,7 +701,7 @@ typedef struct { } SVnodeDesc; typedef struct { - char db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + char db[TSDB_FULL_DB_NAME_LEN]; uint32_t vgId; int32_t cacheBlockSize; int32_t totalBlocks; @@ -804,13 +804,13 @@ typedef struct { */ typedef struct { int8_t type; - char db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + char db[TSDB_FULL_DB_NAME_LEN]; uint16_t payloadLen; char payload[]; } SShowMsg; typedef struct { - char db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + char db[TSDB_FULL_DB_NAME_LEN]; int32_t numOfVgroup; int32_t vgid[]; } SCompactMsg; diff --git a/include/server/vnode/vnode.h b/include/server/vnode/vnode.h index 6db0eb86f6..16699b855a 100644 --- a/include/server/vnode/vnode.h +++ b/include/server/vnode/vnode.h @@ -27,7 +27,7 @@ extern "C" { typedef struct SVnode SVnode; typedef struct { - char db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + char db[TSDB_FULL_DB_NAME_LEN]; int32_t cacheBlockSize; // MB int32_t totalBlocks; int32_t daysPerFile; diff --git a/include/util/tdef.h b/include/util/tdef.h index 80cd3cf8b8..66e5f28bde 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -153,11 +153,12 @@ do { \ #define TSDB_NODE_NAME_LEN 64 #define TSDB_TABLE_NAME_LEN 193 // it is a null-terminated string #define TSDB_DB_NAME_LEN 33 +#define TSDB_FULL_DB_NAME_LEN (TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN) #define TSDB_FUNC_NAME_LEN 65 #define TSDB_FUNC_CODE_LEN (65535 - 512) #define TSDB_FUNC_BUF_SIZE 512 #define TSDB_TYPE_STR_MAX_LEN 32 -#define TSDB_TABLE_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN + TSDB_TABLE_NAME_LEN) +#define TSDB_TABLE_FNAME_LEN (TSDB_FULL_DB_NAME_LEN + TSDB_TABLE_NAME_LEN) #define TSDB_COL_NAME_LEN 65 #define TSDB_MAX_SAVED_SQL_LEN TSDB_MAX_COLUMNS * 64 #define TSDB_MAX_SQL_LEN TSDB_PAYLOAD_SIZE diff --git a/source/common/src/tname.c b/source/common/src/tname.c index c290a04ebc..28f920a6a9 100644 --- a/source/common/src/tname.c +++ b/source/common/src/tname.c @@ -201,7 +201,7 @@ int32_t tNameExtractFullName(const SName* name, char* dst) { return -1; } - int32_t len = snprintf(dst, TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN, "%s.%s", name->acctId, name->dbname); + int32_t len = snprintf(dst, TSDB_FULL_DB_NAME_LEN, "%s.%s", name->acctId, name->dbname); size_t tnameLen = strlen(name->tname); if (tnameLen > 0) { diff --git a/source/dnode/mgmt/src/dnodeVnodes.c b/source/dnode/mgmt/src/dnodeVnodes.c index 46b79c84a0..c7682539ef 100644 --- a/source/dnode/mgmt/src/dnodeVnodes.c +++ b/source/dnode/mgmt/src/dnodeVnodes.c @@ -333,7 +333,7 @@ static int32_t dnodeParseCreateVnodeReq(SRpcMsg *rpcMsg, int32_t *vgId, SVnodeCf SCreateVnodeMsg *pCreate = rpcMsg->pCont; *vgId = htonl(pCreate->vgId); - tstrncpy(pCfg->db, pCreate->db, TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN); + tstrncpy(pCfg->db, pCreate->db, TSDB_FULL_DB_NAME_LEN); pCfg->cacheBlockSize = htonl(pCreate->cacheBlockSize); pCfg->totalBlocks = htonl(pCreate->totalBlocks); pCfg->daysPerFile = htonl(pCreate->daysPerFile); diff --git a/source/dnode/mnode/inc/mnodeDef.h b/source/dnode/mnode/inc/mnodeDef.h index 33606e8ee2..0825815bc7 100644 --- a/source/dnode/mnode/inc/mnodeDef.h +++ b/source/dnode/mnode/inc/mnodeDef.h @@ -208,7 +208,7 @@ typedef struct { typedef struct SDbObj { SdbHead head; - char name[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + char name[TSDB_FULL_DB_NAME_LEN]; char acct[TSDB_USER_LEN]; int64_t createdTime; int64_t updateTime; @@ -236,7 +236,7 @@ typedef struct SVgObj { int64_t updateTime; int32_t lbDnodeId; int32_t lbTime; - char dbName[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + char dbName[TSDB_FULL_DB_NAME_LEN]; int8_t inUse; int8_t accessState; int8_t status; @@ -288,7 +288,7 @@ typedef struct { void *pIter; void *pVgIter; void **ppShow; - char db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + char db[TSDB_FULL_DB_NAME_LEN]; int16_t offset[TSDB_MAX_COLUMNS]; int32_t bytes[TSDB_MAX_COLUMNS]; char payload[]; diff --git a/source/libs/parser/src/parserUtil.c b/source/libs/parser/src/parserUtil.c index 0bef796026..5aab21bdae 100644 --- a/source/libs/parser/src/parserUtil.c +++ b/source/libs/parser/src/parserUtil.c @@ -1934,7 +1934,7 @@ char* cloneCurrentDBName(SSqlObj* pSql) { case TAOS_REQ_FROM_HTTP: pCtx = pSql->param; if (pCtx && pCtx->db[0] != '\0') { - char db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN] = {0}; + char db[TSDB_FULL_DB_NAME_LEN] = {0}; int32_t len = sprintf(db, "%s%s%s", pTscObj->acctId, TS_PATH_DELIMITER, pCtx->db); assert(len <= sizeof(db));