andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Binlog: more debug

Browse Source 
GitOrigin-RevId: ac3b87bc9650a3518d7538386820ace2c99b176f
This commit is contained in:
Arseny Smirnov 2018-07-03 11:46:22 +03:00
parent 60c5b21ccb
commit 4621bdaff3
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,8 +94,9 @@ class BinlogReader {
BinlogReader() = default; BinlogReader() = default;
explicit BinlogReader(ChainBufferReader *input) : input_(input) { explicit BinlogReader(ChainBufferReader *input) : input_(input) {
} }
void set_input(ChainBufferReader *input) { void set_input(ChainBufferReader *input, bool encrypted) {
input_ = input; input_ = input;
encrypted_ = encrypted;
} }
int64 offset() { int64 offset() {
@ -118,6 +119,11 @@ class BinlogReader {
if (size_ < MIN_EVENT_SIZE) { if (size_ < MIN_EVENT_SIZE) {
return Status::Error(PSLICE() << "Too small event " << tag("size", size_)); return Status::Error(PSLICE() << "Too small event " << tag("size", size_));
} }
if (size_ % 4 != 0) {
LOG(FATAL) << "Event of " << tag("size", size_) << " at " << tag("offset", offset()) << " "
<< tag("encrypted", encrypted_)
<< format::as_hex_dump<4>(Slice(input_->prepare_read().truncate(20)));
}
state_ = ReadEvent; state_ = ReadEvent;
} }
@ -138,6 +144,7 @@ class BinlogReader {
enum { ReadLength, ReadEvent } state_ = ReadLength; enum { ReadLength, ReadEvent } state_ = ReadLength;
size_t size_{0}; size_t size_{0};
int64 offset_{0}; int64 offset_{0};
bool encrypted_{false};
}; };
} // namespace detail } // namespace detail
@ -201,6 +208,10 @@ Status Binlog::init(string path, const Callback &callback, DbKey db_key, DbKey o
} }
void Binlog::add_event(BinlogEvent &&event) { void Binlog::add_event(BinlogEvent &&event) {
if (event.size_ % 4 != 0) {
LOG(FATAL) << "Trying to add event with bad size " << event.public_to_string();
}
if (!events_buffer_) { if (!events_buffer_) {
do_add_event(std::move(event)); do_add_event(std::move(event));
} else { } else {
@ -396,7 +407,7 @@ void Binlog::update_read_encryption() {
CHECK(binlog_reader_ptr_); CHECK(binlog_reader_ptr_);
switch (encryption_type_) { switch (encryption_type_) {
case EncryptionType::None: { case EncryptionType::None: {
binlog_reader_ptr_->set_input(&buffer_reader_); binlog_reader_ptr_->set_input(&buffer_reader_, false);
byte_flow_flag_ = false; byte_flow_flag_ = false;
break; break;
} }
@ -407,7 +418,7 @@ void Binlog::update_read_encryption() {
byte_flow_sink_ = ByteFlowSink(); byte_flow_sink_ = ByteFlowSink();
byte_flow_source_ >> aes_xcode_byte_flow_ >> byte_flow_sink_; byte_flow_source_ >> aes_xcode_byte_flow_ >> byte_flow_sink_;
byte_flow_flag_ = true; byte_flow_flag_ = true;
binlog_reader_ptr_->set_input(byte_flow_sink_.get_output()); binlog_reader_ptr_->set_input(byte_flow_sink_.get_output(), true);
break; break;
} }
} }