This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new f00c10317e4 branch-3.0: [fix](group commit) fix wal reader handle
empty block #48290 (#48333)
f00c10317e4 is described below
commit f00c10317e40586f1e7d7ee33c77137e236a4fea
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Feb 26 09:51:29 2025 +0800
branch-3.0: [fix](group commit) fix wal reader handle empty block #48290
(#48333)
Cherry-picked from #48290
Co-authored-by: meiyi <me...@selectdb.com>
---
be/src/olap/wal/wal_reader.cpp | 16 +++++++++++++---
be/src/olap/wal/wal_reader.h | 1 +
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/be/src/olap/wal/wal_reader.cpp b/be/src/olap/wal/wal_reader.cpp
index 6e6a530f8db..2e432134749 100644
--- a/be/src/olap/wal/wal_reader.cpp
+++ b/be/src/olap/wal/wal_reader.cpp
@@ -31,9 +31,13 @@ WalReader::WalReader(const std::string& file_name) :
_file_name(file_name), _off
WalReader::~WalReader() = default;
-static Status _deserialize(PBlock& block, const std::string& buf) {
+Status WalReader::_deserialize(PBlock& block, const std::string& buf, size_t
block_len,
+ size_t bytes_read) {
if (UNLIKELY(!block.ParseFromString(buf))) {
- return Status::InternalError("failed to deserialize row");
+ return Status::InternalError(
+ "failed to deserialize row, file_size=" +
std::to_string(file_reader->size()) +
+ ", read_offset=" + std::to_string(_offset) + +", block_bytes="
+
+ std::to_string(block_len) + ", read_block_bytes=" +
std::to_string(bytes_read));
}
return Status::OK();
}
@@ -69,12 +73,18 @@ Status WalReader::read_block(PBlock& block) {
if (block_len == 0) {
return Status::DataQualityError("fail to read wal {} ,block is empty",
_file_name);
}
+ if (_offset == file_reader->size()) {
+ LOG(WARNING) << "need read block with length=" << block_len << ", but
offset=" << _offset
+ << " reached end of WAL (path=" << _file_name
+ << ", size=" << file_reader->size() << ")";
+ return Status::EndOfFile("end of wal file");
+ }
// read block
std::string block_buf;
block_buf.resize(block_len);
RETURN_IF_ERROR(file_reader->read_at(_offset, {block_buf.c_str(),
block_len}, &bytes_read));
+ RETURN_IF_ERROR(_deserialize(block, block_buf, block_len, bytes_read));
_offset += block_len;
- RETURN_IF_ERROR(_deserialize(block, block_buf));
// checksum
uint8_t checksum_len_buf[WalWriter::CHECKSUM_SIZE];
RETURN_IF_ERROR(file_reader->read_at(_offset, {checksum_len_buf,
WalWriter::CHECKSUM_SIZE},
diff --git a/be/src/olap/wal/wal_reader.h b/be/src/olap/wal/wal_reader.h
index c47d029331a..d4044fa6f24 100644
--- a/be/src/olap/wal/wal_reader.h
+++ b/be/src/olap/wal/wal_reader.h
@@ -35,6 +35,7 @@ public:
Status read_header(uint32_t& version, std::string& col_ids);
private:
+ Status _deserialize(PBlock& block, const std::string& buf, size_t
block_len, size_t bytes_read);
Status _check_checksum(const char* binary, size_t size, uint32_t checksum);
std::string _file_name;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
