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

Add dialog_id to on_load_dialog_from_database.

Browse Source 
GitOrigin-RevId: 4c5d84b580ce716be7b14e2ea3a4321434dd97f9
This commit is contained in:
levlam 2018-10-29 20:16:31 +03:00
parent 51eec319b8
commit 53ecae8b0a
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
td/telegram/MessagesManager.cpp
View File

@ -10675,7 +10675,7 @@ void MessagesManager::on_get_dialogs_from_database(vector<BufferSlice> &&dialogs
LOG(INFO) << "Receive " << dialogs.size() << " dialogs in result of GetDialogsFromDatabase"; LOG(INFO) << "Receive " << dialogs.size() << " dialogs in result of GetDialogsFromDatabase";
DialogDate max_dialog_date = MIN_DIALOG_DATE; DialogDate max_dialog_date = MIN_DIALOG_DATE;
for (auto &dialog : dialogs) { for (auto &dialog : dialogs) {
Dialog *d = on_load_dialog_from_database(std::move(dialog)); Dialog *d = on_load_dialog_from_database(DialogId(), std::move(dialog));
if (d == nullptr) { if (d == nullptr) {
continue; continue;
} }
@ -21611,7 +21611,7 @@ MessagesManager::Dialog *MessagesManager::get_dialog_force(DialogId dialog_id) {
} }
LOG(INFO) << "Try to load " << dialog_id << " from database"; LOG(INFO) << "Try to load " << dialog_id << " from database";
auto d = on_load_dialog_from_database(G()->td_db()->get_dialog_db_sync()->get_dialog(dialog_id)); auto d = on_load_dialog_from_database(dialog_id, G()->td_db()->get_dialog_db_sync()->get_dialog(dialog_id));
CHECK(d == nullptr || d->dialog_id == dialog_id) << d->dialog_id << " " << dialog_id; CHECK(d == nullptr || d->dialog_id == dialog_id) << d->dialog_id << " " << dialog_id;
return d; return d;
} }
@ -21624,7 +21624,7 @@ unique_ptr<MessagesManager::Dialog> MessagesManager::parse_dialog(DialogId dialo
loaded_dialogs_.insert(dialog_id); loaded_dialogs_.insert(dialog_id);
auto status = log_event_parse(*d, value.as_slice()); auto status = log_event_parse(*d, value.as_slice());
if (status.is_error() || !d->dialog_id.is_valid()) { if (status.is_error() || !d->dialog_id.is_valid() || d->dialog_id != dialog_id) {
// can't happen unless database is broken, but has been seen in the wild // can't happen unless database is broken, but has been seen in the wild
// if dialog_id is invalid, we can't repair the dialog // if dialog_id is invalid, we can't repair the dialog
CHECK(dialog_id.is_valid()) << "Can't repair " << dialog_id << ' ' << d->dialog_id << ' ' << status << ' ' CHECK(dialog_id.is_valid()) << "Can't repair " << dialog_id << ' ' << d->dialog_id << ' ' << status << ' '
@ -21662,23 +21662,25 @@ unique_ptr<MessagesManager::Dialog> MessagesManager::parse_dialog(DialogId dialo
return d; return d;
} }
MessagesManager::Dialog *MessagesManager::on_load_dialog_from_database(const Result<BufferSlice> &r_value) { MessagesManager::Dialog *MessagesManager::on_load_dialog_from_database(DialogId dialog_id,
const Result<BufferSlice> &r_value) {
CHECK(G()->parameters().use_message_db); CHECK(G()->parameters().use_message_db);
if (!r_value.is_ok()) { if (!r_value.is_ok()) {
return nullptr; return nullptr;
} }
// hack
LogEventParser dialog_id_parser(r_value.ok().as_slice());
int32 flags;
DialogId dialog_id;
parse(flags, dialog_id_parser);
parse(dialog_id, dialog_id_parser);
if (!dialog_id.is_valid()) { if (!dialog_id.is_valid()) {
LOG(ERROR) << "Failed to parse dialog_id from blob. Database is broken"; // hack
return nullptr; LogEventParser dialog_id_parser(r_value.ok().as_slice());
int32 flags;
parse(flags, dialog_id_parser);
parse(dialog_id, dialog_id_parser);
if (!dialog_id.is_valid()) {
LOG(ERROR) << "Failed to parse dialog_id from blob. Database is broken";
return nullptr;
}
} }
auto old_d = get_dialog(dialog_id); auto old_d = get_dialog(dialog_id);

2
td/telegram/MessagesManager.h
View File

@ -1587,7 +1587,7 @@ class MessagesManager : public Actor {
Dialog *get_dialog_force(DialogId dialog_id); Dialog *get_dialog_force(DialogId dialog_id);
Dialog *on_load_dialog_from_database(const Result<BufferSlice> &r_value); Dialog *on_load_dialog_from_database(DialogId dialog_id, const Result<BufferSlice> &r_value);
void on_get_dialogs_from_database(vector<BufferSlice> &&dialogs, Promise<Unit> &&promise); void on_get_dialogs_from_database(vector<BufferSlice> &&dialogs, Promise<Unit> &&promise);