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

DialogDb: last_notification_date

Browse Source 
GitOrigin-RevId: d57526aa00fea63cc3efda091cfa9a1a89955065
This commit is contained in:
Arseny Smirnov 2018-11-07 00:11:34 +03:00
parent 591bfc542f
commit 0575aa2983
4 changed files with 80 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
td/telegram/DialogDb.cpp
View File

@ -37,12 +37,25 @@ Status init_dialog_db(SqliteDb &db, int32 version, bool &was_created) {
version = 0;
}
auto create_last_notification_date_index = [&]() {
return db.exec(
"CREATE INDEX IF NOT EXISTS dialog_by_last_notification_date ON dialogs (last_notification_date, "
"dialog_id) WHERE last_notification_date IS NOT NULL");
};
if (version == 0) {
LOG(INFO) << "Create new dialog db";
was_created = true;
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)"));
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());
version = current_db_version();
}
if (version < static_cast<int32>(DbVersion::DialogDbLastNotificationDate)) {
TRY_STATUS(db.exec("ALTER TABLE dialogs ADD COLUMN last_notification_date INT4"));
TRY_STATUS(create_last_notification_date_index());
}
return Status::OK();
@ -68,11 +81,16 @@ class DialogDbImpl : public DialogDbSyncInterface {
}
Status init() {
TRY_RESULT(add_dialog_stmt, db_.get_statement("INSERT OR REPLACE INTO dialogs VALUES(?1, ?2, ?3)"));
TRY_RESULT(add_dialog_stmt, db_.get_statement("INSERT OR REPLACE INTO dialogs VALUES(?1, ?2, ?3, ?4)"));
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 "
"dialog_order < ?1 OR (dialog_order = ?1 AND dialog_id < ?2) ORDER "
"BY dialog_order DESC, dialog_id DESC LIMIT ?3"));
TRY_RESULT(
get_dialogs_by_last_notification_date_stmt,
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 "
"BY last_notification_date DESC, dialog_id DESC LIMIT ?3"));
/*
TRY_RESULT(get_dialogs2_stmt, db_.get_statement("SELECT data FROM dialogs WHERE dialog_order <= ?1 AND
(dialog_order != ?1 OR "
@ -82,6 +100,7 @@ class DialogDbImpl : public DialogDbSyncInterface {
add_dialog_stmt_ = std::move(add_dialog_stmt);
get_dialog_stmt_ = std::move(get_dialog_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);
// LOG(ERROR) << get_dialog_stmt_.explain().ok();
// LOG(ERROR) << get_dialogs_stmt_.explain().ok();
@ -91,13 +110,19 @@ class DialogDbImpl : public DialogDbSyncInterface {
return Status::OK();
}
Status add_dialog(DialogId dialog_id, int64 order, BufferSlice data) override {
Status add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data) override {
SCOPE_EXIT {
add_dialog_stmt_.reset();
};
add_dialog_stmt_.bind_int64(1, dialog_id.get()).ensure();
add_dialog_stmt_.bind_int64(2, order).ensure();
add_dialog_stmt_.bind_blob(3, data.as_slice()).ensure();
if (last_notification_date != 0) {
add_dialog_stmt_.bind_int32(4, last_notification_date).ensure();
} else {
add_dialog_stmt_.bind_null(4).ensure();
}
TRY_STATUS(add_dialog_stmt_.step());
return Status::OK();
}
@ -137,6 +162,30 @@ class DialogDbImpl : public DialogDbSyncInterface {
return std::move(dialogs);
}
Result<std::vector<BufferSlice>> get_dialogs_by_last_notification_date(int32 last_notification_date,
DialogId dialog_id, int32 limit) override {
SCOPE_EXIT {
get_dialogs_by_last_notification_date_stmt_.reset();
};
get_dialogs_by_last_notification_date_stmt_.bind_int32(1, last_notification_date).ensure();
get_dialogs_by_last_notification_date_stmt_.bind_int64(2, dialog_id.get()).ensure();
get_dialogs_by_last_notification_date_stmt_.bind_int32(3, limit).ensure();
std::vector<BufferSlice> dialogs;
TRY_STATUS(get_dialogs_by_last_notification_date_stmt_.step());
while (get_dialogs_by_last_notification_date_stmt_.has_row()) {
BufferSlice data(get_dialogs_by_last_notification_date_stmt_.view_blob(0));
auto loaded_dialog_id = get_dialogs_by_last_notification_date_stmt_.view_int64(1);
auto loaded_dialog_last_notification_date = get_dialogs_by_last_notification_date_stmt_.view_int32(2);
LOG(INFO) << "Load chat " << loaded_dialog_id << " with last notification date "
<< loaded_dialog_last_notification_date;
dialogs.emplace_back(std::move(data));
TRY_STATUS(get_dialogs_by_last_notification_date_stmt_.step());
}
return std::move(dialogs);
}
Status begin_transaction() override {
return db_.begin_transaction();
}
@ -150,6 +199,7 @@ class DialogDbImpl : public DialogDbSyncInterface {
SqliteStatement add_dialog_stmt_;
SqliteStatement get_dialog_stmt_;
SqliteStatement get_dialogs_stmt_;
SqliteStatement get_dialogs_by_last_notification_date_stmt_;
};
std::shared_ptr<DialogDbSyncSafeInterface> create_dialog_db_sync(
@ -177,8 +227,10 @@ class DialogDbAsync : public DialogDbAsyncInterface {
impl_ = create_actor_on_scheduler<Impl>("DialogDbActor", scheduler_id, std::move(sync_db));
}
void add_dialog(DialogId dialog_id, int64 order, BufferSlice data, Promise<> promise) override {
send_closure_later(impl_, &Impl::add_dialog, dialog_id, order, std::move(data), std::move(promise));
void add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data,
Promise<> promise) override {
send_closure_later(impl_, &Impl::add_dialog, dialog_id, order, last_notification_date, std::move(data),
std::move(promise));
}
void get_dialog(DialogId dialog_id, Promise<BufferSlice> promise) override {
send_closure_later(impl_, &Impl::get_dialog, dialog_id, std::move(promise));
@ -186,6 +238,11 @@ class DialogDbAsync : public DialogDbAsyncInterface {
void get_dialogs(int64 order, DialogId dialog_id, int32 limit, Promise<std::vector<BufferSlice>> promise) override {
send_closure_later(impl_, &Impl::get_dialogs, order, dialog_id, limit, std::move(promise));
}
void get_dialogs_by_last_notification_date(int32 last_notification_date, DialogId dialog_id, int32 limit,
Promise<std::vector<BufferSlice>> promise) override {
send_closure_later(impl_, &Impl::get_dialogs_by_last_notification_date, last_notification_date, dialog_id, limit,
std::move(promise));
}
void close(Promise<> promise) override {
send_closure_later(impl_, &Impl::close, std::move(promise));
}
@ -195,9 +252,10 @@ class DialogDbAsync : public DialogDbAsyncInterface {
public:
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, BufferSlice data, Promise<> promise) {
void add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data,
Promise<> promise) {
add_write_query([=, promise = std::move(promise), data = std::move(data)](Unit) mutable {
promise.set_result(sync_db_->add_dialog(dialog_id, order, std::move(data)));
promise.set_result(sync_db_->add_dialog(dialog_id, order, last_notification_date, std::move(data)));
});
}
void get_dialog(DialogId dialog_id, Promise<BufferSlice> promise) {
@ -208,6 +266,11 @@ class DialogDbAsync : public DialogDbAsyncInterface {
add_read_query();
promise.set_result(sync_db_->get_dialogs(order, dialog_id, limit));
}
void get_dialogs_by_last_notification_date(int32 last_notification_date, DialogId dialog_id, int32 limit,
Promise<std::vector<BufferSlice>> promise) {
add_read_query();
promise.set_result(sync_db_->get_dialogs_by_last_notification_date(last_notification_date, dialog_id, limit));
}
void close(Promise<> promise) {
do_flush();
sync_db_safe_.reset();

9
td/telegram/DialogDb.h
View File

@ -27,9 +27,11 @@ class DialogDbSyncInterface {
DialogDbSyncInterface &operator=(const DialogDbSyncInterface &) = delete;
virtual ~DialogDbSyncInterface() = default;
virtual Status add_dialog(DialogId dialog_id, int64 order, BufferSlice data) = 0;
virtual Status add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data) = 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_by_last_notification_date(int32 last_notification_date,
DialogId dialog_id, int32 limit) = 0;
virtual Status begin_transaction() = 0;
virtual Status commit_transaction() = 0;
};
@ -51,9 +53,12 @@ class DialogDbAsyncInterface {
DialogDbAsyncInterface &operator=(const DialogDbAsyncInterface &) = delete;
virtual ~DialogDbAsyncInterface() = default;
virtual void add_dialog(DialogId dialog_id, int64 order, BufferSlice data, Promise<> promise) = 0;
virtual void add_dialog(DialogId dialog_id, int64 order, int32 last_notification_date, BufferSlice data,
Promise<> 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_by_last_notification_date(int32 last_notification_date, DialogId dialog_id, int32 limit,
Promise<std::vector<BufferSlice>> promise) = 0;
virtual void close(Promise<> promise) = 0;
};

3
td/telegram/MessagesManager.cpp
View File

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

1
td/telegram/Version.h
View File

@ -36,6 +36,7 @@ enum class DbVersion : int32 {
MessagesDbFts,
MessagesCallIndex,
FixFileRemoteLocationKeyBug,
DialogDbLastNotificationDate,
Next
};