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

feat: code optimization for update

This commit is contained in:
Cary Xu 2022-05-07 00:56:07 +08:00
parent 1fa906cde0
commit b1a429f7df
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/common/src/trow.c
View File

@ -670,7 +670,7 @@ int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int *
} }
} }
} }
if (rowsToMerge > 0) { if (lastKey != TSKEY_INITIAL_VAL) {
++target->numOfRows; ++target->numOfRows;
} }
(*pOffset) += rowsToMerge; (*pOffset) += rowsToMerge;
@ -778,7 +778,7 @@ static void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, i
ASSERT(target->numOfRows <= target->maxPoints - 1); ASSERT(target->numOfRows <= target->maxPoints - 1);
} }
if (nRows > 0) { if (lastKey != TSKEY_INITIAL_VAL) {
++target->numOfRows; ++target->numOfRows;
} }
} }

14
source/dnode/vnode/src/tsdb/tsdbRead.c
View File

@ -816,9 +816,10 @@ static TSKEY extractFirstTraverseKey(STableCheckInfo* pCheckInfo, int32_t order,
SSkipListNode* node = tSkipListIterGet(pCheckInfo->iter); SSkipListNode* node = tSkipListIterGet(pCheckInfo->iter);
if (node != NULL) { if (node != NULL) {
rmem = (STSRow*)SL_GET_NODE_DATA(node); rmem = (STSRow*)SL_GET_NODE_DATA(node);
if (TD_ROW_KEY(rmem) > maxVer) { // TODO: filter max version
rmem = NULL; // if (TD_ROW_VER(rmem) > maxVer) {
} // rmem = NULL;
// }
} }
} }
@ -826,9 +827,10 @@ static TSKEY extractFirstTraverseKey(STableCheckInfo* pCheckInfo, int32_t order,
SSkipListNode* node = tSkipListIterGet(pCheckInfo->iiter); SSkipListNode* node = tSkipListIterGet(pCheckInfo->iiter);
if (node != NULL) { if (node != NULL) {
rimem = (STSRow*)SL_GET_NODE_DATA(node); rimem = (STSRow*)SL_GET_NODE_DATA(node);
if (TD_ROW_KEY(rimem) > maxVer) { // TODO: filter max version
rimem = NULL; // if (TD_ROW_VER(rimem) > maxVer) {
} // rimem = NULL;
// }
} }
} }