From cb012d5c469a9883a1a558810435c8f75fd298c1 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 11 Feb 2022 13:20:00 +0800 Subject: [PATCH] minor changes --- source/dnode/mnode/impl/inc/mndDef.h | 2 +- source/dnode/mnode/impl/src/mndDb.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index 7c346edbea..c4897a635c 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -261,7 +261,7 @@ typedef struct { typedef struct { char name[TSDB_DB_FNAME_LEN]; char acct[TSDB_USER_LEN]; - char createdUser[TSDB_USER_LEN]; + char createUser[TSDB_USER_LEN]; int64_t createdTime; int64_t updateTime; uint64_t uid; diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c index 04c6c3dfa8..5ed3e9e8df 100644 --- a/source/dnode/mnode/impl/src/mndDb.c +++ b/source/dnode/mnode/impl/src/mndDb.c @@ -73,7 +73,7 @@ static SSdbRaw *mndDbActionEncode(SDbObj *pDb) { int32_t dataPos = 0; SDB_SET_BINARY(pRaw, dataPos, pDb->name, TSDB_DB_FNAME_LEN, DB_ENCODE_OVER) SDB_SET_BINARY(pRaw, dataPos, pDb->acct, TSDB_USER_LEN, DB_ENCODE_OVER) - SDB_SET_BINARY(pRaw, dataPos, pDb->createdUser, TSDB_USER_LEN, DB_ENCODE_OVER) + SDB_SET_BINARY(pRaw, dataPos, pDb->createUser, TSDB_USER_LEN, DB_ENCODE_OVER) SDB_SET_INT64(pRaw, dataPos, pDb->createdTime, DB_ENCODE_OVER) SDB_SET_INT64(pRaw, dataPos, pDb->updateTime, DB_ENCODE_OVER) SDB_SET_INT64(pRaw, dataPos, pDb->uid, DB_ENCODE_OVER) @@ -134,7 +134,7 @@ static SSdbRow *mndDbActionDecode(SSdbRaw *pRaw) { int32_t dataPos = 0; SDB_GET_BINARY(pRaw, dataPos, pDb->name, TSDB_DB_FNAME_LEN, DB_DECODE_OVER) SDB_GET_BINARY(pRaw, dataPos, pDb->acct, TSDB_USER_LEN, DB_DECODE_OVER) - SDB_GET_BINARY(pRaw, dataPos, pDb->createdUser, TSDB_USER_LEN, DB_DECODE_OVER) + SDB_GET_BINARY(pRaw, dataPos, pDb->createUser, TSDB_USER_LEN, DB_DECODE_OVER) SDB_GET_INT64(pRaw, dataPos, &pDb->createdTime, DB_DECODE_OVER) SDB_GET_INT64(pRaw, dataPos, &pDb->updateTime, DB_DECODE_OVER) SDB_GET_INT64(pRaw, dataPos, &pDb->uid, DB_DECODE_OVER) @@ -390,6 +390,7 @@ static int32_t mndCreateDb(SMnode *pMnode, SMnodeMsg *pReq, SCreateDbReq *pCreat dbObj.cfgVersion = 1; dbObj.vgVersion = 1; dbObj.hashMethod = 1; + memcpy(dbObj.createUser, pUser->user, TSDB_USER_LEN); dbObj.cfg = (SDbCfg){.numOfVgroups = pCreate->numOfVgroups, .cacheBlockSize = pCreate->cacheBlockSize, .totalBlocks = pCreate->totalBlocks, -- GitLab