From dc8901268e419d59ef526d15565baf5dd32fb553 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 31 May 2023 16:34:50 +0800 Subject: [PATCH] fix code --- source/dnode/vnode/src/tsdb/dev/tsdbIter.c | 6 ++++-- source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbIter.c b/source/dnode/vnode/src/tsdb/dev/tsdbIter.c index 9b59e3e97c..436139083f 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbIter.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbIter.c @@ -163,12 +163,14 @@ static int32_t tsdbMemTableIterNext(STsdbIter *iter, const TABLEID *tbid) { SRBTreeNode *node; 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) { iter->memt->tbData = NULL; break; } - iter->row->row = *tsdbTbDataIterGet(iter->memt->tbIter); + iter->row->row = row[0]; + + tsdbTbDataIterNext(iter->memt->tbIter); goto _exit; } diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c b/source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c index dc27ac5794..ed094298fd 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c @@ -611,7 +611,7 @@ static int32_t tsdbSttFWriterCloseCommit(SSttFileWriter *writer, STFileOp *op) { 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->fid = writer->config->file.fid; op->of = writer->config->file;