From c571ab6ad8c215cae54c17a454ec8f84b24ba1b5 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 5 Jun 2020 11:20:38 +0300 Subject: Use best-match ranker for one word queries --- src/main/java/com/juick/service/SphinxSearchService.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/juick/service/SphinxSearchService.java b/src/main/java/com/juick/service/SphinxSearchService.java index 1553e22f..aa62ddda 100644 --- a/src/main/java/com/juick/service/SphinxSearchService.java +++ b/src/main/java/com/juick/service/SphinxSearchService.java @@ -43,12 +43,12 @@ public class SphinxSearchService extends BaseJdbcService implements SearchServic @Inject UserService userService; - public String sortHint(String searchString) { - return "extended:@weight desc, @id desc"; + boolean isOneWord(String searchString) { + return searchString.split("[^\\S\\+]+").length == 1; } + public String keywordBoost(String searchString) { - boolean isOneWord = searchString.split("[^\\S\\+]+").length == 1; - return isOneWord ? String.format("%s^3", searchString) : searchString; + return isOneWord(searchString) ? String.format("%s^3", searchString) : searchString; } @Override @@ -59,9 +59,12 @@ public class SphinxSearchService extends BaseJdbcService implements SearchServic Map sphinxQuery = new HashMap<>(); sphinxQuery.put("limit", String.valueOf(maxResult)); sphinxQuery.put("mode", "any"); - sphinxQuery.put("sort", sortHint(searchString)); + sphinxQuery.put("sort", "extended:@weight desc, @id desc"); String usersFilter = userService.getUserBLUsers(visitor.getUid()).stream().map(u -> String.valueOf(u.getUid())).collect(Collectors.joining(",")); sphinxQuery.put("!filter", "user_id," + usersFilter); + if (isOneWord(searchString)) { + sphinxQuery.put("ranker", "bm25"); + } if (page > 0) { sphinxQuery.put("offset", String.valueOf(page * maxResult)); } -- cgit v1.2.3