From 282dc282c0cc26f2eebbf6c2714247e47691f860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ante=20Pu=C5=A1i=C4=87?= Date: Tue, 27 Feb 2024 16:42:54 +0100 Subject: [PATCH] Avoid needing IIFE --- src/storage/v2/indices/text_index.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/storage/v2/indices/text_index.cpp b/src/storage/v2/indices/text_index.cpp index 5cf21f313..1c9488097 100644 --- a/src/storage/v2/indices/text_index.cpp +++ b/src/storage/v2/indices/text_index.cpp @@ -293,9 +293,10 @@ bool TextIndex::IndexExists(const std::string &index_name) const { return index_ mgcxx::text_search::SearchOutput TextIndex::SearchGivenProperties(const std::string &index_name, const std::string &search_query) { - auto input = mgcxx::text_search::SearchInput{.search_query = search_query, .return_fields = {"data", "metadata"}}; try { - return mgcxx::text_search::search(index_.at(index_name).context_, input); + return mgcxx::text_search::search( + index_.at(index_name).context_, + mgcxx::text_search::SearchInput{.search_query = search_query, .return_fields = {"metadata"}}); } catch (const std::exception &e) { throw query::TextSearchException("Tantivy error: {}", e.what()); } @@ -305,12 +306,11 @@ mgcxx::text_search::SearchOutput TextIndex::SearchGivenProperties(const std::str mgcxx::text_search::SearchOutput TextIndex::RegexSearch(const std::string &index_name, const std::string &search_query) { - auto input = mgcxx::text_search::SearchInput{ - .search_fields = {"all"}, .search_query = search_query, .return_fields = {"metadata"}}; - mgcxx::text_search::SearchOutput search_results; - try { - return mgcxx::text_search::regex_search(index_.at(index_name).context_, input); + return mgcxx::text_search::regex_search( + index_.at(index_name).context_, + mgcxx::text_search::SearchInput{ + .search_fields = {"all"}, .search_query = search_query, .return_fields = {"metadata"}}); } catch (const std::exception &e) { throw query::TextSearchException("Tantivy error: {}", e.what()); } @@ -320,13 +320,11 @@ mgcxx::text_search::SearchOutput TextIndex::RegexSearch(const std::string &index mgcxx::text_search::SearchOutput TextIndex::SearchAllProperties(const std::string &index_name, const std::string &search_query) { - auto input = mgcxx::text_search::SearchInput{ - .search_fields = {"all"}, .search_query = search_query, .return_fields = {"metadata"}}; - - mgcxx::text_search::SearchOutput search_results; - try { - return mgcxx::text_search::search(index_.at(index_name).context_, input); + return mgcxx::text_search::search( + index_.at(index_name).context_, + mgcxx::text_search::SearchInput{ + .search_fields = {"all"}, .search_query = search_query, .return_fields = {"metadata"}}); } catch (const std::exception &e) { throw query::TextSearchException("Tantivy error: {}", e.what()); }