diff options
Diffstat (limited to 'src/database')
| -rw-r--r-- | src/database/database.cpp | 12 | ||||
| -rw-r--r-- | src/database/include/database.hpp | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/database/database.cpp b/src/database/database.cpp index 88ae7bbe..dad983d0 100644 --- a/src/database/database.cpp +++ b/src/database/database.cpp @@ -846,8 +846,7 @@ auto IndexRecord::Expand(std::size_t page_size) const if (track_) { return {}; } - IndexKey::Header new_header = ExpandHeader(key_.header, key_.item); - std::string new_prefix = EncodeIndexPrefix(new_header); + std::string new_prefix = EncodeIndexPrefix(ExpandHeader()); return Continuation{ .prefix = {new_prefix.data(), new_prefix.size()}, .start_key = {new_prefix.data(), new_prefix.size()}, @@ -857,6 +856,10 @@ auto IndexRecord::Expand(std::size_t page_size) const }; } +auto IndexRecord::ExpandHeader() const -> IndexKey::Header { + return ::database::ExpandHeader(key_.header, key_.item); +} + Iterator::Iterator(std::weak_ptr<Database> db, const IndexInfo& idx) : db_(db), pos_mutex_(), current_pos_(), prev_pos_() { std::string prefix = EncodeIndexPrefix( @@ -887,6 +890,11 @@ auto Iterator::Next(Callback cb) -> void { db->dbGetPage<IndexRecord>(*current_pos_)}; prev_pos_ = current_pos_; current_pos_ = res->next_page(); + if (!res || res->values().empty() || !res->values()[0]) { + ESP_LOGI(kTag, "dropping empty result"); + InvokeNull(cb); + return; + } std::invoke(cb, *res->values()[0]); }); } diff --git a/src/database/include/database.hpp b/src/database/include/database.hpp index 63014bed..e18701eb 100644 --- a/src/database/include/database.hpp +++ b/src/database/include/database.hpp @@ -80,6 +80,7 @@ class IndexRecord { auto track() const -> std::optional<TrackId>; auto Expand(std::size_t) const -> std::optional<Continuation>; + auto ExpandHeader() const -> IndexKey::Header; private: IndexKey key_; |