From 9cdbc4848a24132d5925df225bb2f72b55efa233 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Mon, 11 Nov 2019 14:32:07 +0800 Subject: [PATCH] fix merge import bug in JIRA TBASE-1097 --- src/system/detail/src/vnodeImport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/system/detail/src/vnodeImport.c b/src/system/detail/src/vnodeImport.c index 96aeb99e20..ab5fe66c95 100644 --- a/src/system/detail/src/vnodeImport.c +++ b/src/system/detail/src/vnodeImport.c @@ -1479,6 +1479,7 @@ int vnodeImportDataToCache(SImportInfo *pImport, const char *payload, const int payloadIter = rows; code = TSDB_CODE_ACTION_IN_PROGRESS; pImport->commit = 1; + // TODO: Fix here continue; } @@ -1507,7 +1508,7 @@ int vnodeImportDataToCache(SImportInfo *pImport, const char *payload, const int int pointsLeft = pInfo->cacheBlocks[cacheIter.slot]->numOfPoints - cacheIter.pos; if (pointsLeft > 0) { 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, pObj->schema[col].bytes * pointsLeft); }