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
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
Searching for an int32 against an int32 array.
Kishore Nallan4378083e7323
diff --git a/src/collection.cpp b/src/collection.cppindex ecfc4ffa..c8c311e4 100644--- a/src/collection.cpp+++ b/src/collection.cpp@@ -288,7 +288,12 @@ nlohmann::json Collection::search(std::string query, const std::vector<std::striunion_with_filter_ids(leaves, &filter_ids, filter_ids_length);} else if(f.type == field_types::INT32_ARRAY) {+ int32_t value = json_value.get<int32_t>();+ NUM_COMPARATOR comparator = a_filter.get_comparator();+ std::vector<const art_leaf*> leaves;+ art_int32_search(t, value, comparator, leaves);+ union_with_filter_ids(leaves, &filter_ids, filter_ids_length);}}}diff --git a/test/art_test.cpp b/test/art_test.cppindex 873070c1..e900a79f 100644--- a/test/art_test.cpp+++ b/test/art_test.cpp@@ -738,14 +738,35 @@ TEST(ArtTest, test_int32_range_hundreds) {const int CHAR_LEN = 8;unsigned char chars[CHAR_LEN];- for(uint32_t i = 100; i < 110; i++) {+ std::vector<const art_leaf*> results;++ std::vector<std::vector<uint32_t>> values = {{2014, 2015, 2016}, {2015, 2016}, {2016},+ {1981, 1985}, {1999, 2000, 2001, 2002}};++ //std::cout << "v: " << values[0][0] << std::endl;++ for(uint32_t i = 0; i < values.size(); i++) {+ for(auto j = 0; j < values[i].size(); j++) {+ std::cout << "v: " << values[i][j] << std::endl;+ encode_int32(values[i][j], chars);+ doc.id = i;+ art_insert(&t, (unsigned char*)chars, CHAR_LEN, &doc, 1);+ }+ }++ int res = art_int32_search(&t, 2002, GREATER_THAN, results);+ ASSERT_TRUE(res == 0);+ ASSERT_EQ(3, results.size());++ return ;++ /*for(uint32_t i = 100; i < 110; i++) {encode_int32(i, chars);ASSERT_TRUE(NULL == art_insert(&t, (unsigned char*)chars, CHAR_LEN, &doc, 1));}encode_int32(106, chars);- std::vector<const art_leaf*> results;int res = art_int32_search(&t, 106, EQUALS, results);ASSERT_TRUE(res == 0);@@ -773,7 +794,7 @@ TEST(ArtTest, test_int32_range_hundreds) {ASSERT_EQ(6, results.size());res = art_tree_destroy(&t);- ASSERT_TRUE(res == 0);+ ASSERT_TRUE(res == 0);*/}TEST(ArtTest, test_int32_negative) {@@ -1066,4 +1087,33 @@ TEST(ArtTest, test_search_negative_int64) {ASSERT_TRUE(res == 0);ASSERT_EQ(50, results.size());results.clear();+}++TEST(ArtTest, test_int32_array) {+ art_tree t;+ art_tree_init(&t);++ art_document doc = get_document(1);+ const int CHAR_LEN = 8;+ unsigned char chars[CHAR_LEN];++ std::vector<const art_leaf *> results;++ std::vector<std::vector<uint32_t>> values = {{2014, 2015, 2016},+ {2015, 2016},+ {2016},+ {1981, 1985},+ {1999, 2000, 2001, 2002}};++ for (uint32_t i = 0; i < values.size(); i++) {+ for (auto j = 0; j < values[i].size(); j++) {+ encode_int32(values[i][j], chars);+ doc.id = i;+ art_insert(&t, (unsigned char *) chars, CHAR_LEN, &doc, 1);+ }+ }++ int res = art_int32_search(&t, 2002, GREATER_THAN, results);+ ASSERT_TRUE(res == 0);+ ASSERT_EQ(3, results.size());}\ No newline at end of filediff --git a/test/collection_test.cpp b/test/collection_test.cppindex 16d22967..0ecd8246 100644--- a/test/collection_test.cpp+++ b/test/collection_test.cpp@@ -405,7 +405,7 @@ TEST_F(CollectionTest, SearchNumericFields) {nlohmann::json results = coll_array_fields->search("Jeremy", search_fields, {}, 0, 10, FREQUENCY, false);ASSERT_EQ(5, results["hits"].size());- std::vector<std::string> ids = {"3", "0", "4", "1", "2"};+ std::vector<std::string> ids = {"3", "1", "4", "0", "2"};for(size_t i = 0; i < results["hits"].size(); i++) {nlohmann::json result = results["hits"].at(i);@@ -414,33 +414,37 @@ TEST_F(CollectionTest, SearchNumericFields) {ASSERT_STREQ(id.c_str(), result_id.c_str());}- search_fields = {"name"};- std::vector<filter> filters;- filter f1 = {"age", "24", "GREATER_THAN"};- filters.push_back(f1);+ // Searching on an int32 field+ std::vector<filter> filters = {(filter) {"age", "24", "GREATER_THAN"}};results = coll_array_fields->search("Jeremy", search_fields, filters, 0, 10, FREQUENCY, false);ASSERT_EQ(3, results["hits"].size());- ids = {"3", "0", "4"};+ ids = {"3", "1", "4"};for(size_t i = 0; i < results["hits"].size(); i++) {nlohmann::json result = results["hits"].at(i);std::string result_id = result["id"];std::string id = ids.at(i);ASSERT_STREQ(id.c_str(), result_id.c_str());- //std::cout << result_id << std::endl;}- /*search_fields = {"starring", "title", "cast"};- results = coll_array_fields->search("ben affleck", search_fields, {}, 0, 10, FREQUENCY, false);+ filters = {(filter) {"age", "24", "GREATER_THAN_EQUALS"}};+ results = coll_array_fields->search("Jeremy", search_fields, filters, 0, 10, FREQUENCY, false);+ ASSERT_EQ(4, results["hits"].size());++ filters = {(filter) {"age", "24", "EQUALS"}};+ results = coll_array_fields->search("Jeremy", search_fields, filters, 0, 10, FREQUENCY, false);ASSERT_EQ(1, results["hits"].size());- search_fields = {"cast"};- results = coll_array_fields->search("chris", search_fields, {}, 0, 10, FREQUENCY, false);+ // Searching a number against an int32 array field+ //std::cout << "int32 array field:" << std::endl;++ filters = {(filter) {"years", "2002", "GREATER_THAN"}};+ results = coll_array_fields->search("Jeremy", search_fields, filters, 0, 10, FREQUENCY, false);ASSERT_EQ(3, results["hits"].size());- ids = {"6", "1", "7"};+ ids = {"1", "0", "2"};for(size_t i = 0; i < results["hits"].size(); i++) {nlohmann::json result = results["hits"].at(i);std::string result_id = result["id"];@@ -448,7 +452,20 @@ TEST_F(CollectionTest, SearchNumericFields) {ASSERT_STREQ(id.c_str(), result_id.c_str());}- search_fields = {"cast"};+ filters = {(filter) {"years", "1989", "LESS_THAN"}};+ results = coll_array_fields->search("Jeremy", search_fields, filters, 0, 10, FREQUENCY, false);+ ASSERT_EQ(1, results["hits"].size());++ ids = {"3"};+ for(size_t i = 0; i < results["hits"].size(); i++) {+ nlohmann::json result = results["hits"].at(i);+ std::string result_id = result["id"];+ std::string id = ids.at(i);+ ASSERT_STREQ(id.c_str(), result_id.c_str());+ //std::cout << result_id << std::endl;+ }++ /*search_fields = {"cast"};results = coll_array_fields->search("chris pine", search_fields, {}, 0, 10, FREQUENCY, false);ASSERT_EQ(3, results["hits"].size());diff --git a/test/numeric_array_documents.jsonl b/test/numeric_array_documents.jsonlindex 81f7158a..1c94bf06 100644--- a/test/numeric_array_documents.jsonl+++ b/test/numeric_array_documents.jsonl@@ -1,5 +1,5 @@-{"name": "Jeremy Howard", "age": 55, "years": [2014, 2015, 2016], "timestamps": [1390354022, 1421890022, 1453426022]}-{"name": "Jeremy Howard", "age": 24, "years": [2015, 2016], "timestamps": [1421890022, 1453426022]}+{"name": "Jeremy Howard", "age": 24, "years": [2014, 2015, 2016], "timestamps": [1390354022, 1421890022, 1453426022]}+{"name": "Jeremy Howard", "age": 44, "years": [2015, 2016], "timestamps": [1421890022, 1453426022]}{"name": "Jeremy Howard", "age": 21, "years": [2016], "timestamps": [1453426022]}{"name": "Jeremy Howard", "age": 63, "years": [1981, 1985], "timestamps": [348974822, 475205222]}{"name": "Jeremy Howard", "age": 32, "years": [1999, 2000, 2001, 2002], "timestamps": [916968422, 948504422, 980126822, 1011662822]}\ No newline at end of file