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

FileReferenceManager: bugfixes

Browse Source 
GitOrigin-RevId: 51d33c307297124dddb72224220977e1f31a15bd
This commit is contained in:
Arseny Smirnov 2019-01-18 17:52:49 +03:00
parent a6e47943c3
commit 6ca19e05c5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
td/telegram/FileReferenceManager.cpp
View File

@ -131,6 +131,7 @@ void FileReferenceManager::send_query(Destination dest, FileSourceId file_source
} }
send_lambda(file_manager, [file_manager, dest, new_promise = std::move(new_promise)]() mutable { send_lambda(file_manager, [file_manager, dest, new_promise = std::move(new_promise)]() mutable {
auto view = file_manager.get_actor_unsafe()->get_file_view(dest.node_id); auto view = file_manager.get_actor_unsafe()->get_file_view(dest.node_id);
CHECK(!view.empty());
if (view.has_active_remote_location()) { if (view.has_active_remote_location()) {
new_promise.set_value({}); new_promise.set_value({});
} else { } else {
@ -183,19 +184,19 @@ FileReferenceManager::Destination FileReferenceManager::on_query_result(Destinat
auto query = node.query.get(); auto query = node.query.get();
if (!query) { if (!query) {
return {}; return dest;
} }
if (query->generation != dest.generation) { if (query->generation != dest.generation) {
return {}; return dest;
} }
query->active_queries--; query->active_queries--;
CHECK(query->active_queries >= 0);
if (!query->proxy.empty()) { if (!query->proxy.empty()) {
query->active_queries -= sub; query->active_queries -= sub;
CHECK(query->active_queries >= 0);
auto new_proxy = on_query_result(query->proxy, file_source_id, std::move(status), query->active_queries); auto new_proxy = on_query_result(query->proxy, file_source_id, std::move(status), query->active_queries);
if (!new_proxy.empty()) { query->proxy = new_proxy;
query->proxy = new_proxy;
}
run_node(dest.node_id); run_node(dest.node_id);
return new_proxy; return new_proxy;
} }
@ -220,11 +221,11 @@ void FileReferenceManager::update_file_reference(NodeId node_id, Promise<> promi
auto &node = nodes_[node_id]; auto &node = nodes_[node_id];
if (!node.query) { if (!node.query) {
node.query = make_unique<Query>(); node.query = make_unique<Query>();
node.query->promises.push_back(std::move(promise));
node.query->generation = ++query_generation; node.query->generation = ++query_generation;
node.file_source_ids.reset_position(); node.file_source_ids.reset_position();
VLOG(file_references) << "new query " << query_generation; VLOG(file_references) << "new query " << query_generation;
} }
node.query->promises.push_back(std::move(promise));
run_node(node_id); run_node(node_id);
} }
} // namespace td } // namespace td

2
td/telegram/FileReferenceManager.h
View File

@ -66,7 +66,7 @@ class SetWithPosition {
for (size_t i = other.pos_; i < other.values_.size(); i++) { for (size_t i = other.pos_; i < other.values_.size(); i++) {
new_values_.push_back(other.values_[i]); new_values_.push_back(other.values_[i]);
} }
pos_ += other.values_.size(); pos_ += other.pos_;
} }
private: private: