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

Optimize FullRemoteFileLocation::operator<.

Browse Source
This commit is contained in:
levlam 2023-11-15 13:54:14 +03:00
parent 247c28d6e7
commit 131d96bc04
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/telegram/files/FileLocation.h
View File

@ -524,25 +524,17 @@ class FullRemoteFileLocation {
}
bool operator<(const FullRemoteFileLocation &other) const {
auto lhs_key_type = key_type();
auto rhs_key_type = other.key_type();
if (lhs_key_type != rhs_key_type) {
return lhs_key_type < rhs_key_type;
if (!(variant_ == other.variant_)) {
return variant_ < other.variant_;
}
if (dc_id_ != other.dc_id_) {
return dc_id_ < other.dc_id_;
if (file_type_ != other.file_type_) {
return file_type_ < other.file_type_;
}
return variant_ < other.variant_;
return dc_id_ < other.dc_id_;
}
bool operator==(const FullRemoteFileLocation &other) const {
if (key_type() != other.key_type()) {
return false;
}
if (dc_id_ != other.dc_id_) {
return false;
}
return variant_ == other.variant_;
return variant_ == other.variant_ && file_type_ == other.file_type_ && dc_id_ == other.dc_id_;
}
static const int32 KEY_MAGIC = 0x64374632;

4
td/telegram/files/FileManager.hpp
View File

@ -268,9 +268,9 @@ FileId FileManager::parse_file(ParserT &parser) {
}();
if (has_encryption_key || has_secure_key) {
auto key_type = has_encryption_key ? FileEncryptionKey::Type::Secret : FileEncryptionKey::Type::Secure;
auto encryption_key_type = has_encryption_key ? FileEncryptionKey::Type::Secret : FileEncryptionKey::Type::Secure;
FileEncryptionKey encryption_key;
encryption_key.parse(key_type, parser);
encryption_key.parse(encryption_key_type, parser);
set_encryption_key(file_id, std::move(encryption_key));
}