diff --git a/src/system/detail/src/vnodeShell.c b/src/system/detail/src/vnodeShell.c index da26c04c6cdf539790b1b9c5df744590f85b467f..b1a9dbd3ef839bc0209cf27702f07924a5aa729c 100644 --- a/src/system/detail/src/vnodeShell.c +++ b/src/system/detail/src/vnodeShell.c @@ -52,7 +52,7 @@ typedef struct { SShellObj *pObj; int64_t offset; // offset relative the blks char blks[]; -} SBatchImportInfo; +} SBatchSubmitInfo; void *vnodeProcessMsgFromShell(char *msg, void *ahandle, void *thandle) { int sid, vnode; @@ -613,21 +613,21 @@ _submit_over: if (pSubmit->import) { // Import case if (code == TSDB_CODE_ACTION_IN_PROGRESS) { - SBatchImportInfo *pImportInfo = - (SBatchImportInfo *)calloc(1, sizeof(SBatchImportInfo) + msgLen - sizeof(SShellSubmitMsg)); - if (pImportInfo == NULL) { + SBatchSubmitInfo *pSubmitInfo = + (SBatchSubmitInfo *)calloc(1, sizeof(SBatchSubmitInfo) + msgLen - sizeof(SShellSubmitMsg)); + if (pSubmitInfo == NULL) { code = TSDB_CODE_SERV_OUT_OF_MEMORY; ret = vnodeSendShellSubmitRspMsg(pObj, code, pObj->numOfTotalPoints); } else { // Start a timer to process the next part of request - pImportInfo->import = 1; - pImportInfo->vnode = pSubmit->vnode; - pImportInfo->numOfSid = pSubmit->numOfSid; - pImportInfo->ssid = i; // start from this position, not the initial position - pImportInfo->pObj = pObj; - pImportInfo->offset = ((char *)pBlocks) - (pMsg + sizeof(SShellSubmitMsg)); - assert(pImportInfo->offset >= 0); - memcpy((void *)(pImportInfo->blks), (void *)(pMsg + sizeof(SShellSubmitMsg)), msgLen - sizeof(SShellSubmitMsg)); - taosTmrStart(vnodeProcessBatchImportTimer, 10, (void *)pImportInfo, vnodeTmrCtrl); + pSubmitInfo->import = 1; + pSubmitInfo->vnode = pSubmit->vnode; + pSubmitInfo->numOfSid = pSubmit->numOfSid; + pSubmitInfo->ssid = i; // start from this position, not the initial position + pSubmitInfo->pObj = pObj; + pSubmitInfo->offset = ((char *)pBlocks) - (pMsg + sizeof(SShellSubmitMsg)); + assert(pSubmitInfo->offset >= 0); + memcpy((void *)(pSubmitInfo->blks), (void *)(pMsg + sizeof(SShellSubmitMsg)), msgLen - sizeof(SShellSubmitMsg)); + taosTmrStart(vnodeProcessBatchImportTimer, 10, (void *)pSubmitInfo, vnodeTmrCtrl); } } else { if (code == TSDB_CODE_SUCCESS) assert(pObj->count == 0); @@ -642,18 +642,18 @@ _submit_over: } static void vnodeProcessBatchImportTimer(void *param, void *tmrId) { - SBatchImportInfo *pImportInfo = (SBatchImportInfo *)param; - assert(pImportInfo != NULL && pImportInfo->import); + SBatchSubmitInfo *pSubmitInfo = (SBatchSubmitInfo *)param; + assert(pSubmitInfo != NULL && pSubmitInfo->import); int32_t i = 0, numOfPoints = 0; int32_t code = TSDB_CODE_SUCCESS; - SShellObj * pShell = pImportInfo->pObj; - SVnodeObj * pVnode = &vnodeList[pImportInfo->vnode]; - SShellSubmitBlock *pBlocks = (SShellSubmitBlock *)(pImportInfo->blks + pImportInfo->offset); + SShellObj * pShell = pSubmitInfo->pObj; + SVnodeObj * pVnode = &vnodeList[pSubmitInfo->vnode]; + SShellSubmitBlock *pBlocks = (SShellSubmitBlock *)(pSubmitInfo->blks + pSubmitInfo->offset); TSKEY now = taosGetTimestamp(pVnode->cfg.precision); - for (i = pImportInfo->ssid; i < pImportInfo->numOfSid; i++) { + for (i = pSubmitInfo->ssid; i < pSubmitInfo->numOfSid; i++) { numOfPoints = 0; code = vnodeCheckSubmitBlockContext(pBlocks, pVnode); @@ -676,9 +676,9 @@ static void vnodeProcessBatchImportTimer(void *param, void *tmrId) { int ret = 0; if (code == TSDB_CODE_ACTION_IN_PROGRESS) { - pImportInfo->ssid = i; - pImportInfo->offset = ((char *)pBlocks) - pImportInfo->blks; - taosTmrStart(vnodeProcessBatchImportTimer, 10, (void *)pImportInfo, vnodeTmrCtrl); + pSubmitInfo->ssid = i; + pSubmitInfo->offset = ((char *)pBlocks) - pSubmitInfo->blks; + taosTmrStart(vnodeProcessBatchImportTimer, 10, (void *)pSubmitInfo, vnodeTmrCtrl); } else { if (code == TSDB_CODE_SUCCESS) assert(pShell->count == 0); tfree(param);