From c488d139db551b28a5647048ac6cc1ace8bec50e Mon Sep 17 00:00:00 2001 From: zzh Date: Fri, 25 Apr 2025 15:43:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9A=E6=89=8D=E8=BF=98=E6=9C=89=E4=B8=AAbu?= =?UTF-8?q?g=EF=BC=8C=E5=B0=B1=E6=98=AF=E5=89=A9=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E6=AD=A3=E5=A5=BD=E6=97=B618=E5=AD=97?= =?UTF-8?q?=E8=8A=82=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C<=E6=94=B9?= =?UTF-8?q?=E6=88=90<=3D=E5=B0=B1=E8=A1=8C=E4=BA=86=EF=BC=8Cbugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sort/sort.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/sort/sort.cpp b/src/sort/sort.cpp index e1422aa..6f3ed18 100644 --- a/src/sort/sort.cpp +++ b/src/sort/sort.cpp @@ -272,9 +272,9 @@ static size_t doFirstPipeReadFile(FirstPipeArg &p, DataBuffer &halfBlock, FILE * readState = fread(readData.dataBuf, 1, readData.readBufSize, fpr); if (readState == 0) { return 0; } - //if (p.readOrder == 278) { - // spdlog::info("last remain, blocklen: {}, last load: {}", halfBlock.curLen, halfBlock.readPos); - //} + if (p.readOrder == 483) { + spdlog::info("last remain, blocklen: {}, last load: {}", halfBlock.curLen, halfBlock.readPos); + } readData.startAddrArr.clear(); @@ -291,7 +291,7 @@ static size_t doFirstPipeReadFile(FirstPipeArg &p, DataBuffer &halfBlock, FILE * readData.startAddrArr.push_back(readData.blockBuf); } /* 解析读入buf中的文件数据，计算包含的每个block的长度信息和起始地址 */ - while (curReadPos + BLOCK_HEADER_LENGTH < readState) { /* 确保能解析block长度 */ + while (curReadPos + BLOCK_HEADER_LENGTH <= readState) { /* 确保能解析block长度 */ blockLen = unpackInt16(&readData.dataBuf[curReadPos + 16]) + 1; if (blockLen > maxBlockLen) { maxBlockLen = blockLen; } if (curReadPos + blockLen <= readState) { /* 完整的block数据在buf里 */ @@ -307,11 +307,11 @@ static size_t doFirstPipeReadFile(FirstPipeArg &p, DataBuffer &halfBlock, FILE * if (halfBlock.readPos > 0) { memcpy(halfBlock.data, &readData.dataBuf[curReadPos], halfBlock.readPos); // 将不完整的block拷贝到halfBlock } - //if (p.readOrder == 277) { - // spdlog::info("tail - last remain, blocklen: {}, last load: {}", halfBlock.curLen, halfBlock.readPos); - //} - //spdlog::info("block num-1: {}", readData.startAddrArr.size()); - //spdlog::info("max block len: {}", maxBlockLen); + if (p.readOrder == 482) { + spdlog::info("tail - last remain, blocklen: {}, last load: {}", halfBlock.curLen, halfBlock.readPos); + } + // spdlog::info("block num-1: {}", readData.startAddrArr.size()); + spdlog::info("read order: {}, max block len: {}", p.readOrder, maxBlockLen); return readState; }