From a6c36a6cf350773aedb59ee9cb4bce713b7b1bd7 Mon Sep 17 00:00:00 2001 From: dmchen Date: Mon, 15 Apr 2024 07:36:41 +0000 Subject: [PATCH] resolve conflict --- source/dnode/vnode/src/tsdb/tsdbDataFileRW.c | 18 +++++++-------- source/dnode/vnode/src/tsdb/tsdbDataFileRW.h | 4 ++-- .../dnode/vnode/src/tsdb/tsdbReaderWriter.c | 2 +- source/dnode/vnode/src/tsdb/tsdbSttFileRW.c | 23 ++++++++----------- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbDataFileRW.c b/source/dnode/vnode/src/tsdb/tsdbDataFileRW.c index 70e486c6b0..90aa06d0d5 100644 --- a/source/dnode/vnode/src/tsdb/tsdbDataFileRW.c +++ b/source/dnode/vnode/src/tsdb/tsdbDataFileRW.c @@ -320,7 +320,7 @@ int32_t tsdbDataFileReadBlockDataByColumn(SDataFileReader *reader, const SBrinRe // load key part tBufferClear(buffer0); code = tsdbReadFileToBuffer(reader->fd[TSDB_FTYPE_DATA], record->blockOffset, record->blockKeySize, buffer0, 0, - encryptAlgorithm, encryptKey); + encryptAlgorithm, encryptKey); TSDB_CHECK_CODE(code, lino, _exit); // SDiskDataHdr @@ -352,8 +352,6 @@ int32_t tsdbDataFileReadBlockDataByColumn(SDataFileReader *reader, const SBrinRe goto _exit; } - int32_t encryptAlgorithm = reader->config->tsdb->pVnode->config.tsdbCfg.encryptAlgorithm; - char* encryptKey = reader->config->tsdb->pVnode->config.tsdbCfg.encryptKey; // load SBlockCol part tBufferClear(buffer0); code = tsdbReadFileToBuffer(reader->fd[TSDB_FTYPE_DATA], record->blockOffset + record->blockKeySize, hdr.szBlkCol, @@ -790,9 +788,9 @@ int32_t tsdbFileWriteBrinBlock(STsdbFD *fd, SBrinBlock *brinBlock, int8_t cmprAl }; tBufferClear(buffer0); - code = tCompressDataToBuffer(brinBlock->buffers[i].data, &info, buffer0, assist, encryptAlgorithm, encryptKey); + code = tCompressDataToBuffer(brinBlock->buffers[i].data, &info, buffer0, assist); if (code) return code; - code = tsdbWriteFile(fd, *fileSize, buffer0->data, buffer0->size); + code = tsdbWriteFile(fd, *fileSize, buffer0->data, buffer0->size, encryptAlgorithm, encryptKey); if (code) return code; brinBlk.size[i] = info.compressedSize; brinBlk.dp->size += info.compressedSize; @@ -806,9 +804,9 @@ int32_t tsdbFileWriteBrinBlock(STsdbFD *fd, SBrinBlock *brinBlock, int8_t cmprAl }; tBufferClear(buffer0); - code = tCompressDataToBuffer(brinBlock->buffers[i].data, &info, buffer0, assist, encryptAlgorithm, encryptKey); + code = tCompressDataToBuffer(brinBlock->buffers[i].data, &info, buffer0, assist); if (code) return code; - code = tsdbWriteFile(fd, *fileSize, buffer0->data, buffer0->size); + code = tsdbWriteFile(fd, *fileSize, buffer0->data, buffer0->size, encryptAlgorithm, encryptKey); if (code) return code; brinBlk.size[i] = info.compressedSize; brinBlk.dp->size += info.compressedSize; @@ -833,10 +831,10 @@ int32_t tsdbFileWriteBrinBlock(STsdbFD *fd, SBrinBlock *brinBlock, int8_t cmprAl } // write to file - if ((code = tsdbWriteFile(fd, *fileSize, buffer0->data, buffer0->size))) return code; + if ((code = tsdbWriteFile(fd, *fileSize, buffer0->data, buffer0->size, encryptAlgorithm, encryptKey))) return code; *fileSize += buffer0->size; brinBlk.dp->size += buffer0->size; - if ((code = tsdbWriteFile(fd, *fileSize, buffer1->data, buffer1->size))) return code; + if ((code = tsdbWriteFile(fd, *fileSize, buffer1->data, buffer1->size, encryptAlgorithm, encryptKey))) return code; *fileSize += buffer1->size; brinBlk.dp->size += buffer1->size; } @@ -952,7 +950,7 @@ static int32_t tsdbDataFileDoWriteBlockData(SDataFileWriter *writer, SBlockData char* encryptKey = writer->config->tsdb->pVnode->config.tsdbCfg.encryptKey; for (int i = 0; i < 4; i++) { code = tsdbWriteFile(writer->fd[TSDB_FTYPE_DATA], writer->files[TSDB_FTYPE_DATA].size, buffers[i].data, - buffers[i].size, encryptAlgorithm, encryptKey); + buffers[i].size, encryptAlgorithm, encryptKey); TSDB_CHECK_CODE(code, lino, _exit); writer->files[TSDB_FTYPE_DATA].size += buffers[i].size; } diff --git a/source/dnode/vnode/src/tsdb/tsdbDataFileRW.h b/source/dnode/vnode/src/tsdb/tsdbDataFileRW.h index 56780d3499..31f930a0c3 100644 --- a/source/dnode/vnode/src/tsdb/tsdbDataFileRW.h +++ b/source/dnode/vnode/src/tsdb/tsdbDataFileRW.h @@ -100,7 +100,7 @@ int32_t tsdbFileWriteBrinBlock(STsdbFD *fd, SBrinBlock *brinBlock, int8_t cmprAl int32_t tsdbFileWriteBrinBlk(STsdbFD *fd, TBrinBlkArray *brinBlkArray, SFDataPtr *ptr, int64_t *fileSize, int32_t encryptAlgorithm, char* encryptKey); int32_t tsdbFileWriteHeadFooter(STsdbFD *fd, int64_t *fileSize, const SHeadFooter *footer, - int32_t encryptAlgorithm, char* encryptKey); + int32_t encryptAlgorithm, char* encryptKey); // tomb int32_t tsdbDataFileWriteTombRecord(SDataFileWriter *writer, const STombRecord *record); @@ -110,7 +110,7 @@ int32_t tsdbFileWriteTombBlock(STsdbFD *fd, STombBlock *tombBlock, int8_t cmprAl int32_t tsdbFileWriteTombBlk(STsdbFD *fd, const TTombBlkArray *tombBlkArray, SFDataPtr *ptr, int64_t *fileSize, int32_t encryptAlgorithm, char* encryptKey); int32_t tsdbFileWriteTombFooter(STsdbFD *fd, const STombFooter *footer, int64_t *fileSize, - int32_t encryptAlgorithm, char* encryptKey); + int32_t encryptAlgorithm, char* encryptKey); // utils int32_t tsdbWriterUpdVerRange(SVersionRange *range, int64_t minVer, int64_t maxVer); diff --git a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c index c38ec5bfd8..bec2a65be4 100644 --- a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c +++ b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c @@ -471,7 +471,7 @@ int32_t tsdbReadFileToBuffer(STsdbFD *pFD, int64_t offset, int64_t size, SBuffer code = tBufferEnsureCapacity(buffer, buffer->size + size); if (code) return code; code = tsdbReadFile(pFD, offset, (uint8_t *)tBufferGetDataEnd(buffer), size, szHint, - encryptAlgorithm, encryptKey); + encryptAlgorithm, encryptKey); if (code) return code; buffer->size += size; diff --git a/source/dnode/vnode/src/tsdb/tsdbSttFileRW.c b/source/dnode/vnode/src/tsdb/tsdbSttFileRW.c index 9741d62e72..558096b36e 100644 --- a/source/dnode/vnode/src/tsdb/tsdbSttFileRW.c +++ b/source/dnode/vnode/src/tsdb/tsdbSttFileRW.c @@ -197,7 +197,7 @@ int32_t tsdbSttFileReadBlockData(SSttFileReader *reader, const SSttBlk *sttBlk, // load data tBufferClear(buffer0); code = tsdbReadFileToBuffer(reader->fd, sttBlk->bInfo.offset, sttBlk->bInfo.szBlock, buffer0, 0, - encryptAlgorithm, encryptKey); + encryptAlgorithm, encryptKey); TSDB_CHECK_CODE(code, lino, _exit); SBufferReader br = BUFFER_READER_INITIALIZER(0, buffer0); @@ -226,7 +226,7 @@ int32_t tsdbSttFileReadBlockDataByColumn(SSttFileReader *reader, const SSttBlk * // load key part tBufferClear(buffer0); code = tsdbReadFileToBuffer(reader->fd, sttBlk->bInfo.offset, sttBlk->bInfo.szKey, buffer0, 0, - encryptAlgorithm, encryptKey); + encryptAlgorithm, encryptKey); TSDB_CHECK_CODE(code, lino, _exit); // decode header @@ -259,12 +259,10 @@ int32_t tsdbSttFileReadBlockDataByColumn(SSttFileReader *reader, const SSttBlk * goto _exit; } - int32_t encryptAlgorithm = reader->config->tsdb->pVnode->config.tsdbCfg.encryptAlgorithm; - char* encryptKey = reader->config->tsdb->pVnode->config.tsdbCfg.encryptKey; // load SBlockCol part tBufferClear(buffer0); code = tsdbReadFileToBuffer(reader->fd, sttBlk->bInfo.offset + sttBlk->bInfo.szKey, hdr.szBlkCol, buffer0, 0, - encryptAlgorithm, encryptKey); + encryptAlgorithm, encryptKey); TSDB_CHECK_CODE(code, lino, _exit); // load each column @@ -340,7 +338,7 @@ int32_t tsdbSttFileReadTombBlock(SSttFileReader *reader, const STombBlk *tombBlk // load tBufferClear(buffer0); code = tsdbReadFileToBuffer(reader->fd, tombBlk->dp->offset, tombBlk->dp->size, buffer0, 0, - encryptAlgorithm, encryptKey); + encryptAlgorithm, encryptKey); TSDB_CHECK_CODE(code, lino, _exit); // decode @@ -380,7 +378,7 @@ int32_t tsdbSttFileReadStatisBlock(SSttFileReader *reader, const SStatisBlk *sta // load data tBufferClear(buffer0); code = tsdbReadFileToBuffer(reader->fd, statisBlk->dp->offset, statisBlk->dp->size, buffer0, 0, - encryptAlgorithm, encryptKey); + encryptAlgorithm, encryptKey); TSDB_CHECK_CODE(code, lino, _exit); // decode data @@ -564,6 +562,9 @@ static int32_t tsdbSttFileDoWriteStatisBlock(SSttFileWriter *writer) { statisBlk.maxTbid.suid = record.suid; statisBlk.maxTbid.uid = record.uid; + int32_t encryptAlgorithm = writer->config->tsdb->pVnode->config.tsdbCfg.encryptAlgorithm; + char* encryptKey = writer->config->tsdb->pVnode->config.tsdbCfg.encryptKey; + // compress each column for (int32_t i = 0; i < ARRAY_SIZE(statisBlk.size); i++) { SCompressInfo info = { @@ -572,10 +573,6 @@ static int32_t tsdbSttFileDoWriteStatisBlock(SSttFileWriter *writer) { .originalSize = statisBlock->buffers[i].size, }; - int32_t encryptAlgorithm = writer->config->tsdb->pVnode->config.tsdbCfg.encryptAlgorithm; - char* encryptKey = writer->config->tsdb->pVnode->config.tsdbCfg.encryptKey; - - for (int32_t i = 0; i < STATIS_RECORD_NUM_ELEM; i++) { tBufferClear(buffer0); code = tCompressDataToBuffer(statisBlock->buffers[i].data, &info, buffer0, assist); TSDB_CHECK_CODE(code, lino, _exit); @@ -610,12 +607,12 @@ static int32_t tsdbSttFileDoWriteStatisBlock(SSttFileWriter *writer) { TSDB_CHECK_CODE(code, lino, _exit); } - code = tsdbWriteFile(writer->fd, writer->file->size, buffer0->data, buffer0->size); + code = tsdbWriteFile(writer->fd, writer->file->size, buffer0->data, buffer0->size, encryptAlgorithm, encryptKey); TSDB_CHECK_CODE(code, lino, _exit); writer->file->size += buffer0->size; statisBlk.dp->size += buffer0->size; - code = tsdbWriteFile(writer->fd, writer->file->size, buffer1->data, buffer1->size); + code = tsdbWriteFile(writer->fd, writer->file->size, buffer1->data, buffer1->size, encryptAlgorithm, encryptKey); TSDB_CHECK_CODE(code, lino, _exit); writer->file->size += buffer1->size; statisBlk.dp->size += buffer1->size;