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

Merge pull request #5501 from taosdata/feature/linux 

TD-3372
This commit is contained in:
Shengliang Guan 2021-03-19 13:51:14 +08:00 committed by GitHub
parent 49e7159be0 e9ea8814ec
commit 31e5c26bdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/inc/tp.h
View File

@ -22,7 +22,7 @@ extern "C" {
int32_t tpInit(); int32_t tpInit();
void tpCleanUp(); void tpCleanUp();
void tpUpdateTs(int32_t *seq, void *pMsg); void tpUpdateTs(int32_t vgId, int64_t *seq, void *pMsg);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
src/mnode/src/mnodeDb.c
View File

@ -55,7 +55,7 @@ int32_t mnodeProcessAlterDbMsg(SMnodeMsg *pMsg);
#ifndef _TOPIC #ifndef _TOPIC
int32_t tpInit() { return 0; } int32_t tpInit() { return 0; }
void tpCleanUp() {} void tpCleanUp() {}
void tpUpdateTs(int32_t *seq, void *pMsg) {} void tpUpdateTs(int32_t vgId, int64_t *seq, void *pMsg) {}
#endif #endif
static void mnodeDestroyDb(SDbObj *pDb) { static void mnodeDestroyDb(SDbObj *pDb) {

2
src/vnode/inc/vnodeInt.h
View File

@ -40,7 +40,7 @@ typedef struct {
int32_t queuedWMsg; int32_t queuedWMsg;
int32_t queuedRMsg; int32_t queuedRMsg;
int32_t flowctrlLevel; int32_t flowctrlLevel;
int32_t sequence; // for topic int64_t sequence; // for topic
int8_t status; int8_t status;
int8_t role; int8_t role;
int8_t accessState; int8_t accessState;

2
src/vnode/src/vnodeWrite.c
View File

@ -142,7 +142,7 @@ static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pR
vTrace("vgId:%d, submit msg is processed", pVnode->vgId); vTrace("vgId:%d, submit msg is processed", pVnode->vgId);
if (pVnode->dbType == TSDB_DB_TYPE_TOPIC && pVnode->role == TAOS_SYNC_ROLE_MASTER) { if (pVnode->dbType == TSDB_DB_TYPE_TOPIC && pVnode->role == TAOS_SYNC_ROLE_MASTER) {
tpUpdateTs(&pVnode->sequence, pCont); tpUpdateTs(pVnode->vgId, &pVnode->sequence, pCont);
} }
// save insert result into item // save insert result into item