diff options
author | tomglk <> | 2024-01-09 08:31:50 +0100 |
---|---|---|
committer | tomglk <> | 2024-01-09 08:31:50 +0100 |
commit | 1fae0f200cb2ce7f8dfa8b902cde8beae0aca6de (patch) | |
tree | aa5dd4506955e0d4b83a3b8038f11eea079b7fe6 /container-search/src/main | |
parent | e277f0474c792606a0ef0407b1191f5a7d4cef6a (diff) |
cleanup
Diffstat (limited to 'container-search/src/main')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java index efeedb9bf55..0559bd808bc 100644 --- a/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java @@ -32,12 +32,16 @@ public class FieldCollapsingSearcher extends Searcher { private static final CompoundName collapsesize = CompoundName.from("collapsesize"); private static final CompoundName collapseSummaryName = CompoundName.from("collapse.summary"); + /** Separator used for the fieldnames in collapsefield */ + private static final String separator = ","; + /** Maximum number of queries to send next searcher */ private static final int maxQueries = 4; /** * The max number of hits that will be preserved per unique - * value of the collapsing parameter. + * value of the collapsing parameter, + * if no field-specific value is configured. */ private int defaultCollapseSize; @@ -91,7 +95,7 @@ public class FieldCollapsingSearcher extends Searcher { if (collapseFieldParam == null) return execution.search(query); - String[] collapseFields = collapseFieldParam.split(","); + String[] collapseFields = collapseFieldParam.split(separator); int globalCollapseSize = query.properties().getInteger(collapsesize, defaultCollapseSize); @@ -201,17 +205,13 @@ public class FieldCollapsingSearcher extends Searcher { } } - private Integer getCollapseSize(Properties properties, String fieldName, Integer globalCollapseSize) { + private int getCollapseSize(Properties properties, String fieldName, int globalCollapseSize) { Integer fieldCollapseSize = properties.getInteger(collapsesize.append(fieldName)); if (fieldCollapseSize != null) { return fieldCollapseSize; } - if (globalCollapseSize != null) { - return globalCollapseSize; - } - - return defaultCollapseSize; + return globalCollapseSize; } } |