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

Fix rebase error.

Browse Source
This commit is contained in:
Harpreet Sangar 2023-02-15 16:48:44 +05:30
parent 44668ebe27
commit bb4c0af996
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/collection.h
View File

@ -457,16 +457,12 @@ public:
Option<bool> get_filter_ids(const std::string & filter_query, filter_result_t& filter_result) const;
Option<bool> get_reference_filter_ids(const std::string & filter_query,
Option<bool> get_reference_filter_ids(const std::string& filter_query,
filter_result_t& filter_result,
const std::string & collection_name) const;
const std::string& collection_name) const;
Option<bool> validate_reference_filter(const std::string& filter_query) const;
Option<bool> get_reference_filter_ids(const std::string & filter_query,
const std::string & collection_name,
std::pair<uint32_t, uint32_t*>& reference_index_ids) const;
Option<nlohmann::json> get(const std::string & id) const;
Option<std::string> remove(const std::string & id, bool remove_from_store = true);

6
include/index.h
View File

@ -702,9 +702,9 @@ public:
const std::string& collection_name,
const std::string& reference_helper_field_name) const;
void do_reference_filtering_with_lock(std::pair<uint32_t, uint32_t*>& reference_index_ids,
filter_node_t* filter_tree_root,
const std::string& reference_helper_field_name) const;
Option<bool> do_reference_filtering_with_lock(filter_node_t* const filter_tree_root,
filter_result_t& filter_result,
const std::string & reference_helper_field_name) const;
void refresh_schemas(const std::vector<field>& new_fields, const std::vector<field>& del_fields);

3
src/collection.cpp
View File

@ -2572,7 +2572,6 @@ Option<bool> Collection::validate_reference_filter(const std::string& filter_que
filter_node_t* filter_tree_root = nullptr;
Option<bool> filter_op = filter::parse_filter_query(filter_query, search_schema,
store, doc_id_prefix, filter_tree_root);
if(!filter_op.ok()) {
return filter_op;
}
@ -3938,8 +3937,6 @@ Option<bool> Collection::prune_doc(nlohmann::json& doc,
reference_docs.push_back(ref_doc);
}
delete[] documents[0].second;
for (const auto &ref_doc: reference_docs) {
doc.update(ref_doc);
}

1
src/index.cpp
View File

@ -2719,7 +2719,6 @@ Option<bool> Index::search(std::vector<query_tokens_t>& field_query_tokens, cons
const vector_query_t& vector_query,
size_t facet_sample_percent, size_t facet_sample_threshold,
const std::string& collection_name) const {
std::shared_lock lock(mutex);
filter_result_t filter_result;