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

fix code

This commit is contained in:
Hongze Cheng 2023-05-31 16:34:50 +08:00
parent 265e27ece3
commit dc8901268e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/dnode/vnode/src/tsdb/dev/tsdbIter.c
View File

@ -163,12 +163,14 @@ static int32_t tsdbMemTableIterNext(STsdbIter *iter, const TABLEID *tbid) {
SRBTreeNode *node; SRBTreeNode *node;
while (!iter->ctx->noMoreData) { while (!iter->ctx->noMoreData) {
while (iter->memt->tbData && tsdbTbDataIterNext(iter->memt->tbIter)) { for (TSDBROW *row; iter->memt->tbData && (row = tsdbTbDataIterGet(iter->memt->tbIter));) {
if (tbid && tbid->suid == iter->memt->tbData->suid && tbid->uid == iter->memt->tbData->uid) { if (tbid && tbid->suid == iter->memt->tbData->suid && tbid->uid == iter->memt->tbData->uid) {
iter->memt->tbData = NULL; iter->memt->tbData = NULL;
break; break;
} }
iter->row->row = *tsdbTbDataIterGet(iter->memt->tbIter); iter->row->row = row[0];
tsdbTbDataIterNext(iter->memt->tbIter);
goto _exit; goto _exit;
} }

2
source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c
View File

@ -611,7 +611,7 @@ static int32_t tsdbSttFWriterCloseCommit(SSttFileWriter *writer, STFileOp *op) {
tsdbCloseFile(&writer->fd); tsdbCloseFile(&writer->fd);
ASSERT(writer->config->file.size > writer->file->size); ASSERT(writer->config->file.size < writer->file->size);
op->optype = writer->config->file.size ? TSDB_FOP_MODIFY : TSDB_FOP_CREATE; op->optype = writer->config->file.size ? TSDB_FOP_MODIFY : TSDB_FOP_CREATE;
op->fid = writer->config->file.fid; op->fid = writer->config->file.fid;
op->of = writer->config->file; op->of = writer->config->file;