Skip to content

Commit

Permalink
Use count instead of find if appropriate.
Browse files Browse the repository at this point in the history
  • Loading branch information
levlam committed May 1, 2022
1 parent 00aa9f5 commit 4652292
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 36 deletions.
2 changes: 1 addition & 1 deletion td/telegram/ContactsManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5297,7 +5297,7 @@ std::pair<vector<UserId>, vector<int32>> ContactsManager::import_contacts(const

do {
random_id = Random::secure_int64();
} while (random_id == 0 || imported_contacts_.find(random_id) != imported_contacts_.end());
} while (random_id == 0 || imported_contacts_.count(random_id) > 0);
imported_contacts_[random_id]; // reserve place for result

do_import_contacts(contacts, random_id, std::move(promise));
Expand Down
38 changes: 18 additions & 20 deletions td/telegram/MessagesManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6371,7 +6371,7 @@ void MessagesManager::skip_old_pending_pts_update(tl_object_ptr<telegram_api::Up
if (update->get_id() == telegram_api::updateNewMessage::ID) {
auto update_new_message = static_cast<telegram_api::updateNewMessage *>(update.get());
auto full_message_id = get_full_message_id(update_new_message->message_, false);
if (update_message_ids_.find(full_message_id) != update_message_ids_.end()) {
if (update_message_ids_.count(full_message_id) > 0) {
if (new_pts == old_pts) { // otherwise message can be already deleted
// apply sent message anyway
on_get_message(std::move(update_new_message->message_), true, false, false, true, true,
Expand Down Expand Up @@ -7587,7 +7587,7 @@ void MessagesManager::add_pending_channel_update(DialogId dialog_id, tl_object_p
auto update_new_channel_message = static_cast<telegram_api::updateNewChannelMessage *>(update.get());
auto message_id = get_message_id(update_new_channel_message->message_, false);
FullMessageId full_message_id(dialog_id, message_id);
if (update_message_ids_.find(full_message_id) != update_message_ids_.end()) {
if (update_message_ids_.count(full_message_id) > 0) {
// apply sent channel message
on_get_message(std::move(update_new_channel_message->message_), true, true, false, true, true,
"updateNewChannelMessage with an awaited message");
Expand Down Expand Up @@ -19145,7 +19145,7 @@ void MessagesManager::add_dialog_filter(unique_ptr<DialogFilter> dialog_filter,
}

auto dialog_list_id = DialogListId(dialog_filter_id);
CHECK(dialog_lists_.find(dialog_list_id) == dialog_lists_.end());
CHECK(dialog_lists_.count(dialog_list_id) == 0);

auto &list = add_dialog_list(dialog_list_id);
auto folder_ids = get_dialog_list_folder_ids(list);
Expand Down Expand Up @@ -20296,7 +20296,7 @@ DialogId MessagesManager::create_new_group_chat(const vector<UserId> &user_ids,

do {
random_id = Random::secure_int64();
} while (random_id == 0 || created_dialogs_.find(random_id) != created_dialogs_.end());
} while (random_id == 0 || created_dialogs_.count(random_id) > 0);
created_dialogs_[random_id]; // reserve place for result

td_->create_handler<CreateChatQuery>(std::move(promise))->send(std::move(input_users), new_title, random_id);
Expand Down Expand Up @@ -20334,7 +20334,7 @@ DialogId MessagesManager::create_new_channel_chat(const string &title, bool is_m

do {
random_id = Random::secure_int64();
} while (random_id == 0 || created_dialogs_.find(random_id) != created_dialogs_.end());
} while (random_id == 0 || created_dialogs_.count(random_id) > 0);
created_dialogs_[random_id]; // reserve place for result

td_->create_handler<CreateChannelQuery>(std::move(promise))
Expand Down Expand Up @@ -21887,7 +21887,7 @@ std::pair<DialogId, vector<MessageId>> MessagesManager::get_message_thread_histo

do {
random_id = Random::secure_int64();
} while (random_id == 0 || found_dialog_messages_.find(random_id) != found_dialog_messages_.end());
} while (random_id == 0 || found_dialog_messages_.count(random_id) > 0);
found_dialog_messages_[random_id]; // reserve place for result

td_->create_handler<SearchMessagesQuery>(std::move(promise))
Expand Down Expand Up @@ -21936,7 +21936,7 @@ td_api::object_ptr<td_api::messageCalendar> MessagesManager::get_dialog_message_

do {
random_id = Random::secure_int64();
} while (random_id == 0 || found_dialog_message_calendars_.find(random_id) != found_dialog_message_calendars_.end());
} while (random_id == 0 || found_dialog_message_calendars_.count(random_id) > 0);
found_dialog_message_calendars_[random_id]; // reserve place for result

CHECK(filter != MessageSearchFilter::Call && filter != MessageSearchFilter::MissedCall);
Expand Down Expand Up @@ -22150,7 +22150,7 @@ std::pair<int32, vector<MessageId>> MessagesManager::search_dialog_messages(

do {
random_id = Random::secure_int64();
} while (random_id == 0 || found_dialog_messages_.find(random_id) != found_dialog_messages_.end());
} while (random_id == 0 || found_dialog_messages_.count(random_id) > 0);
found_dialog_messages_[random_id]; // reserve place for result

if (filter == MessageSearchFilter::UnreadMention || filter == MessageSearchFilter::UnreadReaction) {
Expand Down Expand Up @@ -22270,7 +22270,7 @@ std::pair<int32, vector<FullMessageId>> MessagesManager::search_call_messages(Me

do {
random_id = Random::secure_int64();
} while (random_id == 0 || found_call_messages_.find(random_id) != found_call_messages_.end());
} while (random_id == 0 || found_call_messages_.count(random_id) > 0);
found_call_messages_[random_id]; // reserve place for result

auto filter = only_missed ? MessageSearchFilter::MissedCall : MessageSearchFilter::Call;
Expand Down Expand Up @@ -22863,7 +22863,7 @@ MessagesManager::FoundMessages MessagesManager::offline_search_messages(DialogId

do {
random_id = Random::secure_int64();
} while (random_id == 0 || found_fts_messages_.find(random_id) != found_fts_messages_.end());
} while (random_id == 0 || found_fts_messages_.count(random_id) > 0);
found_fts_messages_[random_id]; // reserve place for result

G()->td_db()->get_messages_db_async()->get_messages_fts(
Expand Down Expand Up @@ -22996,7 +22996,7 @@ std::pair<int32, vector<FullMessageId>> MessagesManager::search_messages(

do {
random_id = Random::secure_int64();
} while (random_id == 0 || found_messages_.find(random_id) != found_messages_.end());
} while (random_id == 0 || found_messages_.count(random_id) > 0);
found_messages_[random_id]; // reserve place for result

LOG(DEBUG) << "Search all messages filtered by " << filter << " with query = \"" << query << "\" from date "
Expand Down Expand Up @@ -23027,8 +23027,7 @@ int64 MessagesManager::get_dialog_message_by_date(DialogId dialog_id, int32 date
int64 random_id = 0;
do {
random_id = Random::secure_int64();
} while (random_id == 0 ||
get_dialog_message_by_date_results_.find(random_id) != get_dialog_message_by_date_results_.end());
} while (random_id == 0 || get_dialog_message_by_date_results_.count(random_id) > 0);
get_dialog_message_by_date_results_[random_id]; // reserve place for result

auto message_id = find_message_by_date(d->messages.get(), date);
Expand Down Expand Up @@ -24477,7 +24476,7 @@ int64 MessagesManager::generate_new_random_id() {
int64 random_id;
do {
random_id = Random::secure_int64();
} while (random_id == 0 || being_sent_messages_.find(random_id) != being_sent_messages_.end());
} while (random_id == 0 || being_sent_messages_.count(random_id) > 0);
return random_id;
}

Expand Down Expand Up @@ -28577,7 +28576,7 @@ void MessagesManager::start_import_messages(DialogId dialog_id, int64 import_id,
int64 random_id;
do {
random_id = Random::secure_int64();
} while (random_id == 0 || pending_message_imports_.find(random_id) != pending_message_imports_.end());
} while (random_id == 0 || pending_message_imports_.count(random_id) > 0);
pending_message_imports_[random_id] = std::move(pending_message_import);

multipromise.add_promise(PromiseCreator::lambda([actor_id = actor_id(this), random_id](Result<Unit> result) {
Expand Down Expand Up @@ -31964,10 +31963,10 @@ void MessagesManager::on_create_new_dialog_success(int64 random_id, tl_object_pt
return promise.set_value(Unit());
}

if (pending_created_dialogs_.find(dialog_id) == pending_created_dialogs_.end()) {
if (pending_created_dialogs_.count(dialog_id) == 0) {
pending_created_dialogs_.emplace(dialog_id, std::move(promise));
} else {
LOG(ERROR) << dialog_id << " returned twice as result of chat creation";
LOG(ERROR) << "Receive twice " << dialog_id << " as result of chat creation";
return on_create_new_dialog_fail(random_id, Status::Error(500, "Chat was created earlier"), std::move(promise));
}

Expand Down Expand Up @@ -37287,7 +37286,7 @@ MessagesManager::DialogList &MessagesManager::add_dialog_list(DialogListId dialo
if (dialog_list_id.is_folder() && dialog_list_id.get_folder_id() != FolderId::archive()) {
dialog_list_id = DialogListId(FolderId::main());
}
if (dialog_lists_.find(dialog_list_id) == dialog_lists_.end()) {
if (dialog_lists_.count(dialog_list_id) == 0) {
LOG(INFO) << "Create " << dialog_list_id;
}
auto &list = dialog_lists_[dialog_list_id];
Expand Down Expand Up @@ -37661,8 +37660,7 @@ void MessagesManager::process_get_channel_difference_updates(
auto update_new_channel_message = static_cast<telegram_api::updateNewChannelMessage *>(update.get());
auto message_id = get_message_id(update_new_channel_message->message_, false);
FullMessageId full_message_id(dialog_id, message_id);
if (update_message_ids_.find(full_message_id) != update_message_ids_.end() &&
changed_message_ids.find(message_id) != changed_message_ids.end()) {
if (update_message_ids_.count(full_message_id) > 0 && changed_message_ids.count(message_id) > 0) {
changed_message_ids.erase(message_id);
AwaitedMessage awaited_message;
awaited_message.message = std::move(update_new_channel_message->message_);
Expand Down
2 changes: 1 addition & 1 deletion td/telegram/PollManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,7 @@ void PollManager::on_update_poll_timeout(PollId poll_id) {
if (poll->is_closed && poll->is_updated_after_close) {
return;
}
if (pending_answers_.find(poll_id) != pending_answers_.end()) {
if (pending_answers_.count(poll_id) > 0) {
LOG(INFO) << "Skip fetching results of " << poll_id << ", because it is being voted now";
return;
}
Expand Down
2 changes: 1 addition & 1 deletion td/telegram/SecretChatActor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ void SecretChatActor::run_fill_gaps() {
auto message = std::move(begin->second);
pending_inbound_messages_.erase(begin);
check_status(do_inbound_message_decrypted_unchecked(std::move(message), -1));
CHECK(pending_inbound_messages_.find(next_seq_no) == pending_inbound_messages_.end());
CHECK(pending_inbound_messages_.count(next_seq_no) == 0);
} else {
break;
}
Expand Down
9 changes: 4 additions & 5 deletions td/telegram/StickersManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5867,7 +5867,7 @@ void StickersManager::create_new_sticker_set(UserId user_id, string &title, stri
int64 random_id;
do {
random_id = Random::secure_int64();
} while (random_id == 0 || pending_new_sticker_sets_.find(random_id) != pending_new_sticker_sets_.end());
} while (random_id == 0 || pending_new_sticker_sets_.count(random_id) > 0);
pending_new_sticker_sets_[random_id] = std::move(pending_new_sticker_set);

multipromise.add_promise(PromiseCreator::lambda([actor_id = actor_id(this), random_id](Result<Unit> result) {
Expand Down Expand Up @@ -6066,7 +6066,7 @@ void StickersManager::add_sticker_to_set(UserId user_id, string &short_name,
int64 random_id;
do {
random_id = Random::secure_int64();
} while (random_id == 0 || pending_add_sticker_to_sets_.find(random_id) != pending_add_sticker_to_sets_.end());
} while (random_id == 0 || pending_add_sticker_to_sets_.count(random_id) > 0);
pending_add_sticker_to_sets_[random_id] = std::move(pending_add_sticker_to_set);

auto on_upload_promise = PromiseCreator::lambda([random_id](Result<Unit> result) {
Expand Down Expand Up @@ -6162,8 +6162,7 @@ void StickersManager::do_set_sticker_set_thumbnail(UserId user_id, string short_
int64 random_id;
do {
random_id = Random::secure_int64();
} while (random_id == 0 ||
pending_set_sticker_set_thumbnails_.find(random_id) != pending_set_sticker_set_thumbnails_.end());
} while (random_id == 0 || pending_set_sticker_set_thumbnails_.count(random_id) > 0);
pending_set_sticker_set_thumbnails_[random_id] = std::move(pending_set_sticker_set_thumbnail);

auto on_upload_promise = PromiseCreator::lambda([random_id](Result<Unit> result) {
Expand Down Expand Up @@ -7590,7 +7589,7 @@ int64 StickersManager::get_emoji_suggestions_url(const string &language_code, Pr
int64 random_id = 0;
do {
random_id = Random::secure_int64();
} while (random_id == 0 || emoji_suggestions_urls_.find(random_id) != emoji_suggestions_urls_.end());
} while (random_id == 0 || emoji_suggestions_urls_.count(random_id) > 0);
emoji_suggestions_urls_[random_id]; // reserve place for result

auto query_promise =
Expand Down
2 changes: 1 addition & 1 deletion td/telegram/UpdatesManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1817,7 +1817,7 @@ void UpdatesManager::on_pending_updates(vector<tl_object_ptr<telegram_api::Updat

LOG(INFO) << "Gap in seq has found. Receive " << updates.size() << " updates [" << seq_begin << ", " << seq_end
<< "] from " << source << ", but seq = " << seq_;
LOG_IF(WARNING, pending_seq_updates_.find(seq_begin) != pending_seq_updates_.end())
LOG_IF(WARNING, pending_seq_updates_.count(seq_begin) > 0)
<< "Already have pending updates with seq = " << seq_begin << ", but receive it again from " << source;

pending_seq_updates_.emplace(
Expand Down
8 changes: 4 additions & 4 deletions td/telegram/files/FileLoadManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void FileLoadManager::download(QueryId id, const FullRemoteFileLocation &remote_
if (stop_flag_) {
return;
}
CHECK(query_id_to_node_id_.find(id) == query_id_to_node_id_.end());
CHECK(query_id_to_node_id_.count(id) == 0);
NodeId node_id = nodes_container_.create(Node());
Node *node = nodes_container_.get(node_id);
CHECK(node);
Expand All @@ -68,7 +68,7 @@ void FileLoadManager::upload(QueryId id, const LocalFileLocation &local_location
if (stop_flag_) {
return;
}
CHECK(query_id_to_node_id_.find(id) == query_id_to_node_id_.end());
CHECK(query_id_to_node_id_.count(id) == 0);
NodeId node_id = nodes_container_.create(Node());
Node *node = nodes_container_.get(node_id);
CHECK(node);
Expand All @@ -86,7 +86,7 @@ void FileLoadManager::upload_by_hash(QueryId id, const FullLocalFileLocation &lo
if (stop_flag_) {
return;
}
CHECK(query_id_to_node_id_.find(id) == query_id_to_node_id_.end());
CHECK(query_id_to_node_id_.count(id) == 0);
NodeId node_id = nodes_container_.create(Node());
Node *node = nodes_container_.get(node_id);
CHECK(node);
Expand Down Expand Up @@ -117,7 +117,7 @@ void FileLoadManager::from_bytes(QueryId id, FileType type, BufferSlice bytes, s
if (stop_flag_) {
return;
}
CHECK(query_id_to_node_id_.find(id) == query_id_to_node_id_.end());
CHECK(query_id_to_node_id_.count(id) == 0);
NodeId node_id = nodes_container_.create(Node());
Node *node = nodes_container_.get(node_id);
CHECK(node);
Expand Down
2 changes: 1 addition & 1 deletion tdactor/td/actor/Timeout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace td {

bool MultiTimeout::has_timeout(int64 key) const {
return items_.find(Item(key)) != items_.end();
return items_.count(Item(key)) > 0;
}

void MultiTimeout::set_timeout_at(int64 key, double timeout) {
Expand Down
2 changes: 1 addition & 1 deletion tdutils/td/utils/Hints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ std::pair<size_t, vector<Hints::KeyT>> Hints::search(Slice query, int32 limit, b
}

bool Hints::has_key(KeyT key) const {
return key_to_name_.find(key) != key_to_name_.end();
return key_to_name_.count(key) > 0;
}

string Hints::key_to_string(KeyT key) const {
Expand Down
2 changes: 1 addition & 1 deletion tdutils/td/utils/port/FileFd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ static Status create_local_lock(const string &path, int32 &max_tries) {
while (true) {
{ // mutex lock scope
std::lock_guard<std::mutex> lock(in_process_lock_mutex);
if (!path.empty() && locked_files.find(path) == locked_files.end()) {
if (!path.empty() && locked_files.count(path) == 0) {
VLOG(fd) << "Lock file \"" << path << '"';
locked_files.insert(path);
return Status::OK();
Expand Down

0 comments on commit 4652292

Please sign in to comment.