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

Tweak locking for filtering.

Browse Source
This commit is contained in:
Kishore Nallan 2021-09-04 20:01:38 +05:30
parent 4e16dd86e5
commit 2317c6adb0
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/index.h
View File

@ -418,10 +418,14 @@ public:
art_leaf* get_token_leaf(const std::string & field_name, const unsigned char* token, uint32_t token_len);
// the following methods are not synchronized because their parent calls are synchronized
uint32_t do_filtering(uint32_t** filter_ids_out, const std::vector<filter> & filters) const;
void refresh_schemas(const std::vector<field>& new_fields);
bool field_contains_string(const std::string& field_name, const std::string& value);
// the following methods are not synchronized because their parent calls are synchronized or they are const/static
static Option<uint32_t> validate_index_in_memory(nlohmann::json &document, uint32_t seq_id,
const std::string & default_sorting_field,
const std::unordered_map<std::string, field> & search_schema,
@ -430,7 +434,5 @@ public:
const std::string& fallback_field_type,
const DIRTY_VALUES& dirty_values);
void refresh_schemas(const std::vector<field>& new_fields);
};

18
src/index.cpp
View File

@ -1044,6 +1044,7 @@ void Index::search_candidates(const uint8_t & field_id, bool field_is_array,
uint32_t Index::do_filtering(uint32_t** filter_ids_out, const std::vector<filter> & filters) const {
//auto begin = std::chrono::high_resolution_clock::now();
std::shared_lock lock(mutex);
uint32_t* filter_ids = nullptr;
uint32_t filter_ids_length = 0;
@ -1487,8 +1488,6 @@ void Index::search(const std::vector<query_tokens_t>& field_query_tokens,
const bool exhaustive_search,
const size_t concurrency) const {
std::shared_lock lock(mutex);
//auto begin = std::chrono::high_resolution_clock::now();
// process the filters
@ -1496,6 +1495,8 @@ void Index::search(const std::vector<query_tokens_t>& field_query_tokens,
uint32_t* filter_ids = nullptr;
uint32_t filter_ids_length = do_filtering(&filter_ids, filters);
std::shared_lock lock(mutex);
// we will be removing all curated IDs from organic result ids before running topster
std::set<uint32_t> curated_ids;
std::vector<uint32_t> included_ids;
@ -3100,3 +3101,16 @@ double Index::transform_for_180th_meridian(Geofence &poly) {
void Index::transform_for_180th_meridian(GeoCoord &point, double offset) {
point.lon = point.lon < 0.0 ? point.lon + offset : point.lon;
}
bool Index::field_contains_string(const std::string& field_name, const std::string& value) {
std::shared_lock lock(mutex);
auto field_it = search_index.find(field_name);
if(field_it != search_index.end()) {
art_tree* t = field_it->second;
art_leaf* leaf = (art_leaf *) art_search(t, (const unsigned char *)value.c_str(), value.size()+1);
return (leaf != nullptr);
}
return false;
}