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

Improve OrderedMessages::insert.

Browse Source
This commit is contained in:
levlam 2023-05-03 12:29:41 +03:00
parent 4444204874
commit 1eb98e9ce5
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
td/telegram/MessagesManager.cpp
View File

@ -34785,13 +34785,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
} }
} }
bool is_attached = false; auto old_last_message_id = d->last_message_id;
if (auto_attach) {
auto attach_info = d->ordered_messages.auto_attach_message(message_id, d->last_message_id, source);
have_previous = attach_info.have_previous_;
have_next = attach_info.have_next_;
is_attached = have_previous || have_next;
}
if (!td_->auth_manager_->is_bot()) { if (!td_->auth_manager_->is_bot()) {
if (*need_update) { if (*need_update) {
@ -35002,7 +34996,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
Message *result_message = message.get(); Message *result_message = message.get();
d->messages.set(message_id, std::move(message)); d->messages.set(message_id, std::move(message));
d->ordered_messages.insert(message_id, is_attached, have_previous, have_next); d->ordered_messages.insert(message_id, auto_attach, have_previous, have_next, old_last_message_id, source);
if (m->message_id.is_yet_unsent() && !m->message_id.is_scheduled() && m->top_thread_message_id.is_valid() && if (m->message_id.is_yet_unsent() && !m->message_id.is_scheduled() && m->top_thread_message_id.is_valid() &&
!td_->auth_manager_->is_bot()) { !td_->auth_manager_->is_bot()) {

28
td/telegram/OrderedMessage.cpp
View File

@ -10,8 +10,18 @@
namespace td { namespace td {
void OrderedMessages::insert(MessageId message_id, bool was_auto_attached, bool have_previous, bool have_next) { void OrderedMessages::insert(MessageId message_id, bool auto_attach, bool have_previous, bool have_next,
if (!was_auto_attached && !have_previous && !have_next) { MessageId old_last_message_id, const char *source) {
bool is_attached = false;
if (auto_attach) {
CHECK(have_previous && have_next);
auto attach_info = auto_attach_message(message_id, old_last_message_id, source);
have_previous = attach_info.have_previous_;
have_next = attach_info.have_next_;
is_attached = have_previous || have_next;
}
if (!is_attached && !have_previous && !have_next) {
auto it = get_iterator(message_id); auto it = get_iterator(message_id);
if (*it != nullptr && (*it)->have_next_) { if (*it != nullptr && (*it)->have_next_) {
// need to drop a connection between messages // need to drop a connection between messages
@ -62,12 +72,12 @@ void OrderedMessages::insert(MessageId message_id, bool was_auto_attached, bool
CHECK(*right == nullptr); CHECK(*right == nullptr);
*v = std::move(message); *v = std::move(message);
if (!was_auto_attached) { if (!is_attached) {
if (have_next) { if (have_next) {
CHECK(!have_previous); CHECK(!have_previous);
attach_message_to_next(message_id, "OrderedMessages::insert"); attach_message_to_next(message_id, source);
} else if (have_previous) { } else if (have_previous) {
attach_message_to_previous(message_id, "OrderedMessages::insert"); attach_message_to_previous(message_id, source);
} }
} else { } else {
(*v)->have_previous_ = have_previous; (*v)->have_previous_ = have_previous;
@ -177,11 +187,11 @@ OrderedMessages::AttachInfo OrderedMessages::auto_attach_message(MessageId messa
CHECK(next_message != nullptr); CHECK(next_message != nullptr);
if (next_message->message_id_.is_server()) { if (next_message->message_id_.is_server()) {
LOG(ERROR) << "Attach " << message_id << " before " << next_message->message_id_ << " and after " LOG(ERROR) << "Attach " << message_id << " before " << next_message->message_id_ << " and after "
<< previous_message_id; << previous_message_id << " from " << source;
} }
} }
LOG(INFO) << "Attach " << message_id << " to the previous " << previous_message_id; LOG(INFO) << "Attach " << message_id << " to the previous " << previous_message_id << " from " << source;
auto have_next = previous_message->have_next_; auto have_next = previous_message->have_next_;
previous_message->have_next_ = true; previous_message->have_next_ = true;
return {true, have_next}; return {true, have_next};
@ -201,13 +211,13 @@ OrderedMessages::AttachInfo OrderedMessages::auto_attach_message(MessageId messa
} }
if (next_message != nullptr) { if (next_message != nullptr) {
CHECK(!next_message->have_previous_); CHECK(!next_message->have_previous_);
LOG(INFO) << "Attach " << message_id << " to the next " << next_message->message_id_; LOG(INFO) << "Attach " << message_id << " to the next " << next_message->message_id_ << " from " << source;
auto have_previous = next_message->have_previous_; auto have_previous = next_message->have_previous_;
return {have_previous, true}; return {have_previous, true};
} }
} }
LOG(INFO) << "Can't auto-attach " << message_id; LOG(INFO) << "Can't auto-attach " << message_id << " from " << source;
return {false, false}; return {false, false};
} }

22
td/telegram/OrderedMessage.h
View File

@ -153,19 +153,11 @@ class OrderedMessages {
return ConstIterator(messages_.get(), message_id); return ConstIterator(messages_.get(), message_id);
} }
void insert(MessageId message_id, bool was_auto_attached, bool have_previous, bool have_next); void insert(MessageId message_id, bool auto_attach, bool have_previous, bool have_next, MessageId old_last_message_id,
const char *source);
void erase(MessageId message_id, bool only_from_memory); void erase(MessageId message_id, bool only_from_memory);
struct AttachInfo {
bool have_previous_ = false;
bool have_next_ = false;
AttachInfo(bool have_previous, bool have_next) : have_previous_(have_previous), have_next_(have_next) {
}
};
AttachInfo auto_attach_message(MessageId message_id, MessageId last_message_id, const char *source);
void attach_message_to_previous(MessageId message_id, const char *source); void attach_message_to_previous(MessageId message_id, const char *source);
void attach_message_to_next(MessageId message_id, const char *source); void attach_message_to_next(MessageId message_id, const char *source);
@ -183,6 +175,14 @@ class OrderedMessages {
const std::function<bool(MessageId)> &need_scan_newer) const; const std::function<bool(MessageId)> &need_scan_newer) const;
private: private:
struct AttachInfo {
bool have_previous_ = false;
bool have_next_ = false;
AttachInfo(bool have_previous, bool have_next) : have_previous_(have_previous), have_next_(have_next) {
}
};
class Iterator final : public IteratorBase { class Iterator final : public IteratorBase {
public: public:
Iterator() = default; Iterator() = default;
@ -195,6 +195,8 @@ class OrderedMessages {
} }
}; };
AttachInfo auto_attach_message(MessageId message_id, MessageId last_message_id, const char *source);
Iterator get_iterator(MessageId message_id) { Iterator get_iterator(MessageId message_id) {
return Iterator(messages_.get(), message_id); return Iterator(messages_.get(), message_id);
} }