diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h index 173de4c578..edb0a91900 100644 --- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h @@ -58,12 +58,6 @@ int32_t tsdbDataFileReadBlockSma(SDataFileReader *reader, const SBrinRecord *rec int32_t tsdbDataFileReadTombBlk(SDataFileReader *reader, const TTombBlkArray **tombBlkArray); int32_t tsdbDataFileReadTombBlock(SDataFileReader *reader, const STombBlk *tombBlk, STombBlock *tData); -#if 0 -int32_t tsdbDataFileReadBlockIdx(SDataFileReader *reader, const TBlockIdxArray **blockIdxArray); -int32_t tsdbDataFileReadDataBlk(SDataFileReader *reader, const SBlockIdx *blockIdx, const TDataBlkArray **dataBlkArray); -int32_t tsdbDataFileReadDataBlock(SDataFileReader *reader, const SDataBlk *dataBlk, SBlockData *bData); -#endif - // SDataFileWriter ============================================= typedef struct SDataFileWriter SDataFileWriter; typedef struct SDataFileWriterConfig { diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c b/source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c index fef3d002d7..bf2d06de8b 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c @@ -412,104 +412,6 @@ _exit: return code; } -#if 0 -int32_t tsdbDataFileReadBlockIdx(SDataFileReader *reader, const TBlockIdxArray **blockIdxArray) { - int32_t code = 0; - int32_t lino = 0; - - if (!reader->ctx->blockIdxLoaded) { - code = tsdbDataFileReadHeadFooter(reader); - TSDB_CHECK_CODE(code, lino, _exit); - - TARRAY2_CLEAR(reader->blockIdxArray, NULL); - if (reader->fd[TSDB_FTYPE_HEAD] // - && reader->headFooter->blockIdxPtr->size) { - code = tRealloc(&reader->config->bufArr[0], reader->headFooter->blockIdxPtr->size); - TSDB_CHECK_CODE(code, lino, _exit); - - code = tsdbReadFile(reader->fd[TSDB_FTYPE_HEAD], reader->headFooter->blockIdxPtr->offset, - reader->config->bufArr[0], reader->headFooter->blockIdxPtr->size); - TSDB_CHECK_CODE(code, lino, _exit); - - int32_t size = reader->headFooter->blockIdxPtr->size / sizeof(SBlockIdx); - for (int32_t i = 0; i < size; ++i) { - code = TARRAY2_APPEND_PTR(reader->blockIdxArray, ((SBlockIdx *)reader->config->bufArr[0]) + i); - TSDB_CHECK_CODE(code, lino, _exit); - } - } - - reader->ctx->blockIdxLoaded = true; - } - - blockIdxArray[0] = reader->blockIdxArray; - -_exit: - if (code) { - TSDB_ERROR_LOG(TD_VID(reader->config->tsdb->pVnode), lino, code); - } - return code; -} - -int32_t tsdbDataFileReadDataBlk(SDataFileReader *reader, const SBlockIdx *blockIdx, - const TDataBlkArray **dataBlkArray) { - ASSERT(reader->ctx->headFooterLoaded); - - if (reader->ctx->tbid->suid == blockIdx->suid && reader->ctx->tbid->uid == blockIdx->uid) { - dataBlkArray[0] = reader->dataBlkArray; - return 0; - } - - int32_t code = 0; - int32_t lino = 0; - - reader->ctx->tbid->suid = blockIdx->suid; - reader->ctx->tbid->uid = blockIdx->uid; - - TARRAY2_CLEAR(reader->dataBlkArray, NULL); - - code = tRealloc(&reader->config->bufArr[0], blockIdx->size); - TSDB_CHECK_CODE(code, lino, _exit); - - code = tsdbReadFile(reader->fd[TSDB_FTYPE_HEAD], blockIdx->offset, reader->config->bufArr[0], blockIdx->size); - TSDB_CHECK_CODE(code, lino, _exit); - - int32_t size = blockIdx->size / sizeof(SDataBlk); - for (int32_t i = 0; i < size; ++i) { - code = TARRAY2_APPEND_PTR(reader->dataBlkArray, ((SDataBlk *)reader->config->bufArr[0]) + i); - TSDB_CHECK_CODE(code, lino, _exit); - } - - dataBlkArray[0] = reader->dataBlkArray; - -_exit: - if (code) { - TSDB_ERROR_LOG(TD_VID(reader->config->tsdb->pVnode), lino, code); - } - return code; -} - -int32_t tsdbDataFileReadDataBlock(SDataFileReader *reader, const SDataBlk *dataBlk, SBlockData *bData) { - int32_t code = 0; - int32_t lino = 0; - - code = tRealloc(&reader->config->bufArr[0], dataBlk->aSubBlock->szBlock); - TSDB_CHECK_CODE(code, lino, _exit); - - code = tsdbReadFile(reader->fd[TSDB_FTYPE_DATA], dataBlk->aSubBlock->offset, reader->config->bufArr[0], - dataBlk->aSubBlock->szBlock); - TSDB_CHECK_CODE(code, lino, _exit); - - code = tDecmprBlockData(reader->config->bufArr[0], dataBlk->aSubBlock->szBlock, bData, &reader->config->bufArr[1]); - TSDB_CHECK_CODE(code, lino, _exit); - -_exit: - if (code) { - TSDB_ERROR_LOG(TD_VID(reader->config->tsdb->pVnode), lino, code); - } - return code; -} -#endif - int32_t tsdbDataFileReadTombBlk(SDataFileReader *reader, const TTombBlkArray **tombBlkArray) { int32_t code = 0; int32_t lino = 0;