xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

minor changes

This commit is contained in:
Shengliang Guan 2021-11-11 18:45:25 +08:00
parent c7f4f9d4e7
commit 2bdccc20ae
9 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/dnode/mnode/sdb/sdb.h
View File

@ -121,11 +121,11 @@ typedef struct {
SdbInsertFp insertFp;
SdbUpdateFp updateFp;
SdbDeleteFp deleteFp;
} SSdbDesc;
} SSdbHandle;
int32_t sdbInit();
void sdbCleanup();
void sdbSetHandler(SSdbDesc desc);
void sdbSetHandle(SSdbHandle handle);
int32_t sdbRead();
int32_t sdbWrite(SSdbRaw *pRaw);

2
source/dnode/mnode/impl/inc/mnodeInt.h
View File

@ -24,7 +24,7 @@
extern "C" {
#endif
typedef void (*MnodeRpcFp[TSDB_MSG_TYPE_MAX])(SMnodeMsg *pMsg);
typedef void (*MnodeRpcFp)(SMnodeMsg *pMsg);
tmr_h mnodeGetTimer();
int32_t mnodeGetDnodeId();

2
source/dnode/mnode/impl/src/mnode.c
View File

@ -42,7 +42,7 @@ static struct {
SSteps *pInitSteps;
SSteps *pStartSteps;
SMnodePara para;
MnodeRpcFp msgFp;
MnodeRpcFp msgFp[TSDB_MSG_TYPE_MAX];
} tsMint;
int32_t mnodeGetDnodeId() { return tsMint.para.dnodeId; }

20
source/dnode/mnode/impl/src/mnodeAcct.c
View File

@ -106,7 +106,7 @@ static int32_t mnodeCreateDefaultAcct() {
.accessState = TSDB_VN_ALL_ACCCESS};
SSdbRaw *pRaw = mnodeAcctActionEncode(&acctObj);
if (pRaw != NULL) {
if (pRaw == NULL) {
return -1;
}
@ -114,15 +114,15 @@ static int32_t mnodeCreateDefaultAcct() {
}
int32_t mnodeInitAcct() {
SSdbDesc desc = {.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};
sdbSetHandler(desc);
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);
return 0;
}

18
source/dnode/mnode/impl/src/mnodeUser.c
View File

@ -234,15 +234,15 @@ static int32_t mnodeProcessCreateUserMsg(SMnodeMsg *pMsg) {
}
int32_t mnodeInitUser() {
SSdbDesc desc = {.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};
sdbSetHandler(desc);
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);
return 0;
}

11
source/dnode/mnode/sdb/inc/sdbInt.h
View File

@ -19,7 +19,6 @@
#include "os.h"
#include "sdb.h"
#include "taosmsg.h"
#include "tglobal.h"
#include "thash.h"
#include "tlockfree.h"
#include "tlog.h"
@ -35,7 +34,7 @@ extern "C" {
#define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }}
#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }}
#define SDB_MAX_SIZE (32*1024)
#define SDB_MAX_SIZE (32 * 1024)
typedef struct {
char *currDir;
@ -52,13 +51,13 @@ typedef struct {
SdbDeployFp deployFps[SDB_MAX];
SdbEncodeFp encodeFps[SDB_MAX];
SdbDecodeFp decodeFps[SDB_MAX];
} SSdbObj;
} SSdbMgr;
typedef struct {
ESdbStatus status;
int32_t refCount;
int32_t dataLen;
char *data[];
int32_t refCount;
int32_t dataLen;
char pData[];
} SSdbRow;
#ifdef __cplusplus

25
source/dnode/mnode/sdb/src/sdb.c
View File

@ -15,8 +15,9 @@
#define _DEFAULT_SOURCE
#include "sdbInt.h"
#include "tglobal.h"
static SSdbObj tsSdb = {0};
static SSdbMgr tsSdb = {0};
static int32_t sdbCreateDir() {
if (!taosMkDir(tsSdb.currDir)) {
@ -153,7 +154,7 @@ static int32_t sdbWriteDataFile() {
SSdbRow *pRow = taosHashIterate(hash, NULL);
while (pRow != NULL) {
if (pRow->status == SDB_STATUS_READY) continue;
SSdbRaw *pRaw = (*encodeFp)(pRow->data);
SSdbRaw *pRaw = (*encodeFp)(pRow->pData);
if (pRaw != NULL) {
taosWriteFile(fd, pRaw, sizeof(SSdbRaw) + pRaw->dataLen);
} else {
@ -292,15 +293,15 @@ void sdbCleanup() {
}
}
void sdbSetHandler(SSdbDesc desc) {
ESdbType sdb = desc.sdbType;
tsSdb.keyTypes[sdb] = desc.keyType;
tsSdb.insertFps[sdb] = desc.insertFp;
tsSdb.updateFps[sdb] = desc.updateFp;
tsSdb.deleteFps[sdb] = desc.deleteFp;
tsSdb.deployFps[sdb] = desc.deployFp;
tsSdb.encodeFps[sdb] = desc.encodeFp;
tsSdb.decodeFps[sdb] = desc.decodeFp;
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;
}
#if 0
@ -370,7 +371,7 @@ void *sdbAcquire(ESdbType sdb, void *pKey) {
if (pRow->status == SDB_STATUS_READY) {
atomic_add_fetch_32(&pRow->refCount, 1);
return pRow->data;
return pRow->pData;
} else {
terrno = -1; // todo
return NULL;

4
source/dnode/mnode/transaction/src/trnInt.c → source/dnode/mnode/transaction/src/trn.c
View File

@ -223,14 +223,14 @@ int32_t trnAppendUndoAction(STrans *pTrans, SEpSet *pEpSet, void *pMsg) {
}
int32_t trnInit() {
SSdbDesc desc = {.sdbType = SDB_TRANS,
SSdbHandle handle = {.sdbType = SDB_TRANS,
.keyType = SDB_KEY_INT32,
.encodeFp = (SdbEncodeFp)trnActionEncode,
.decodeFp = (SdbDecodeFp)trnActionDecode,
.insertFp = (SdbInsertFp)trnActionInsert,
.updateFp = (SdbUpdateFp)trnActionUpdate,
.deleteFp = (SdbDeleteFp)trnActionDelete};
sdbSetHandler(desc);
sdbSetHandle(handle);
return 0;
}

0
source/dnode/mnode/transaction/src/trnMain.c → source/dnode/mnode/transaction/src/trnExec.c
View File