postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-22 06:40:30 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #65 from typesense/disk_error_remove_inmemory

Browse Source 
When a write to on-disk storage fails, ensure that in-memory write is rolled back
This commit is contained in:
Kishore Nallan 2019-05-31 19:57:02 +05:30 committed by GitHub
commit 932126a9a2
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/collection.h
View File

@ -72,6 +72,8 @@ private:
const Topster<512>::KV &field_order_kv, const nlohmann::json &document,
StringUtils & string_utils, highlight_t &highlight);
void remove_document(nlohmann::json & document, const uint32_t seq_id, bool remove_from_store);
public:
Collection() = delete;

28
src/collection.cpp
View File

@ -142,6 +142,7 @@ Option<nlohmann::json> Collection::add(const std::string & json_str) {
bool write_ok = store->batch_write(batch);
if(!write_ok) {
remove_document(document, seq_id, false); // remove from in-memory store too
return Option<nlohmann::json>(500, "Could not write to on-disk storage.");
}
@ -197,6 +198,9 @@ Option<nlohmann::json> Collection::add_many(const std::string & json_lines_str)
if(!write_ok) {
Option<bool> index_op_failure(500, "Could not write to on-disk storage.");
item.index_op = index_op_failure;
// remove from in-memory store to keep the state synced
remove_document(item.record.document, item.record.seq_id, false);
}
}
}
@ -781,6 +785,19 @@ Option<nlohmann::json> Collection::get(const std::string & id) {
return Option<nlohmann::json>(document);
}
void Collection::remove_document(nlohmann::json & document, const uint32_t seq_id, bool remove_from_store) {
std::string id = document["id"];
Index* index = indices[seq_id % num_indices];
index->remove(seq_id, document);
num_documents -= 1;
if(remove_from_store) {
store->remove(get_doc_id_key(id));
store->remove(get_seq_id_key(seq_id));
}
}
Option<std::string> Collection::remove(const std::string & id, const bool remove_from_store) {
std::string seq_id_str;
StoreStatus seq_id_status = store->get(get_doc_id_key(id), seq_id_str);
@ -814,16 +831,7 @@ Option<std::string> Collection::remove(const std::string & id, const bool remove
return Option<std::string>(500, "Error while parsing stored document.");
}
Index* index = indices[seq_id % num_indices];
index->remove(seq_id, document);
if(remove_from_store) {
store->remove(get_doc_id_key(id));
store->remove(get_seq_id_key(seq_id));
}
num_documents -= 1;
remove_document(document, seq_id, remove_from_store);
return Option<std::string>(id);
}