From 2cf04d23b396ad7b762e418a6e8fef9b79d0e3e0 Mon Sep 17 00:00:00 2001 From: slguan Date: Tue, 24 Mar 2020 19:30:45 +0800 Subject: [PATCH] [TD-10] fix compile error in dnode --- src/dnode/src/dnodeRead.c | 8 +++---- src/dnode/src/dnodeWrite.c | 47 +++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/dnode/src/dnodeRead.c b/src/dnode/src/dnodeRead.c index a238f38671..c928f5ee91 100644 --- a/src/dnode/src/dnodeRead.c +++ b/src/dnode/src/dnodeRead.c @@ -164,7 +164,7 @@ static void *dnodeProcessReadQueue(void *param) { void *pVnode; while (1) { - if (taosReadQitemFromQset(qset, &type, &pReadMsg, &pVnode) == 0) { + if (taosReadQitemFromQset(qset, &type, (void **)&pReadMsg, (void **)&pVnode) == 0) { dnodeHandleIdleReadWorker(); continue; } @@ -228,11 +228,11 @@ static void dnodeProcessReadResult(void *pVnode, SReadMsg *pRead) { rpcFreeCont(pRead->rpcMsg.pCont); // free the received message } -static void dnodeProcessQueryMsg(SReadMsg *pMsg) { +static void dnodeProcessQueryMsg(void *pVnode, SReadMsg *pMsg) { SQueryTableMsg* pQueryTableMsg = (SQueryTableMsg*) pMsg->pCont; SQInfo* pQInfo = NULL; - void* tsdb = dnodeGetVnodeTsdb(pMsg->pVnode); + void* tsdb = dnodeGetVnodeTsdb(pVnode); int32_t code = qCreateQueryInfo(tsdb, pQueryTableMsg, &pQInfo); SQueryTableRsp *pRsp = (SQueryTableRsp *) rpcMallocCont(sizeof(SQueryTableRsp)); @@ -254,7 +254,7 @@ static void dnodeProcessQueryMsg(SReadMsg *pMsg) { } static int32_t c = 0; -static void dnodeProcessRetrieveMsg(SReadMsg *pMsg) { +static void dnodeProcessRetrieveMsg(void *pVnode, SReadMsg *pMsg) { SRetrieveTableMsg *pRetrieve = pMsg->pCont; void *pQInfo = (void*) htobe64(pRetrieve->qhandle); diff --git a/src/dnode/src/dnodeWrite.c b/src/dnode/src/dnodeWrite.c index bb93c1cb34..7ec206f366 100644 --- a/src/dnode/src/dnodeWrite.c +++ b/src/dnode/src/dnodeWrite.c @@ -53,12 +53,12 @@ typedef struct _thread_obj { static void (*dnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MAX])(void *, SWriteMsg *); static void *dnodeProcessWriteQueue(void *param); static void dnodeHandleIdleWorker(SWriteWorker *pWorker); -static void dnodeProcessWriteResult(SWriteMsg *pWrite); -static void dnodeProcessSubmitMsg(SWriteMsg *pMsg); -static void dnodeProcessCreateTableMsg(SWriteMsg *pMsg); -static void dnodeProcessDropTableMsg(SWriteMsg *pMsg); -static void dnodeProcessAlterTableMsg(SWriteMsg *pMsg); -static void dnodeProcessDropStableMsg(SWriteMsg *pMsg); +static void dnodeProcessWriteResult(void *pVnode, SWriteMsg *pWrite); +static void dnodeProcessSubmitMsg(void *pVnode, SWriteMsg *pMsg); +static void dnodeProcessCreateTableMsg(void *pVnode, SWriteMsg *pMsg); +static void dnodeProcessDropTableMsg(void *pVnode, SWriteMsg *pMsg); +static void dnodeProcessAlterTableMsg(void *pVnode, SWriteMsg *pMsg); +static void dnodeProcessDropStableMsg(void *pVnode, SWriteMsg *pMsg); SWriteWorkerPool wWorkerPool; @@ -193,20 +193,20 @@ static void *dnodeProcessWriteQueue(void *param) { continue; } - for (int32_t i=0; iwhandle, writeMsg.rpcMsg.msgType, writeMsg.pCont, writeMsg.contLen); } - + // flush WAL file // walFsync(pVnode->whandle); // browse all items, and process them one by one taosResetQitems(qall); for (int32_t i = 0; i < numOfMsgs; ++i) { - taosGetQitem(qall, &type, &pWriteMsg); + taosGetQitem(qall, &type, (void **)&pWriteMsg); terrno = 0; if (dnodeProcessWriteMsgFp[pWriteMsg->rpcMsg.msgType]) { @@ -218,7 +218,6 @@ static void *dnodeProcessWriteQueue(void *param) { dnodeProcessWriteResult(pVnode, pWriteMsg); taosFreeQitem(pWriteMsg); } - } taosFreeQall(qall); @@ -270,7 +269,7 @@ static void dnodeHandleIdleWorker(SWriteWorker *pWorker) { } } -static void dnodeProcessSubmitMsg(SWriteMsg *pMsg) { +static void dnodeProcessSubmitMsg(void *pVnode, SWriteMsg *pMsg) { dTrace("submit msg is disposed"); SShellSubmitRspMsg *pRsp = rpcMallocCont(sizeof(SShellSubmitRspMsg)); @@ -279,7 +278,7 @@ static void dnodeProcessSubmitMsg(SWriteMsg *pMsg) { pRsp->affectedRows = htonl(1); pRsp->numOfFailedBlocks = 0; - void* tsdb = dnodeGetVnodeTsdb(pMsg->pVnode); + void* tsdb = dnodeGetVnodeTsdb(pVnode); assert(tsdb != NULL); tsdbInsertData(tsdb, pMsg->pCont); @@ -295,7 +294,7 @@ static void dnodeProcessSubmitMsg(SWriteMsg *pMsg) { rpcSendResponse(&rpcRsp); } -static void dnodeProcessCreateTableMsg(SWriteMsg *pMsg) { +static void dnodeProcessCreateTableMsg(void *pVnode, SWriteMsg *pMsg) { SMDCreateTableMsg *pTable = pMsg->rpcMsg.pCont; SRpcMsg rpcRsp = {.handle = pMsg->rpcMsg.handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; @@ -344,16 +343,16 @@ static void dnodeProcessCreateTableMsg(SWriteMsg *pMsg) { tsdbTableSetTagValue(&tCfg, dataRow, false); } - void *pTsdb = dnodeGetVnodeTsdb(pMsg->pVnode); + void *pTsdb = dnodeGetVnodeTsdb(pVnode); rpcRsp.code = tsdbCreateTable(pTsdb, &tCfg); - dnodeReleaseVnode(pMsg->pVnode); + dnodeReleaseVnode(pVnode); dTrace("table:%s, create table result:%s", pTable->tableId, tstrerror(rpcRsp.code)); rpcSendResponse(&rpcRsp); } -static void dnodeProcessDropTableMsg(SWriteMsg *pMsg) { +static void dnodeProcessDropTableMsg(void *pVnode, SWriteMsg *pMsg) { SMDDropTableMsg *pTable = pMsg->rpcMsg.pCont; SRpcMsg rpcRsp = {.handle = pMsg->rpcMsg.handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; @@ -363,16 +362,16 @@ static void dnodeProcessDropTableMsg(SWriteMsg *pMsg) { .tid = htonl(pTable->sid) }; - void *pTsdb = dnodeGetVnodeTsdb(pMsg->pVnode); + void *pTsdb = dnodeGetVnodeTsdb(pVnode); rpcRsp.code = tsdbDropTable(pTsdb, tableId); - dnodeReleaseVnode(pMsg->pVnode); + dnodeReleaseVnode(pVnode); dTrace("table:%s, drop table result:%s", pTable->tableId, tstrerror(rpcRsp.code)); rpcSendResponse(&rpcRsp); } -static void dnodeProcessAlterTableMsg(SWriteMsg *pMsg) { +static void dnodeProcessAlterTableMsg(void *pVnode, SWriteMsg *pMsg) { SMDCreateTableMsg *pTable = pMsg->rpcMsg.pCont; SRpcMsg rpcRsp = {.handle = pMsg->rpcMsg.handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; @@ -421,16 +420,16 @@ static void dnodeProcessAlterTableMsg(SWriteMsg *pMsg) { tsdbTableSetTagValue(&tCfg, dataRow, false); } - void *pTsdb = dnodeGetVnodeTsdb(pMsg->pVnode); + void *pTsdb = dnodeGetVnodeTsdb(pVnode); rpcRsp.code = tsdbAlterTable(pTsdb, &tCfg); - dnodeReleaseVnode(pMsg->pVnode); + dnodeReleaseVnode(pVnode); dTrace("table:%s, alter table result:%s", pTable->tableId, tstrerror(rpcRsp.code)); rpcSendResponse(&rpcRsp); } -static void dnodeProcessDropStableMsg(SWriteMsg *pMsg) { +static void dnodeProcessDropStableMsg(void *pVnode, SWriteMsg *pMsg) { SMDDropSTableMsg *pTable = pMsg->rpcMsg.pCont; SRpcMsg rpcRsp = {.handle = pMsg->rpcMsg.handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; @@ -442,7 +441,7 @@ static void dnodeProcessDropStableMsg(SWriteMsg *pMsg) { //rpcRsp.code = tsdbDropSTable(pTsdb, pTable->uid); rpcRsp.code = TSDB_CODE_SUCCESS; - dnodeReleaseVnode(pMsg->pVnode); + dnodeReleaseVnode(pVnode); dTrace("stable:%s, drop stable result:%s", pTable->tableId, tstrerror(rpcRsp.code)); rpcSendResponse(&rpcRsp); -- GitLab