andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Add notification_group_id to DialogDb.

Browse Source 
GitOrigin-RevId: 119785b8a6904a9243ba559237a3f02bb4fe1950
This commit is contained in:
levlam 2018-11-27 17:39:13 +03:00
parent a091d1d0c4
commit 4c618b6f92
3 changed files with 61 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
td/telegram/DialogDb.cpp
View File

@ -43,19 +43,28 @@ Status init_dialog_db(SqliteDb &db, int32 version, bool &was_created) {
"dialog_id) WHERE last_notification_date IS NOT NULL"); "dialog_id) WHERE last_notification_date IS NOT NULL");
}; };
auto create_notification_group_id_index = [&]() {
return db.exec(
"CREATE INDEX IF NOT EXISTS dialog_by_notification_group_id ON dialogs (notification_group_id) WHERE "
"notification_group_id IS NOT NULL");
};
if (version == 0) { if (version == 0) {
LOG(INFO) << "Create new dialog db"; LOG(INFO) << "Create new dialog db";
was_created = true; was_created = true;
TRY_STATUS( TRY_STATUS(
db.exec("CREATE TABLE IF NOT EXISTS dialogs (dialog_id INT8 PRIMARY KEY, dialog_order INT8, data BLOB, " db.exec("CREATE TABLE IF NOT EXISTS dialogs (dialog_id INT8 PRIMARY KEY, dialog_order INT8, data BLOB, "
"last_notification_date INT4)")); "last_notification_date INT4, notification_group_id INT4)"));
TRY_STATUS(db.exec("CREATE INDEX IF NOT EXISTS dialog_by_dialog_order ON dialogs (dialog_order, dialog_id)")); TRY_STATUS(db.exec("CREATE INDEX IF NOT EXISTS dialog_by_dialog_order ON dialogs (dialog_order, dialog_id)"));
TRY_STATUS(create_last_notification_date_index()); TRY_STATUS(create_last_notification_date_index());
TRY_STATUS(create_notification_group_id_index());
version = current_db_version(); version = current_db_version();
} }
if (version < static_cast<int32>(DbVersion::DialogDbLastNotificationDate)) { if (version < static_cast<int32>(DbVersion::DialogDbLastNotificationDate)) {
TRY_STATUS(db.exec("ALTER TABLE dialogs ADD COLUMN last_notification_date INT4")); TRY_STATUS(db.exec("ALTER TABLE dialogs ADD COLUMN last_notification_date INT4"));
TRY_STATUS(db.exec("ALTER TABLE dialogs ADD COLUMN notification_group_id INT4"));
TRY_STATUS(create_last_notification_date_index()); TRY_STATUS(create_last_notification_date_index());
TRY_STATUS(create_notification_group_id_index());
} }
return Status::OK(); return Status::OK();
@ -81,7 +90,7 @@ class DialogDbImpl : public DialogDbSyncInterface {
} }
Status init() { Status init() {
TRY_RESULT(add_dialog_stmt, db_.get_statement("INSERT OR REPLACE INTO dialogs VALUES(?1, ?2, ?3, ?4)")); TRY_RESULT(add_dialog_stmt, db_.get_statement("INSERT OR REPLACE INTO dialogs VALUES(?1, ?2, ?3, ?4, ?5)"));
TRY_RESULT(get_dialog_stmt, db_.get_statement("SELECT data FROM dialogs WHERE dialog_id = ?1")); TRY_RESULT(get_dialog_stmt, db_.get_statement("SELECT data FROM dialogs WHERE dialog_id = ?1"));
TRY_RESULT(get_dialogs_stmt, db_.get_statement("SELECT data, dialog_id, dialog_order FROM dialogs WHERE " TRY_RESULT(get_dialogs_stmt, db_.get_statement("SELECT data, dialog_id, dialog_order FROM dialogs WHERE "
"dialog_order < ?1 OR (dialog_order = ?1 AND dialog_id < ?2) ORDER " "dialog_order < ?1 OR (dialog_order = ?1 AND dialog_id < ?2) ORDER "
@ -91,6 +100,9 @@ class DialogDbImpl : public DialogDbSyncInterface {
db_.get_statement("SELECT data, dialog_id, last_notification_date FROM dialogs WHERE " db_.get_statement("SELECT data, dialog_id, last_notification_date FROM dialogs WHERE "
"last_notification_date < ?1 OR (last_notification_date = ?1 AND dialog_id < ?2) ORDER " "last_notification_date < ?1 OR (last_notification_date = ?1 AND dialog_id < ?2) ORDER "
"BY last_notification_date DESC, dialog_id DESC LIMIT ?3")); "BY last_notification_date DESC, dialog_id DESC LIMIT ?3"));
TRY_RESULT(get_dialog_by_notification_group_id_stmt,
db_.get_statement("SELECT data FROM dialogs WHERE notification_group_id = ?1"));
/* /*
TRY_RESULT(get_dialogs2_stmt, db_.get_statement("SELECT data FROM dialogs WHERE dialog_order <= ?1 AND TRY_RESULT(get_dialogs2_stmt, db_.get_statement("SELECT data FROM dialogs WHERE dialog_order <= ?1 AND
(dialog_order != ?1 OR " (dialog_order != ?1 OR "
@ -101,16 +113,18 @@ class DialogDbImpl : public DialogDbSyncInterface {
get_dialog_stmt_ = std::move(get_dialog_stmt); get_dialog_stmt_ = std::move(get_dialog_stmt);
get_dialogs_stmt_ = std::move(get_dialogs_stmt); get_dialogs_stmt_ = std::move(get_dialogs_stmt);
get_dialogs_by_last_notification_date_stmt_ = std::move(get_dialogs_by_last_notification_date_stmt); get_dialogs_by_last_notification_date_stmt_ = std::move(get_dialogs_by_last_notification_date_stmt);
get_dialog_by_notification_group_id_stmt_ = std::move(get_dialog_by_notification_group_id_stmt);
// LOG(ERROR) << get_dialog_stmt_.explain().ok(); // LOG(ERROR) << get_dialog_stmt_.explain().ok();
// LOG(ERROR) << get_dialogs_stmt_.explain().ok(); // LOG(ERROR) << get_dialogs_stmt_.explain().ok();
// LOG(ERROR) << get_dialogs2_stmt.explain().ok(); // LOG(ERROR) << get_dialogs2_stmt.explain().ok();
// LOG(FATAL) << "EPLAINED"; // LOG(FATAL) << "EXPLAINED";
return Status::OK(); return Status::OK();
} }
Status add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data) override { Status add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date,
NotificationGroupId notification_group_id, BufferSlice data) override {
SCOPE_EXIT { SCOPE_EXIT {
add_dialog_stmt_.reset(); add_dialog_stmt_.reset();
}; };
@ -122,6 +136,11 @@ class DialogDbImpl : public DialogDbSyncInterface {
} else { } else {
add_dialog_stmt_.bind_null(4).ensure(); add_dialog_stmt_.bind_null(4).ensure();
} }
if (notification_group_id.is_valid()) {
add_dialog_stmt_.bind_int32(5, notification_group_id.get()).ensure();
} else {
add_dialog_stmt_.bind_null(5).ensure();
}
TRY_STATUS(add_dialog_stmt_.step()); TRY_STATUS(add_dialog_stmt_.step());
return Status::OK(); return Status::OK();
@ -140,6 +159,19 @@ class DialogDbImpl : public DialogDbSyncInterface {
return BufferSlice(get_dialog_stmt_.view_blob(0)); return BufferSlice(get_dialog_stmt_.view_blob(0));
} }
Result<BufferSlice> get_dialog_by_notification_group_id(NotificationGroupId notification_group_id) override {
SCOPE_EXIT {
get_dialog_by_notification_group_id_stmt_.reset();
};
get_dialog_by_notification_group_id_stmt_.bind_int32(1, notification_group_id.get()).ensure();
TRY_STATUS(get_dialog_by_notification_group_id_stmt_.step());
if (!get_dialog_by_notification_group_id_stmt_.has_row()) {
return Status::Error("Not found");
}
return BufferSlice(get_dialog_by_notification_group_id_stmt_.view_blob(0));
}
Result<std::vector<BufferSlice>> get_dialogs(int64 order, DialogId dialog_id, int32 limit) override { Result<std::vector<BufferSlice>> get_dialogs(int64 order, DialogId dialog_id, int32 limit) override {
SCOPE_EXIT { SCOPE_EXIT {
get_dialogs_stmt_.reset(); get_dialogs_stmt_.reset();
@ -200,6 +232,7 @@ class DialogDbImpl : public DialogDbSyncInterface {
SqliteStatement get_dialog_stmt_; SqliteStatement get_dialog_stmt_;
SqliteStatement get_dialogs_stmt_; SqliteStatement get_dialogs_stmt_;
SqliteStatement get_dialogs_by_last_notification_date_stmt_; SqliteStatement get_dialogs_by_last_notification_date_stmt_;
SqliteStatement get_dialog_by_notification_group_id_stmt_;
}; };
std::shared_ptr<DialogDbSyncSafeInterface> create_dialog_db_sync( std::shared_ptr<DialogDbSyncSafeInterface> create_dialog_db_sync(
@ -227,10 +260,10 @@ class DialogDbAsync : public DialogDbAsyncInterface {
impl_ = create_actor_on_scheduler<Impl>("DialogDbActor", scheduler_id, std::move(sync_db)); impl_ = create_actor_on_scheduler<Impl>("DialogDbActor", scheduler_id, std::move(sync_db));
} }
void add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data, void add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date,
Promise<> promise) override { NotificationGroupId notification_group_id, BufferSlice data, Promise<> promise) override {
send_closure_later(impl_, &Impl::add_dialog, dialog_id, order, last_notification_date, std::move(data), send_closure_later(impl_, &Impl::add_dialog, dialog_id, order, last_notification_date, notification_group_id,
std::move(promise)); std::move(data), std::move(promise));
} }
void get_dialog(DialogId dialog_id, Promise<BufferSlice> promise) override { void get_dialog(DialogId dialog_id, Promise<BufferSlice> promise) override {
send_closure_later(impl_, &Impl::get_dialog, dialog_id, std::move(promise)); send_closure_later(impl_, &Impl::get_dialog, dialog_id, std::move(promise));
@ -243,6 +276,9 @@ class DialogDbAsync : public DialogDbAsyncInterface {
send_closure_later(impl_, &Impl::get_dialogs_by_last_notification_date, last_notification_date, dialog_id, limit, send_closure_later(impl_, &Impl::get_dialogs_by_last_notification_date, last_notification_date, dialog_id, limit,
std::move(promise)); std::move(promise));
} }
void get_dialog_by_notification_group_id(NotificationGroupId notification_group_id, Promise<BufferSlice> promise) override {
send_closure_later(impl_, &Impl::get_dialog_by_notification_group_id, notification_group_id, std::move(promise));
}
void close(Promise<> promise) override { void close(Promise<> promise) override {
send_closure_later(impl_, &Impl::close, std::move(promise)); send_closure_later(impl_, &Impl::close, std::move(promise));
} }
@ -252,10 +288,11 @@ class DialogDbAsync : public DialogDbAsyncInterface {
public: public:
explicit Impl(std::shared_ptr<DialogDbSyncSafeInterface> sync_db_safe) : sync_db_safe_(std::move(sync_db_safe)) { explicit Impl(std::shared_ptr<DialogDbSyncSafeInterface> sync_db_safe) : sync_db_safe_(std::move(sync_db_safe)) {
} }
void add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data, void add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date,
Promise<> promise) { NotificationGroupId notification_group_id, BufferSlice data, Promise<> promise) {
add_write_query([=, promise = std::move(promise), data = std::move(data)](Unit) mutable { add_write_query([=, promise = std::move(promise), data = std::move(data)](Unit) mutable {
promise.set_result(sync_db_->add_dialog(dialog_id, order, last_notification_date, std::move(data))); promise.set_result(
sync_db_->add_dialog(dialog_id, order, last_notification_date, notification_group_id, std::move(data)));
}); });
} }
void get_dialog(DialogId dialog_id, Promise<BufferSlice> promise) { void get_dialog(DialogId dialog_id, Promise<BufferSlice> promise) {
@ -271,6 +308,10 @@ class DialogDbAsync : public DialogDbAsyncInterface {
add_read_query(); add_read_query();
promise.set_result(sync_db_->get_dialogs_by_last_notification_date(last_notification_date, dialog_id, limit)); promise.set_result(sync_db_->get_dialogs_by_last_notification_date(last_notification_date, dialog_id, limit));
} }
void get_dialog_by_notification_group_id(NotificationGroupId notification_group_id, Promise<BufferSlice> promise) {
add_read_query();
promise.set_result(sync_db_->get_dialog_by_notification_group_id(notification_group_id));
}
void close(Promise<> promise) { void close(Promise<> promise) {
do_flush(); do_flush();
sync_db_safe_.reset(); sync_db_safe_.reset();

11
td/telegram/DialogDb.h
View File

@ -7,6 +7,7 @@
#pragma once #pragma once
#include "td/telegram/DialogId.h" #include "td/telegram/DialogId.h"
#include "td/telegram/NotificationGroupId.h"
#include "td/actor/PromiseFuture.h" #include "td/actor/PromiseFuture.h"
@ -27,11 +28,13 @@ class DialogDbSyncInterface {
DialogDbSyncInterface &operator=(const DialogDbSyncInterface &) = delete; DialogDbSyncInterface &operator=(const DialogDbSyncInterface &) = delete;
virtual ~DialogDbSyncInterface() = default; virtual ~DialogDbSyncInterface() = default;
virtual Status add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data) = 0; virtual Status add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date,
NotificationGroupId notification_group_id, BufferSlice data) = 0;
virtual Result<BufferSlice> get_dialog(DialogId dialog_id) = 0; virtual Result<BufferSlice> get_dialog(DialogId dialog_id) = 0;
virtual Result<std::vector<BufferSlice>> get_dialogs(int64 order, DialogId dialog_id, int32 limit) = 0; virtual Result<std::vector<BufferSlice>> get_dialogs(int64 order, DialogId dialog_id, int32 limit) = 0;
virtual Result<std::vector<BufferSlice>> get_dialogs_by_last_notification_date(int32 last_notification_date, virtual Result<std::vector<BufferSlice>> get_dialogs_by_last_notification_date(int32 last_notification_date,
DialogId dialog_id, int32 limit) = 0; DialogId dialog_id, int32 limit) = 0;
virtual Result<BufferSlice> get_dialog_by_notification_group_id(NotificationGroupId notification_group_id) = 0;
virtual Status begin_transaction() = 0; virtual Status begin_transaction() = 0;
virtual Status commit_transaction() = 0; virtual Status commit_transaction() = 0;
}; };
@ -53,12 +56,14 @@ class DialogDbAsyncInterface {
DialogDbAsyncInterface &operator=(const DialogDbAsyncInterface &) = delete; DialogDbAsyncInterface &operator=(const DialogDbAsyncInterface &) = delete;
virtual ~DialogDbAsyncInterface() = default; virtual ~DialogDbAsyncInterface() = default;
virtual void add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data, virtual void add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date,
Promise<> promise) = 0; NotificationGroupId notification_group_id, BufferSlice data, Promise<> promise) = 0;
virtual void get_dialog(DialogId dialog_id, Promise<BufferSlice> promise) = 0; virtual void get_dialog(DialogId dialog_id, Promise<BufferSlice> promise) = 0;
virtual void get_dialogs(int64 order, DialogId dialog_id, int32 limit, Promise<std::vector<BufferSlice>> promise) = 0; virtual void get_dialogs(int64 order, DialogId dialog_id, int32 limit, Promise<std::vector<BufferSlice>> promise) = 0;
virtual void get_dialogs_by_last_notification_date(int32 last_notification_date, DialogId dialog_id, int32 limit, virtual void get_dialogs_by_last_notification_date(int32 last_notification_date, DialogId dialog_id, int32 limit,
Promise<std::vector<BufferSlice>> promise) = 0; Promise<std::vector<BufferSlice>> promise) = 0;
virtual void get_dialog_by_notification_group_id(NotificationGroupId notification_group_id,
Promise<BufferSlice> promise) = 0;
virtual void close(Promise<> promise) = 0; virtual void close(Promise<> promise) = 0;
}; };

2
td/telegram/MessagesManager.cpp
View File

@ -4265,7 +4265,7 @@ void MessagesManager::save_dialog_to_database(DialogId dialog_id) {
CHECK(d != nullptr); CHECK(d != nullptr);
LOG(INFO) << "Save " << dialog_id << " to database"; LOG(INFO) << "Save " << dialog_id << " to database";
G()->td_db()->get_dialog_db_async()->add_dialog( G()->td_db()->get_dialog_db_async()->add_dialog(
dialog_id, d->order, d->last_notification_date, get_dialog_database_value(d), dialog_id, d->order, d->last_notification_date, d->message_notification_group_id, get_dialog_database_value(d),
PromiseCreator::lambda([dialog_id](Result<> result) { PromiseCreator::lambda([dialog_id](Result<> result) {
send_closure(G()->messages_manager(), &MessagesManager::on_save_dialog_to_database, dialog_id, result.is_ok()); send_closure(G()->messages_manager(), &MessagesManager::on_save_dialog_to_database, dialog_id, result.is_ok());
})); }));