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

Abstract `foo_sequence_id` field from user.

Harpreet Sangar61bdcd91fd2b
diff --git a/include/field.h b/include/field.h
index 18a1d4b7..44de4637 100644
--- a/include/field.h
+++ b/include/field.h
@@ -11,6 +11,7 @@
#include <tsl/htrie_map.h>
#include "json.hpp"
#include "text_embedder_manager.h"
+#include <regex>
namespace field_types {
// first field value indexed will determine the type
@@ -284,11 +285,17 @@ struct field {
const std::string & default_sorting_field,
nlohmann::json& fields_json) {
bool found_default_sorting_field = false;
+ const std::regex sequence_id_pattern(".*_sequence_id$");
// Check for duplicates in field names
std::map<std::string, std::vector<const field*>> unique_fields;
for(const field & field: fields) {
+ if (std::regex_match(field.name, sequence_id_pattern)) {
+ // Don't add foo_sequence_id field.
+ continue;
+ }
+
unique_fields[field.name].push_back(&field);
if(field.name == "id") {
diff --git a/src/collection_manager.cpp b/src/collection_manager.cpp
index 0475dfbe..96a187b9 100644
--- a/src/collection_manager.cpp
+++ b/src/collection_manager.cpp
@@ -89,6 +89,10 @@ Collection* CollectionManager::init_collection(const nlohmann::json & collection
}
fields.push_back(f);
+
+ if (!f.reference.empty()) {
+ fields.emplace_back(field(f.name + "_sequence_id", "string", false, f.optional, true));
+ }
}
std::string default_sorting_field = collection_meta[Collection::COLLECTION_DEFAULT_SORTING_FIELD_KEY].get<std::string>();
diff --git a/test/collection_manager_test.cpp b/test/collection_manager_test.cpp
index 38c7e014..cdbd482e 100644
--- a/test/collection_manager_test.cpp
+++ b/test/collection_manager_test.cpp
@@ -227,17 +227,6 @@ TEST_F(CollectionManagerTest, CollectionCreation) {
"sort":false,
"type":"string",
"reference":"Products.product_id"
- },
- {
- "facet":false,
- "index":true,
- "infix":false,
- "locale":"",
- "name":"product_id_sequence_id",
- "nested":false,
- "optional":true,
- "sort":true,
- "type":"int64"
}
],
"id":0,
@@ -475,11 +464,9 @@ TEST_F(CollectionManagerTest, RestoreRecordsOnRestart) {
ASSERT_EQ(0, collection1->get_collection_id());
ASSERT_EQ(18, collection1->get_next_seq_id());
ASSERT_EQ(facet_fields_expected, collection1->get_facet_fields());
- // product_id_sequence_id is also included
- ASSERT_EQ(3, collection1->get_sort_fields().size());
+ ASSERT_EQ(2, collection1->get_sort_fields().size());
ASSERT_EQ("location", collection1->get_sort_fields()[0].name);
- ASSERT_EQ("product_id_sequence_id", collection1->get_sort_fields()[1].name);
- ASSERT_EQ("points", collection1->get_sort_fields()[2].name);
+ ASSERT_EQ("points", collection1->get_sort_fields()[1].name);
ASSERT_EQ(schema.size(), collection1->get_schema().size());
ASSERT_EQ("points", collection1->get_default_sorting_field());