From 4910ea2971039df75139d18fcdaad639782cf504 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 11 Nov 2021 19:02:38 +0800 Subject: [PATCH] rename some variables --- include/dnode/mnode/sdb/sdb.h | 10 +++--- include/util/taoserror.h | 19 ++++++----- source/dnode/mnode/impl/src/mnodeAcct.c | 20 +++++------ source/dnode/mnode/impl/src/mnodeUser.c | 20 +++++------ source/dnode/mnode/sdb/src/sdb.c | 43 ++++++++++++++---------- source/dnode/mnode/transaction/src/trn.c | 18 +++++----- source/util/src/terror.c | 13 +++---- 7 files changed, 76 insertions(+), 67 deletions(-) diff --git a/include/dnode/mnode/sdb/sdb.h b/include/dnode/mnode/sdb/sdb.h index f58cbdfc56..f4a8ccd06e 100644 --- a/include/dnode/mnode/sdb/sdb.h +++ b/include/dnode/mnode/sdb/sdb.h @@ -27,7 +27,7 @@ extern "C" { (dataLen) -= (valLen); \ (pData) = (char *)(pData) + (valLen); \ } else { \ - code = TSDB_CODE_SDB_INVAID_RAW_DATA_LEN; \ + code = TSDB_CODE_SDB_INVALID_DATA_LEN; \ } \ } @@ -38,7 +38,7 @@ extern "C" { (dataLen) -= sizeof(int32_t); \ (pData) = (char *)(pData) + sizeof(int32_t); \ } else { \ - code = TSDB_CODE_SDB_INVAID_RAW_DATA_LEN; \ + code = TSDB_CODE_SDB_INVALID_DATA_LEN; \ } \ } @@ -49,7 +49,7 @@ extern "C" { (dataLen) -= sizeof(int64_t); \ (pData) = (char *)(pData) + sizeof(int64_t); \ } else { \ - code = TSDB_CODE_SDB_INVAID_RAW_DATA_LEN; \ + code = TSDB_CODE_SDB_INVALID_DATA_LEN; \ } \ } @@ -121,11 +121,11 @@ typedef struct { SdbInsertFp insertFp; SdbUpdateFp updateFp; SdbDeleteFp deleteFp; -} SSdbHandle; +} SSdbTable; int32_t sdbInit(); void sdbCleanup(); -void sdbSetHandle(SSdbHandle handle); +void sdbSetTable(SSdbTable table); int32_t sdbRead(); int32_t sdbWrite(SSdbRaw *pRaw); diff --git a/include/util/taoserror.h b/include/util/taoserror.h index 9669ccb0bf..b644f4c9a5 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -134,15 +134,16 @@ int32_t* taosGetErrno(); #define TSDB_CODE_MND_FAILED_TO_INIT_STEP TAOS_DEF_ERROR_CODE(0, 0x0314) //"failed to init components") -#define TSDB_CODE_SDB_INTERNAL_ERROR TAOS_DEF_ERROR_CODE(0, 0x0320) -#define TSDB_CODE_SDB_OUT_OF_MEMORY TAOS_DEF_ERROR_CODE(0, 0x0321) -#define TSDB_CODE_SDB_OBJ_ALREADY_THERE TAOS_DEF_ERROR_CODE(0, 0x0322) -#define TSDB_CODE_SDB_OBJ_NOT_THERE TAOS_DEF_ERROR_CODE(0, 0x0323) -#define TSDB_CODE_SDB_INVAID_RAW_DATA_VER TAOS_DEF_ERROR_CODE(0, 0x0324) -#define TSDB_CODE_SDB_INVAID_RAW_DATA_LEN TAOS_DEF_ERROR_CODE(0, 0x0325) -#define TSDB_CODE_SDB_INVALID_TABLE_TYPE TAOS_DEF_ERROR_CODE(0, 0x0326) -#define TSDB_CODE_SDB_INVAID_META_ROW TAOS_DEF_ERROR_CODE(0, 0x0327) -#define TSDB_CODE_SDB_INVAID_KEY_TYPE TAOS_DEF_ERROR_CODE(0, 0x0328) +#define TSDB_CODE_SDB_APP_ERROR TAOS_DEF_ERROR_CODE(0, 0x0320) +#define TSDB_CODE_SDB_OBJ_ALREADY_THERE TAOS_DEF_ERROR_CODE(0, 0x0321) +#define TSDB_CODE_SDB_OBJ_NOT_THERE TAOS_DEF_ERROR_CODE(0, 0x0322) +#define TSDB_CODE_SDB_INVALID_TABLE_TYPE TAOS_DEF_ERROR_CODE(0, 0x0323) +#define TSDB_CODE_SDB_INVALID_KEY_TYPE TAOS_DEF_ERROR_CODE(0, 0x0324) +#define TSDB_CODE_SDB_INVALID_ACTION_TYPE TAOS_DEF_ERROR_CODE(0, 0x0325) +#define TSDB_CODE_SDB_INVALID_STATUS_TYPE TAOS_DEF_ERROR_CODE(0, 0x0326) +#define TSDB_CODE_SDB_INVALID_DATA_VER TAOS_DEF_ERROR_CODE(0, 0x0327) +#define TSDB_CODE_SDB_INVALID_DATA_LEN TAOS_DEF_ERROR_CODE(0, 0x0328) +#define TSDB_CODE_SDB_INVALID_META_ROW TAOS_DEF_ERROR_CODE(0, 0x0329) #define TSDB_CODE_MND_DNODE_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x0330) //"DNode already exists") #define TSDB_CODE_MND_DNODE_NOT_EXIST TAOS_DEF_ERROR_CODE(0, 0x0331) //"DNode does not exist") diff --git a/source/dnode/mnode/impl/src/mnodeAcct.c b/source/dnode/mnode/impl/src/mnodeAcct.c index 8979ca2689..381d6a184e 100644 --- a/source/dnode/mnode/impl/src/mnodeAcct.c +++ b/source/dnode/mnode/impl/src/mnodeAcct.c @@ -47,7 +47,7 @@ static SSdbRaw *mnodeAcctActionEncode(SAcctObj *pAcct) { static SAcctObj *mnodeAcctActionDecode(SSdbRaw *pRaw) { if (pRaw->sver != ACCT_VER) { - terrno = TSDB_CODE_SDB_INVAID_RAW_DATA_VER; + terrno = TSDB_CODE_SDB_INVALID_DATA_VER; return NULL; } @@ -114,15 +114,15 @@ static int32_t mnodeCreateDefaultAcct() { } int32_t mnodeInitAcct() { - SSdbHandle handle = {.sdbType = SDB_ACCT, - .keyType = SDB_KEY_BINARY, - .deployFp = (SdbDeployFp)mnodeCreateDefaultAcct, - .encodeFp = (SdbEncodeFp)mnodeAcctActionEncode, - .decodeFp = (SdbDecodeFp)mnodeAcctActionDecode, - .insertFp = (SdbInsertFp)mnodeAcctActionInsert, - .updateFp = (SdbUpdateFp)mnodeAcctActionUpdate, - .deleteFp = (SdbDeleteFp)mnodeAcctActionDelete}; - sdbSetHandle(handle); + SSdbTable table = {.sdbType = SDB_ACCT, + .keyType = SDB_KEY_BINARY, + .deployFp = (SdbDeployFp)mnodeCreateDefaultAcct, + .encodeFp = (SdbEncodeFp)mnodeAcctActionEncode, + .decodeFp = (SdbDecodeFp)mnodeAcctActionDecode, + .insertFp = (SdbInsertFp)mnodeAcctActionInsert, + .updateFp = (SdbUpdateFp)mnodeAcctActionUpdate, + .deleteFp = (SdbDeleteFp)mnodeAcctActionDelete}; + sdbSetTable(table); return 0; } diff --git a/source/dnode/mnode/impl/src/mnodeUser.c b/source/dnode/mnode/impl/src/mnodeUser.c index 41ea0acc31..b15dc78ea9 100644 --- a/source/dnode/mnode/impl/src/mnodeUser.c +++ b/source/dnode/mnode/impl/src/mnodeUser.c @@ -45,7 +45,7 @@ static SSdbRaw *mnodeUserActionEncode(SUserObj *pUser) { static SUserObj *mnodeUserActionDecode(SSdbRaw *pRaw) { if (pRaw->sver != USER_VER) { - terrno = TSDB_CODE_SDB_INVAID_RAW_DATA_VER; + terrno = TSDB_CODE_SDB_INVALID_DATA_VER; return NULL; } @@ -234,15 +234,15 @@ static int32_t mnodeProcessCreateUserMsg(SMnodeMsg *pMsg) { } int32_t mnodeInitUser() { - SSdbHandle handle = {.sdbType = SDB_USER, - .keyType = SDB_KEY_BINARY, - .deployFp = (SdbDeployFp)mnodeCreateDefaultUsers, - .encodeFp = (SdbEncodeFp)mnodeUserActionEncode, - .decodeFp = (SdbDecodeFp)mnodeUserActionDecode, - .insertFp = (SdbInsertFp)mnodeUserActionInsert, - .updateFp = (SdbUpdateFp)mnodeUserActionUpdate, - .deleteFp = (SdbDeleteFp)mnodeUserActionDelete}; - sdbSetHandle(handle); + SSdbTable table = {.sdbType = SDB_USER, + .keyType = SDB_KEY_BINARY, + .deployFp = (SdbDeployFp)mnodeCreateDefaultUsers, + .encodeFp = (SdbEncodeFp)mnodeUserActionEncode, + .decodeFp = (SdbDecodeFp)mnodeUserActionDecode, + .insertFp = (SdbInsertFp)mnodeUserActionInsert, + .updateFp = (SdbUpdateFp)mnodeUserActionUpdate, + .deleteFp = (SdbDeleteFp)mnodeUserActionDelete}; + sdbSetTable(table); return 0; } diff --git a/source/dnode/mnode/sdb/src/sdb.c b/source/dnode/mnode/sdb/src/sdb.c index b8e0e04c02..7489a46552 100644 --- a/source/dnode/mnode/sdb/src/sdb.c +++ b/source/dnode/mnode/sdb/src/sdb.c @@ -21,17 +21,20 @@ static SSdbMgr tsSdb = {0}; static int32_t sdbCreateDir() { if (!taosMkDir(tsSdb.currDir)) { - mError("failed to create dir:%s", tsSdb.currDir); - return TAOS_SYSTEM_ERROR(errno); + terrno = TAOS_SYSTEM_ERROR(errno); + mError("failed to create dir:%s since %s", tsSdb.currDir, terrstr()); + return -1; } if (!taosMkDir(tsSdb.syncDir)) { - mError("failed to create dir:%s", tsSdb.syncDir); + terrno = TAOS_SYSTEM_ERROR(errno); + mError("failed to create dir:%s since %s", tsSdb.syncDir, terrstr()); return -1; } if (!taosMkDir(tsSdb.tmpDir)) { - mError("failed to create dir:%s", tsSdb.tmpDir); + terrno = TAOS_SYSTEM_ERROR(errno); + mError("failed to create dir:%s since %s", tsSdb.tmpDir, terrstr()); return -1; } @@ -41,8 +44,10 @@ static int32_t sdbCreateDir() { static int32_t sdbRunDeployFp() { for (int32_t i = SDB_START; i < SDB_MAX; ++i) { SdbDeployFp fp = tsSdb.deployFps[i]; - if (fp) { - (*fp)(); + if (fp == NULL) continue; + if ((*fp)() != 0) { + mError("failed to deploy sdb:%d since %s", i, terrstr()); + return -1; } } @@ -51,11 +56,13 @@ static int32_t sdbRunDeployFp() { static SHashObj *sdbGetHash(int32_t sdb) { if (sdb >= SDB_MAX || sdb <= SDB_START) { + terrno = TSDB_CODE_SDB_INVALID_TABLE_TYPE; return NULL; } SHashObj *hash = tsSdb.hashObjs[sdb]; if (hash == NULL) { + terrno = TSDB_CODE_SDB_APP_ERROR; return NULL; } @@ -112,7 +119,7 @@ static int32_t sdbReadDataFile() { } if (ret < sizeof(SSdbRaw)) { - code = TSDB_CODE_SDB_INTERNAL_ERROR; + code = TSDB_CODE_SDB_APP_ERROR; mError("failed to read file:%s since %s", file, tstrerror(code)); break; } @@ -159,7 +166,7 @@ static int32_t sdbWriteDataFile() { taosWriteFile(fd, pRaw, sizeof(SSdbRaw) + pRaw->dataLen); } else { taosHashCancelIterate(hash, pRow); - code = TSDB_CODE_SDB_INTERNAL_ERROR; + code = TSDB_CODE_SDB_APP_ERROR; break; } @@ -232,7 +239,7 @@ void sdbUnDeploy() {} int32_t sdbInit() { char path[PATH_MAX + 100]; - snprintf(path, PATH_MAX + 100, "%s%scurrent%s", tsMnodeDir, TD_DIRSEP, TD_DIRSEP); + snprintf(path, PATH_MAX + 100, "%s%scur%s", tsMnodeDir, TD_DIRSEP, TD_DIRSEP); tsSdb.currDir = strdup(path); snprintf(path, PATH_MAX + 100, "%s%ssync%s", tsMnodeDir, TD_DIRSEP, TD_DIRSEP); @@ -293,15 +300,15 @@ void sdbCleanup() { } } -void sdbSetHandle(SSdbHandle handle) { - ESdbType sdb = handle.sdbType; - tsSdb.keyTypes[sdb] = handle.keyType; - tsSdb.insertFps[sdb] = handle.insertFp; - tsSdb.updateFps[sdb] = handle.updateFp; - tsSdb.deleteFps[sdb] = handle.deleteFp; - tsSdb.deployFps[sdb] = handle.deployFp; - tsSdb.encodeFps[sdb] = handle.encodeFp; - tsSdb.decodeFps[sdb] = handle.decodeFp; +void sdbSetTable(SSdbTable table) { + ESdbType sdb = table.sdbType; + tsSdb.keyTypes[sdb] = table.keyType; + tsSdb.insertFps[sdb] = table.insertFp; + tsSdb.updateFps[sdb] = table.updateFp; + tsSdb.deleteFps[sdb] = table.deleteFp; + tsSdb.deployFps[sdb] = table.deployFp; + tsSdb.encodeFps[sdb] = table.encodeFp; + tsSdb.decodeFps[sdb] = table.decodeFp; } #if 0 diff --git a/source/dnode/mnode/transaction/src/trn.c b/source/dnode/mnode/transaction/src/trn.c index c4db404e7b..1f65eb72ad 100644 --- a/source/dnode/mnode/transaction/src/trn.c +++ b/source/dnode/mnode/transaction/src/trn.c @@ -61,7 +61,7 @@ SSdbRaw *trnActionEncode(STrans *pTrans) { STrans *trnActionDecode(SSdbRaw *pRaw) { if (pRaw->sver != TRN_VER) { - terrno = TSDB_CODE_SDB_INVAID_RAW_DATA_VER; + terrno = TSDB_CODE_SDB_INVALID_DATA_VER; return NULL; } @@ -223,14 +223,14 @@ int32_t trnAppendUndoAction(STrans *pTrans, SEpSet *pEpSet, void *pMsg) { } int32_t trnInit() { - SSdbHandle handle = {.sdbType = SDB_TRANS, - .keyType = SDB_KEY_INT32, - .encodeFp = (SdbEncodeFp)trnActionEncode, - .decodeFp = (SdbDecodeFp)trnActionDecode, - .insertFp = (SdbInsertFp)trnActionInsert, - .updateFp = (SdbUpdateFp)trnActionUpdate, - .deleteFp = (SdbDeleteFp)trnActionDelete}; - sdbSetHandle(handle); + SSdbTable table = {.sdbType = SDB_TRANS, + .keyType = SDB_KEY_INT32, + .encodeFp = (SdbEncodeFp)trnActionEncode, + .decodeFp = (SdbDecodeFp)trnActionDecode, + .insertFp = (SdbInsertFp)trnActionInsert, + .updateFp = (SdbUpdateFp)trnActionUpdate, + .deleteFp = (SdbDeleteFp)trnActionDelete}; + sdbSetTable(table); return 0; } diff --git a/source/util/src/terror.c b/source/util/src/terror.c index 7f396f4a53..2053554666 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -144,15 +144,16 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_FAILED_TO_START_SYNC, "failed to start sync" TAOS_DEFINE_ERROR(TSDB_CODE_MND_FAILED_TO_CREATE_DIR, "failed to create mnode dir") TAOS_DEFINE_ERROR(TSDB_CODE_MND_FAILED_TO_INIT_STEP, "failed to init components") -TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INTERNAL_ERROR, "Unexpected generic error in sdb") -TAOS_DEFINE_ERROR(TSDB_CODE_SDB_OUT_OF_MEMORY, "Out of memory in sdb") +TAOS_DEFINE_ERROR(TSDB_CODE_SDB_APP_ERROR, "Unexpected generic error in sdb") TAOS_DEFINE_ERROR(TSDB_CODE_SDB_OBJ_ALREADY_THERE, "Object already there") TAOS_DEFINE_ERROR(TSDB_CODE_SDB_OBJ_NOT_THERE, "Object not there") -TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVAID_RAW_DATA_VER, "Invalid raw data version") -TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVAID_RAW_DATA_LEN, "Invalid raw data len") TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVALID_TABLE_TYPE, "Invalid table type") -TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVAID_META_ROW, "Invalid meta row") -TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVAID_KEY_TYPE, "Invalid key type") +TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVALID_KEY_TYPE, "Invalid key type") +TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVALID_ACTION_TYPE, "Invalid action type") +TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVALID_STATUS_TYPE, "Invalid status type") +TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVALID_DATA_VER, "Invalid raw data version") +TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVALID_DATA_LEN, "Invalid raw data len") +TAOS_DEFINE_ERROR(TSDB_CODE_SDB_INVALID_META_ROW, "Invalid meta row") TAOS_DEFINE_ERROR(TSDB_CODE_MND_DNODE_ALREADY_EXIST, "DNode already exists") TAOS_DEFINE_ERROR(TSDB_CODE_MND_DNODE_NOT_EXIST, "DNode does not exist") -- GitLab