tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always initialize BinlogEvent.offset_.

Browse Source
This commit is contained in:
levlam 2023-02-02 15:45:20 +03:00
parent 0e58eeb5e9
commit d6b7770561
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tddb/td/db/binlog/Binlog.cpp
View File

@ -549,6 +549,7 @@ Status Binlog::load_binlog(const Callback &callback, const Callback &debug_callb
} }
auto offset = processor_->offset(); auto offset = processor_->offset();
CHECK(offset >= 0);
processor_->for_each([&](BinlogEvent &event) { processor_->for_each([&](BinlogEvent &event) {
VLOG(binlog) << "Replay binlog event: " << event.public_to_string(); VLOG(binlog) << "Replay binlog event: " << event.public_to_string();
if (callback) { if (callback) {

1
tddb/td/db/binlog/BinlogEvent.cpp
View File

@ -29,6 +29,7 @@ void BinlogEvent::init(BufferSlice &&raw_event) {
} }
Slice BinlogEvent::get_data() const { Slice BinlogEvent::get_data() const {
CHECK(raw_event_.size() >= MIN_SIZE);
return Slice(raw_event_.as_slice().data() + HEADER_SIZE, size_ - MIN_SIZE); return Slice(raw_event_.as_slice().data() + HEADER_SIZE, size_ - MIN_SIZE);
} }

2
tddb/td/db/binlog/BinlogEvent.h
View File

@ -53,7 +53,7 @@ struct BinlogEvent {
static constexpr size_t TAIL_SIZE = 4; static constexpr size_t TAIL_SIZE = 4;
static constexpr size_t MIN_SIZE = HEADER_SIZE + TAIL_SIZE; static constexpr size_t MIN_SIZE = HEADER_SIZE + TAIL_SIZE;
int64 offset_; int64 offset_ = -1;
uint32 size_; uint32 size_;
uint64 id_; uint64 id_;

4
tddb/td/db/binlog/detail/BinlogEventsProcessor.cpp
View File

@ -37,8 +37,8 @@ Status BinlogEventsProcessor::do_event(BinlogEvent &&event) {
// just skip service events // just skip service events
} else { } else {
if (!(event_ids_.empty() || event_ids_.back() < fixed_event_id)) { if (!(event_ids_.empty() || event_ids_.back() < fixed_event_id)) {
return Status::Error(PSLICE() << offset_ << " " << event_ids_.size() << " " << event_ids_.back() << " " return Status::Error(PSLICE() << offset_ << ' ' << event_ids_.size() << ' ' << event_ids_.back() << ' '
<< fixed_event_id << " " << event.public_to_string() << " " << total_events_ << " " << fixed_event_id << ' ' << event.public_to_string() << ' ' << total_events_ << ' '
<< total_raw_events_size_); << total_raw_events_size_);
} }
last_event_id_ = event.id_; last_event_id_ = event.id_;