Skip to content

Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences

fixing tests

krunal131379084f2e4aec
diff --cc include/facet_index.h
index 491148b5,491148b5..4c6d1c0c
--- a/include/facet_index.h
+++ b/include/facet_index.h
@@@ -6,11 -6,11 +6,20 @@@
class facet_index_t {
private:
struct count_list {
++ count_list() = delete;
++
++ ~count_list () = default;
++
count_list(const std::string& sv, uint32_t facet_count) {
facet_value = sv;
count = facet_count;
}
++ count_list& operator=(count_list& obj) {
++ facet_value = obj.facet_value;
++ count = obj.count;
++ }
++
std::string facet_value;
uint32_t count;
};
@@@ -18,12 -18,12 +27,24 @@@
struct facet_index_struct {
void* id_list_ptr;
uint32_t index;
++
++ facet_index_struct() {
++ id_list_ptr = nullptr;
++ index = UINT32_MAX;
++ }
++
++ ~facet_index_struct() {};
};
struct facet_index_counter {
tsl::htrie_map<char, facet_index_struct> facet_index_map;
std::vector<count_list> counter_list;
++ facet_index_counter() {
++ facet_index_map.clear();
++ counter_list.clear();
++ }
++
~facet_index_counter() {
for(auto it = facet_index_map.begin(); it != facet_index_map.end(); ++it) {
ids_t::destroy_list(it.value().id_list_ptr);
diff --cc include/num_tree.h
index 12c51e23,12c51e23..77455e45
--- a/include/num_tree.h
+++ b/include/num_tree.h
@@@ -23,11 -23,11 +23,20 @@@ private
}
struct count_list {
-- count_list(const int64_t& sv, uint32_t facet_count) {
++ count_list() = delete;
++
++ ~count_list () = default;
++
++ count_list(int64_t sv, uint32_t facet_count) {
facet_value = sv;
count = facet_count;
}
++ count_list& operator=(count_list& obj) {
++ facet_value = obj.facet_value;
++ count = obj.count;
++ }
++
int64_t facet_value;
uint32_t count;
};
diff --cc src/facet_index.cpp
index 4dcfc550,4dcfc550..ef3556a4
--- a/src/facet_index.cpp
+++ b/src/facet_index.cpp
@@@ -5,6 -5,6 +5,12 @@@
uint32_t facet_index_t::insert(const std::string& field, const std::string& value,
uint32_t id, bool is_string) {
++
++ const auto facet_field_map_it = facet_field_map.find(field);
++ if(facet_field_map_it == facet_field_map.end()) {
++ facet_field_map.emplace(field, facet_index_counter{});
++ }
++
auto& facet_index_map = facet_field_map[field].facet_index_map;
uint32_t index;
const auto sv = value.substr(0, 100);
@@@ -12,8 -12,8 +18,7 @@@
if(it == facet_index_map.end()) {
index = ++count_index;
--
-- facet_index_struct fis {};
++ facet_index_struct fis{};
fis.index = index;
if(is_string) {
fis.id_list_ptr = SET_COMPACT_IDS(compact_id_list_t::create(1, {id}));
@@@ -38,22 -38,22 +43,22 @@@
if(counter_list.empty()) {
counter_list.emplace_back(sv, facet_count);
} else {
-- auto counter_it = counter_list.begin();
--
count_list node(sv, facet_count);
--
-- for(counter_it = counter_list.begin(); counter_it != counter_list.end(); ++counter_it) {
-- if(counter_it->facet_value == sv) {
-- counter_it->count = facet_count;
--
-- auto prev_node = std::prev(counter_it);
-- if(prev_node->count < counter_it->count) {
-- std::swap(prev_node, counter_it);
++ uint32_t ind = 0;
++ for(ind; ind < counter_list.size(); ++ind) {
++ if(counter_list[ind].facet_value == sv) {
++ counter_list[ind].count = facet_count;
++
++ if((ind > 1) &&
++ (counter_list[ind-1].count < counter_list[ind].count)) {
++ count_list temp = counter_list[ind-1];
++ counter_list[ind-1] = counter_list[ind];
++ counter_list[ind] = temp;
}
break;
}
}
-- if(counter_it == counter_list.end()) {
++ if(ind == counter_list.size()) {
// LOG (INFO) << "inserting at last facet " << node.facet_value
// << " with count " << node.count;
counter_list.emplace_back(node);
@@@ -125,6 -125,6 +130,7 @@@ size_t facet_index_t::intersect(const s
uint32_t* out = nullptr;
count = ArrayUtils::and_scalar(id_list.data(), id_list.size(),
result_ids, result_ids_len, &out);
++ delete[] out;
}
id_list.clear();
}
diff --cc src/index.cpp
index e5e3d3a3,49143dfc..926c4baf
--- a/src/index.cpp
+++ b/src/index.cpp
@@@ -678,7 -677,7 +678,7 @@@ void Index::index_field_in_memory(cons
fhashvalues.hashes.emplace_back(hash);
} else if(afield.type == field_types::BOOL_ARRAY) {
bool raw_val = document[afield.name][i].get<bool>();
-- uint32_t hash = reinterpret_cast<uint32_t&>(raw_val);
++ uint32_t hash = (uint32_t)raw_val;
fhashvalues.hashes.emplace_back(hash);
}
}
@@@ -719,9 -711,8 +719,9 @@@
}
else if(afield.type == field_types::BOOL) {
bool raw_val = document[afield.name].get<bool>();
-- fhash = reinterpret_cast<uint32_t&>(raw_val);
++ fhash = (uint32_t)raw_val;
}
+ //fhash = field_index_it->second.facet_hashes[0];
auto& facet_dim_index = single_val_facet_index_v3[afield.name][seq_id % ARRAY_FACET_DIM];
if(facet_dim_index == nullptr) {
@@@ -2492,9 -2899,9 +2455,8 @@@ Option<bool> Index::search(std::vector<
goto process_search_results;
}
}
-
// for phrase query, parser will set field_query_tokens to "*", need to handle that
if (is_wildcard_query && field_query_tokens[0].q_phrases.empty()) {
- const uint8_t field_id = (uint8_t)(FIELD_LIMIT_NUM - 0);
if(no_filters_provided && facets.empty() && curated_ids.empty() && vector_query.field_name.empty() &&
sort_fields_std.size() == 1 && sort_fields_std[0].name == sort_field_const::seq_id &&
@@@ -4665,8 -5055,7 +4625,7 @@@ void Index::search_wildcard(filter_node
std::array<spp::sparse_hash_map<uint32_t, int64_t>*, 3>& field_values,
const std::vector<size_t>& geopoint_indices) const {
- uint32_t token_bits = 0;
- const bool check_for_circuit_break = (filter_ids_length > 1000000);
+ const bool check_for_circuit_break = (approx_filter_ids_length > 1000000);
//auto beginF = std::chrono::high_resolution_clock::now();
diff --cc src/num_tree.cpp
index 7f5aabd4,7f5aabd4..b7028065
--- a/src/num_tree.cpp
+++ b/src/num_tree.cpp
@@@ -21,22 -21,22 +21,22 @@@ void num_tree_t::insert(int64_t value,
if(counter_list.empty()) {
counter_list.emplace_back(value, facet_count);
} else {
-- auto counter_it = counter_list.begin();
--
count_list node(value, facet_count);
--
-- for(counter_it = counter_list.begin(); counter_it != counter_list.end(); ++counter_it) {
-- if(counter_it->facet_value == value) {
-- counter_it->count = facet_count;
--
-- auto prev_node = std::prev(counter_it);
-- if(prev_node->count < counter_it->count) {
-- std::swap(prev_node, counter_it);
++ uint32_t ind = 0;
++ for(ind; ind < counter_list.size(); ++ind) {
++ if(counter_list[ind].facet_value == value) {
++ counter_list[ind].count = facet_count;
++
++ if((ind > 1) &&
++ (counter_list[ind-1].count < counter_list[ind].count)) {
++ count_list temp = counter_list[ind-1];
++ counter_list[ind-1] = counter_list[ind];
++ counter_list[ind] = temp;
}
break;
}
}
-- if(counter_it == counter_list.end()) {
++ if(ind == counter_list.size()) {
// LOG (INFO) << "inserting at last facet " << node.facet_value
// << " with count " << node.count;
counter_list.emplace_back(node);
@@@ -386,6 -386,6 +386,7 @@@ size_t num_tree_t::intersect(const uint
uint32_t* out = nullptr;
count = ArrayUtils::and_scalar(id_list.data(), id_list.size(),
result_ids, result_ids_len, &out);
++ delete[] out;
}
id_list.clear();
}