From 9c9c1bb51c6342970ba2f33d55bfc2b816f1ff4f Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 28 Oct 2023 00:06:56 +0300 Subject: [PATCH] Minor improvements. --- td/telegram/net/DcOptionsSet.cpp | 6 +++--- tddb/td/db/BinlogKeyValue.h | 5 +++-- tddb/td/db/KeyValueSyncInterface.h | 3 ++- tdutils/td/utils/FloodControlStrict.h | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/td/telegram/net/DcOptionsSet.cpp b/td/telegram/net/DcOptionsSet.cpp index 4589f52b7..cc55d2f49 100644 --- a/td/telegram/net/DcOptionsSet.cpp +++ b/td/telegram/net/DcOptionsSet.cpp @@ -110,7 +110,7 @@ vector DcOptionsSet::find_all_connections(DcId dc_ if (!static_options.empty()) { options = std::move(static_options); } else { - bool have_ipv4 = td::any_of(options, [](const auto &v) { return !v.option->is_ipv6(); }); + bool have_ipv4 = any_of(options, [](const auto &v) { return !v.option->is_ipv6(); }); if (have_ipv4) { td::remove_if(options, [](auto &v) { return v.option->is_ipv6(); }); } @@ -122,13 +122,13 @@ vector DcOptionsSet::find_all_connections(DcId dc_ } if (prefer_ipv6) { - bool have_ipv6 = td::any_of(options, [](const auto &v) { return v.option->is_ipv6(); }); + bool have_ipv6 = any_of(options, [](const auto &v) { return v.option->is_ipv6(); }); if (have_ipv6) { td::remove_if(options, [](auto &v) { return !v.option->is_ipv6(); }); } } - bool have_media_only = td::any_of(options, [](const auto &v) { return v.option->is_media_only(); }); + bool have_media_only = any_of(options, [](const auto &v) { return v.option->is_media_only(); }); if (have_media_only) { td::remove_if(options, [](auto &v) { return !v.option->is_media_only(); }); } diff --git a/tddb/td/db/BinlogKeyValue.h b/tddb/td/db/BinlogKeyValue.h index fa9cc405a..0665aefa8 100644 --- a/tddb/td/db/BinlogKeyValue.h +++ b/tddb/td/db/BinlogKeyValue.h @@ -15,6 +15,7 @@ #include "td/utils/buffer.h" #include "td/utils/common.h" #include "td/utils/FlatHashMap.h" +#include "td/utils/HashTableUtils.h" #include "td/utils/logging.h" #include "td/utils/misc.h" #include "td/utils/port/RwMutex.h" @@ -219,9 +220,9 @@ class BinlogKeyValue final : public KeyValueSyncInterface { binlog_->lazy_sync(std::move(promise)); } - std::unordered_map prefix_get(Slice prefix) final { + std::unordered_map> prefix_get(Slice prefix) final { auto lock = rw_mutex_.lock_write().move_as_ok(); - std::unordered_map res; + std::unordered_map> res; for (const auto &kv : map_) { if (begins_with(kv.first, prefix)) { res.emplace(kv.first.substr(prefix.size()), kv.second.first); diff --git a/tddb/td/db/KeyValueSyncInterface.h b/tddb/td/db/KeyValueSyncInterface.h index 0fb50ced8..ed29c6b96 100644 --- a/tddb/td/db/KeyValueSyncInterface.h +++ b/tddb/td/db/KeyValueSyncInterface.h @@ -8,6 +8,7 @@ #include "td/utils/common.h" #include "td/utils/FlatHashMap.h" +#include "td/utils/HashTableUtils.h" #include "td/utils/Promise.h" #include "td/utils/Slice.h" @@ -34,7 +35,7 @@ class KeyValueSyncInterface { virtual string get(const string &key) = 0; - virtual std::unordered_map prefix_get(Slice prefix) = 0; + virtual std::unordered_map> prefix_get(Slice prefix) = 0; virtual FlatHashMap get_all() = 0; diff --git a/tdutils/td/utils/FloodControlStrict.h b/tdutils/td/utils/FloodControlStrict.h index e21688717..56ba71c41 100644 --- a/tdutils/td/utils/FloodControlStrict.h +++ b/tdutils/td/utils/FloodControlStrict.h @@ -12,7 +12,7 @@ namespace td { -// More strict implementaions of flood control than FloodControlFast. +// More strict implementations of flood control than FloodControlFast. // Should be just fine for small counters. class FloodControlStrict { public: