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

fix bug

This commit is contained in:
Hongze Cheng 2020-11-26 05:53:46 +00:00
parent e6aac222ad
commit fb0609f014
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tsdb/src/tsdbFile.c
View File

@ -107,6 +107,7 @@ int tsdbOpenFileH(STsdbRepo *pRepo) {
while (true) { while (true) {
int nfid = 0; int nfid = 0;
if (iter >= taosArrayGetSize(pfArray)) break;
TFILE *npf = taosArrayGet(pfArray, iter); TFILE *npf = taosArrayGet(pfArray, iter);
tfsbasename(npf, bname); tfsbasename(npf, bname);
tsdbParseFname(bname, &vid, &nfid, suffix); tsdbParseFname(bname, &vid, &nfid, suffix);

4
src/tsdb/src/tsdbMemTable.c
View File

@ -254,9 +254,9 @@ int tsdbSyncCommit(TSDB_REPO_T *repo) {
*/ */
int tsdbLoadDataFromCache(STable *pTable, SSkipListIterator *pIter, TSKEY maxKey, int maxRowsToRead, SDataCols *pCols, int tsdbLoadDataFromCache(STable *pTable, SSkipListIterator *pIter, TSKEY maxKey, int maxRowsToRead, SDataCols *pCols,
TKEY *filterKeys, int nFilterKeys, bool keepDup, SMergeInfo *pMergeInfo) { TKEY *filterKeys, int nFilterKeys, bool keepDup, SMergeInfo *pMergeInfo) {
ASSERT(maxRowsToRead > 0 && nFilterKeys >= 0 && pMergeInfo != NULL); ASSERT(maxRowsToRead > 0 && nFilterKeys >= 0);
if (pIter == NULL) return 0; if (pIter == NULL) return 0;
STSchema *pSchema = NULL; STSchema * pSchema = NULL;
TSKEY rowKey = 0; TSKEY rowKey = 0;
TSKEY fKey = 0; TSKEY fKey = 0;
bool isRowDel = false; bool isRowDel = false;