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

Calculation of hits for a token had a bug.

Kishore Nallan4face5109157
diff --git a/include/art.h b/include/art.h
index 7c2dfc8a..59d894ca 100644
--- a/include/art.h
+++ b/include/art.h
@@ -108,10 +108,10 @@ typedef struct {
* of arbitrary size, as they include the key.
*/
typedef struct {
+ art_values* values;
uint16_t max_score;
uint32_t token_count;
uint32_t key_len;
- art_values* values;
unsigned char key[];
} art_leaf;
diff --git a/src/art.cpp b/src/art.cpp
index b81e9a72..6a534af8 100644
--- a/src/art.cpp
+++ b/src/art.cpp
@@ -371,6 +371,7 @@ static uint32_t longest_common_prefix(art_leaf *l1, art_leaf *l2, int depth) {
static void copy_header(art_node *dest, art_node *src) {
dest->max_score = src->max_score;
+ dest->max_token_count = src->max_token_count;
dest->num_children = src->num_children;
dest->partial_len = src->partial_len;
memcpy(dest->partial, src->partial, min(MAX_PREFIX_LEN, src->partial_len));
diff --git a/src/main.cpp b/src/main.cpp
index dbd9411f..36398101 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -78,23 +78,17 @@ void index_document(art_tree& t, uint32_t doc_id, vector<string> tokens, uint16_
document.offsets_len = (uint32_t) kv.second.size();
document.offsets = new uint32_t[kv.second.size()];
- uint32_t num_docs = 0;
-
- vector<art_leaf*> results;
- art_iter_fuzzy_prefix(&t, (const unsigned char *) kv.first.c_str(), (int) kv.first.length(), 0, 1, results);
- if(results.size() == 1) {
- num_docs = results[0]->values->ids.getLength();
+ uint32_t num_hits = document.offsets_len;
+ art_values* values = (art_values *) art_search(&t, (const unsigned char *) kv.first.c_str(), (int) kv.first.length());
+ if(values != NULL) {
+ num_hits += values->ids.getLength();
}
- //document.score = (uint16_t) (num_docs + 1);
-
- //cout << "Inserting " << kv.first << " with score: " << document.score << endl;
-
for(auto i=0; i<kv.second.size(); i++) {
document.offsets[i] = kv.second[i];
}
- art_insert(&t, (const unsigned char *) kv.first.c_str(), (int) kv.first.length(), &document, num_docs+1);
+ art_insert(&t, (const unsigned char *) kv.first.c_str(), (int) kv.first.length(), &document, num_hits);
delete document.offsets;
}
}
@@ -219,7 +213,7 @@ int main() {
unordered_map<uint32_t, uint16_t> docscores;
-// std::ifstream infile("/Users/kishorenc/others/wreally/search/test/documents.txt");
+ //std::ifstream infile("/Users/kishorenc/others/wreally/search/test/documents.txt");
std::ifstream infile("/data/hnstories.tsv");
std::string line;
@@ -263,9 +257,9 @@ int main() {
std::cout << ", Value: " << leaf->values->ids.at(0) << std::endl;
}*/
-// find_documents(t, docscores, "lanch", 10);
+ find_documents(t, docscores, "app;e", 10);
- string token = "lanch";
+ /*string token = "lanch";
vector<art_leaf*> leaves;
auto begin = std::chrono::high_resolution_clock::now();
@@ -275,8 +269,7 @@ int main() {
cout << "Word: " << leaf->key << " - score: " << leaf->max_score << endl;
}
- cout << "Time taken: " << timeMillis << "us" << endl;
-
+ cout << "Time taken: " << timeMillis << "us" << endl;*/
art_tree_destroy(&t);
return 0;