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

Binlog: reader bugfix

Browse Source 
GitOrigin-RevId: 38271e40782e52d0ab20e74d98d10fc4045ac0c0
This commit is contained in:
Arseny Smirnov 2018-07-13 14:42:03 +03:00
parent c6665dc30e
commit b252fe15ff
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,10 @@ class BinlogReader {
expected_size_ = expected_size; expected_size_ = expected_size;
} }
ChainBufferReader *input() {
return input_;
}
int64 offset() const { int64 offset() const {
return offset_; return offset_;
} }
@ -462,7 +466,6 @@ Status Binlog::load_binlog(const Callback &callback, const Callback &debug_callb
update_read_encryption(); update_read_encryption();
bool ready_flag = false;
fd_.update_flags(Fd::Flag::Read); fd_.update_flags(Fd::Flag::Read);
info_.wrong_password = false; info_.wrong_password = false;
while (true) { while (true) {
@ -492,18 +495,16 @@ Status Binlog::load_binlog(const Callback &callback, const Callback &debug_callb
return Status::OK(); return Status::OK();
} }
} }
ready_flag = false;
} else { } else {
// TODO(now): fix bug // TODO(now): fix bug
if (ready_flag) {
break;
}
TRY_STATUS(fd_.flush_read(max(need_size, static_cast<size_t>(4096)))); TRY_STATUS(fd_.flush_read(max(need_size, static_cast<size_t>(4096))));
buffer_reader_.sync_with_writer(); buffer_reader_.sync_with_writer();
if (byte_flow_flag_) { if (byte_flow_flag_) {
byte_flow_source_.wakeup(); byte_flow_source_.wakeup();
} }
ready_flag = true; if (reader.input()->size() < need_size) {
break;
}
} }
} }