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

fix merge import bug in JIRA TBASE-1097

This commit is contained in:
Hongze Cheng 2019-11-11 14:32:07 +08:00
parent c012704a5b
commit 9cdbc4848a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/system/detail/src/vnodeImport.c
View File

@ -1479,6 +1479,7 @@ int vnodeImportDataToCache(SImportInfo *pImport, const char *payload, const int
payloadIter = rows; payloadIter = rows;
code = TSDB_CODE_ACTION_IN_PROGRESS; code = TSDB_CODE_ACTION_IN_PROGRESS;
pImport->commit = 1; pImport->commit = 1;
// TODO: Fix here
continue; continue;
} }
@ -1507,7 +1508,7 @@ int vnodeImportDataToCache(SImportInfo *pImport, const char *payload, const int
int pointsLeft = pInfo->cacheBlocks[cacheIter.slot]->numOfPoints - cacheIter.pos; int pointsLeft = pInfo->cacheBlocks[cacheIter.slot]->numOfPoints - cacheIter.pos;
if (pointsLeft > 0) { if (pointsLeft > 0) {
for (int col = 0; col < pObj->numOfColumns; col++) { for (int col = 0; col < pObj->numOfColumns; col++) {
memcpy((void *)(pNewBlock->offset[col]), memcpy((void *)(pNewBlock->offset[col] + pObj->schema[col].bytes*cacheIter.pos),
pInfo->cacheBlocks[cacheIter.slot]->offset[col] + pObj->schema[col].bytes * cacheIter.pos, pInfo->cacheBlocks[cacheIter.slot]->offset[col] + pObj->schema[col].bytes * cacheIter.pos,
pObj->schema[col].bytes * pointsLeft); pObj->schema[col].bytes * pointsLeft);
} }