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

fix issue #280

This commit is contained in:
Jeff Tao 2019-08-06 11:31:26 +08:00
parent 2470e3f57c
commit 169338eaaf
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/src/vnodeImport.c
View File

@ -61,6 +61,7 @@ typedef struct {
SData *sdata[TSDB_MAX_COLUMNS]; SData *sdata[TSDB_MAX_COLUMNS];
char *buffer; char *buffer;
char *payload; char *payload;
char *opayload; // allocated space for payload from client
int rows; int rows;
} SImportInfo; } SImportInfo;
@ -334,7 +335,7 @@ void vnodeProcessImportTimer(void *param, void *tmrId) {
} }
pImport->signature = NULL; pImport->signature = NULL;
free(pImport->payload); free(pImport->opayload);
free(pImport); free(pImport);
} }
@ -923,6 +924,7 @@ int vnodeImportPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
pNew->signature = pNew; pNew->signature = pNew;
int payloadLen = contLen - sizeof(SSubmitMsg); int payloadLen = contLen - sizeof(SSubmitMsg);
pNew->payload = malloc(payloadLen); pNew->payload = malloc(payloadLen);
pNew->opayload = pNew->payload;
memcpy(pNew->payload, payload, payloadLen); memcpy(pNew->payload, payload, payloadLen);
dTrace("vid:%d sid:%d id:%s, import later, commit in process:%d, numOfQueries:%d", pObj->vnode, pObj->sid, dTrace("vid:%d sid:%d id:%s, import later, commit in process:%d, numOfQueries:%d", pObj->vnode, pObj->sid,