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
Remove validate_and_init_embed_fields
ozanarmagandedb8e213dca
diff --git a/include/field.h b/include/field.hindex 908c0cc9..0f959b7d 100644--- a/include/field.h+++ b/include/field.h@@ -429,10 +429,6 @@ struct field {const nlohmann::json& fields_json,field& the_field);- static Option<bool> validate_and_init_embed_fields(const std::vector<std::pair<size_t, size_t>>& embed_json_field_indices,- const tsl::htrie_map<char, field>& search_schema,- nlohmann::json& fields_json,- std::vector<field>& fields_vec);static bool flatten_obj(nlohmann::json& doc, nlohmann::json& value, bool has_array, bool has_obj_array,bool is_update, const field& the_field, const std::string& flat_name,diff --git a/src/collection.cpp b/src/collection.cppindex 960ce266..08358c5e 100644--- a/src/collection.cpp+++ b/src/collection.cpp@@ -4156,7 +4156,6 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,}std::unordered_map<std::string, field> new_dynamic_fields;- std::vector<std::pair<size_t, size_t>> embed_json_field_indices;int json_array_index = -1;for(const auto& kv: schema_changes["fields"].items()) {@@ -4252,7 +4251,7 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,updated_search_schema[f.name] = f;}- if(!f.embed.empty() && !diff_fields.empty()) {+ if(!f.embed.empty()) {auto validate_res = field::validate_and_init_embed_field(search_schema, schema_changes["fields"][json_array_index], schema_changes["fields"], diff_fields.back());if(!validate_res.ok()) {@@ -4303,27 +4302,6 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,}}}-- for(auto index : embed_json_field_indices) {- auto& field = diff_fields[index.second];- auto is_reindex = (delete_field_names.count(field.name) != 0);- if(is_reindex) {- for(auto& reindex_field: reindex_fields) {- if(reindex_field.name == field.name) {- reindex_field.num_dim = field.num_dim;- break;- }- }- } else {- for(auto& add_field: addition_fields) {- if(add_field.name == field.name) {- add_field.num_dim = field.num_dim;- break;- }- }- }- }-if(num_auto_detect_fields > 1) {return Option<bool>(400, "There can be only one field named `.*`.");diff --git a/src/field.cpp b/src/field.cppindex 6a3151ae..d053e578 100644--- a/src/field.cpp+++ b/src/field.cpp@@ -1148,48 +1148,6 @@ Option<bool> field::validate_and_init_embed_field(const tsl::htrie_map<char, fiereturn Option<bool>(true);}-Option<bool> field::validate_and_init_embed_fields(const std::vector<std::pair<size_t, size_t>>& embed_json_field_indices,- const tsl::htrie_map<char, field>& search_schema,- nlohmann::json& fields_json,- std::vector<field>& fields_vec) {-- for(const auto& json_field_index: embed_json_field_indices) {- auto& field_json = fields_json[json_field_index.first];- const std::string err_msg = "Property `" + fields::embed + "." + fields::from +- "` can only refer to string or string array fields.";-- for(auto& field_name : field_json[fields::embed][fields::from].get<std::vector<std::string>>()) {- auto embed_field = std::find_if(fields_json.begin(), fields_json.end(), [&field_name](const nlohmann::json& x) {- return x["name"].get<std::string>() == field_name;- });-- if(embed_field == fields_json.end()) {- const auto& embed_field2 = search_schema.find(field_name);- if (embed_field2 == search_schema.end()) {- return Option<bool>(400, err_msg);- } else if (embed_field2->type != field_types::STRING && embed_field2->type != field_types::STRING_ARRAY) {- return Option<bool>(400, err_msg);- }- } else if((*embed_field)[fields::type] != field_types::STRING &&- (*embed_field)[fields::type] != field_types::STRING_ARRAY) {- return Option<bool>(400, err_msg);- }- }-- const auto& model_config = field_json[fields::embed][fields::model_config];- size_t num_dim = 0;- auto res = TextEmbedderManager::get_instance().validate_and_init_model(model_config, num_dim);- if(!res.ok()) {- return Option<bool>(res.code(), res.error());- }-- LOG(INFO) << "Model init done.";- field_json[fields::num_dim] = num_dim;- fields_vec[json_field_index.second].num_dim = num_dim;- }-- return Option<bool>(true);-}void filter_result_t::and_filter_results(const filter_result_t& a, const filter_result_t& b, filter_result_t& result) {auto lenA = a.count, lenB = b.count;