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

more work

This commit is contained in:
Hongze Cheng 2022-06-23 01:45:53 +00:00
parent bc326593d6
commit c58b43ba95
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/dnode/vnode/src/tsdb/tsdbUtil.c
View File

@ -637,14 +637,16 @@ int32_t tRowMerge(SRowMerger *pMerger, TSDBROW *pRow) {
for (int32_t iCol = 1; iCol < pMerger->pTSchema->numOfCols; iCol++) { for (int32_t iCol = 1; iCol < pMerger->pTSchema->numOfCols; iCol++) {
tsdbRowGetColVal(pRow, pMerger->pTSchema, iCol, pColVal); tsdbRowGetColVal(pRow, pMerger->pTSchema, iCol, pColVal);
if (pColVal->isNone) continue;
// SColVal *tColVal = (SColVal *)taosArrayGet(pMerger->pArray, iCol);
if (key.version > pMerger->version) { if (key.version > pMerger->version) {
// forward merge (todo) if (!pColVal->isNone) {
taosArraySet(pMerger->pArray, iCol, pColVal);
}
} else if (key.version < pMerger->version) { } else if (key.version < pMerger->version) {
// backward merge (todo) SColVal *tColVal = (SColVal *)taosArrayGet(pMerger->pArray, iCol);
if (tColVal->isNone && !pColVal->isNone) {
taosArraySet(pMerger->pArray, iCol, pColVal);
}
} else { } else {
ASSERT(0); ASSERT(0);
} }