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

Return 0 from erase_batch for empty event list.

Browse Source
This commit is contained in:
levlam 2023-02-12 03:18:22 +03:00
parent 896de65c3e
commit af27ba7c32
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tddb/td/db/binlog/Binlog.h
View File

@ -93,7 +93,10 @@ class Binlog {
return seq_no; return seq_no;
} }
uint64 erase_batch(std::vector<uint64> event_ids) { uint64 erase_batch(vector<uint64> event_ids) {
if (event_ids.empty()) {
return 0;
}
auto seq_no = next_event_id(0); auto seq_no = next_event_id(0);
for (auto event_id : event_ids) { for (auto event_id : event_ids) {
erase(event_id); erase(event_id);

9
tddb/td/db/binlog/BinlogInterface.h
View File

@ -63,10 +63,13 @@ class BinlogInterface {
return seq_no; return seq_no;
} }
virtual uint64 erase_batch(std::vector<uint64> event_ids) { virtual uint64 erase_batch(vector<uint64> event_ids) {
if (event_ids.empty()) {
return 0;
}
uint64 seq_no = next_event_id(0); uint64 seq_no = next_event_id(0);
for (auto id : event_ids) { for (auto event_id : event_ids) {
erase(id); erase(event_id);
} }
return seq_no; return seq_no;
} }

14
tddb/td/db/binlog/ConcurrentBinlog.cpp
View File

@ -7,6 +7,7 @@
#include "td/db/binlog/ConcurrentBinlog.h" #include "td/db/binlog/ConcurrentBinlog.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"
#include "td/utils/misc.h"
#include "td/utils/OrderedEventsProcessor.h" #include "td/utils/OrderedEventsProcessor.h"
#include "td/utils/SliceBuilder.h" #include "td/utils/SliceBuilder.h"
#include "td/utils/Time.h" #include "td/utils/Time.h"
@ -42,8 +43,9 @@ class BinlogActor final : public Actor {
void erase_batch(uint64 seq_no, std::vector<uint64> event_ids) { void erase_batch(uint64 seq_no, std::vector<uint64> event_ids) {
for (auto event_id : event_ids) { for (auto event_id : event_ids) {
auto event = BinlogEvent::create_raw(event_id, BinlogEvent::ServiceTypes::Empty, BinlogEvent::Flags::Rewrite, EmptyStorer()); auto event = BinlogEvent::create_raw(event_id, BinlogEvent::ServiceTypes::Empty, BinlogEvent::Flags::Rewrite,
add_raw_event(seq_no, std::move(event), {}, {}); EmptyStorer());
add_raw_event(seq_no, std::move(event), Promise<Unit>(), BinlogDebugInfo{__FILE__, __LINE__});
seq_no++; seq_no++;
} }
} }
@ -213,10 +215,14 @@ void ConcurrentBinlog::change_key(DbKey db_key, Promise<> promise) {
send_closure(binlog_actor_, &detail::BinlogActor::change_key, std::move(db_key), std::move(promise)); send_closure(binlog_actor_, &detail::BinlogActor::change_key, std::move(db_key), std::move(promise));
} }
uint64 ConcurrentBinlog::erase_batch(std::vector<uint64> event_ids) { uint64 ConcurrentBinlog::erase_batch(vector<uint64> event_ids) {
auto shift = td::narrow_cast<int32>(event_ids.size()); auto shift = narrow_cast<int32>(event_ids.size());
if (shift == 0) {
return 0;
}
auto seq_no = next_event_id(shift); auto seq_no = next_event_id(shift);
send_closure(binlog_actor_, &detail::BinlogActor::erase_batch, seq_no, std::move(event_ids)); send_closure(binlog_actor_, &detail::BinlogActor::erase_batch, seq_no, std::move(event_ids));
return seq_no; return seq_no;
} }
} // namespace td } // namespace td

3
tddb/td/db/binlog/ConcurrentBinlog.h
View File

@ -55,7 +55,8 @@ class ConcurrentBinlog final : public BinlogInterface {
CSlice get_path() const { CSlice get_path() const {
return path_; return path_;
} }
uint64 erase_batch(std::vector<uint64> event_ids) final;
uint64 erase_batch(vector<uint64> event_ids) final;
private: private:
void init_impl(unique_ptr<Binlog> binlog, int scheduler_id); void init_impl(unique_ptr<Binlog> binlog, int scheduler_id);