From 866b5820f3f73fd0b0be5390e4e2629832c04ade Mon Sep 17 00:00:00 2001 From: Kishore Nallan Date: Wed, 17 Nov 2021 21:09:55 +0530 Subject: [PATCH] No search cutoff default if exhaustive search is used. --- src/collection_manager.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/collection_manager.cpp b/src/collection_manager.cpp index e3307c05..30324b93 100644 --- a/src/collection_manager.cpp +++ b/src/collection_manager.cpp @@ -559,8 +559,8 @@ Option CollectionManager::do_search(std::map& re const char *PRIORITIZE_EXACT_MATCH = "prioritize_exact_match"; const char *PRE_SEGMENTED_QUERY = "pre_segmented_query"; - const char *EXHAUSTIVE_SEARCH = "exhaustive_search"; const char *SEARCH_CUTOFF_MS = "search_cutoff_ms"; + const char *EXHAUSTIVE_SEARCH = "exhaustive_search"; if(req_params.count(NUM_TYPOS) == 0) { req_params[NUM_TYPOS] = "2"; @@ -671,14 +671,17 @@ Option CollectionManager::do_search(std::map& re req_params[PRE_SEGMENTED_QUERY] = "false"; } - if(req_params.count(EXHAUSTIVE_SEARCH) == 0) { - req_params[EXHAUSTIVE_SEARCH] = "false"; - } - if(req_params.count(SEARCH_CUTOFF_MS) == 0) { req_params[SEARCH_CUTOFF_MS] = "2000"; } + if(req_params.count(EXHAUSTIVE_SEARCH) == 0) { + req_params[EXHAUSTIVE_SEARCH] = "false"; + } else if(req_params[EXHAUSTIVE_SEARCH] == "true") { + // if exhaustive search is enabled, we won't enable search cut-off by default + req_params[SEARCH_CUTOFF_MS] = "3600000"; + } + std::vector query_by_weights_str; std::vector query_by_weights;