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

fix(query): enable merge duplicated rows.

This commit is contained in:
Haojun Liao 2022-12-07 18:40:18 +08:00
parent 9e7bbf622a
commit 35d13a91c2
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3426,8 +3426,8 @@ int32_t doMergeMemTableMultiRows(TSDBROW* pRow, uint64_t uid, SIterInfo* pIter,
} }
} }
#if 0 // start to merge duplicated rows
// todo handle the data block merge if (current.type == TSDBROW_ROW_FMT) {
SRowMerger merge = {0}; SRowMerger merge = {0};
// get the correct schema for data in memory // get the correct schema for data in memory
@ -3458,14 +3458,15 @@ int32_t doMergeMemTableMultiRows(TSDBROW* pRow, uint64_t uid, SIterInfo* pIter,
return code; return code;
} }
code = tsdbRowMergerGetRow(&merge, pTSRow); code = tsdbRowMergerGetRow(&merge, &pResRow->pTSRow);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
return code; return code;
} }
pResRow->type = current.type;
tsdbRowMergerClear(&merge); tsdbRowMergerClear(&merge);
*freeTSRow = true; *freeTSRow = true;
#endif }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }