diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-04-25 13:33:50 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-04-25 13:33:50 +0200 |
commit | 76d32f1019c48bcc390e1840bce68f1716037cf8 (patch) | |
tree | f8c7534bb2e3fa57db763aae689a2e5445b36f85 /container-search/src/main/java/com | |
parent | 29d894be652512bf2e44ce57ac126a35fb1985e1 (diff) |
Nonfunctional changes only
Diffstat (limited to 'container-search/src/main/java/com')
5 files changed, 11 insertions, 10 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/AllLowercasingSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/AllLowercasingSearcher.java index 7fa3966b7d1..0d3eaff7fca 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/AllLowercasingSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/AllLowercasingSearcher.java @@ -18,8 +18,7 @@ import com.yahoo.prelude.query.WordItem; * chains and search chain ordering. * </p> * - * @since 5.1.3. - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public class AllLowercasingSearcher extends LowercasingSearcher { diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/LegacyCombinator.java b/container-search/src/main/java/com/yahoo/search/querytransform/LegacyCombinator.java index d89148651a2..d6a88a8f4e7 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/LegacyCombinator.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/LegacyCombinator.java @@ -60,7 +60,7 @@ import com.yahoo.search.searchchain.Execution; * InvalidQueryParameter error will be added, and the query will be passed * through untransformed. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ @Before({"transformedQuery", "com.yahoo.prelude.querytransform.StemmingSearcher"}) public class LegacyCombinator extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java index 9bcb54400b1..05623570dd4 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java @@ -20,8 +20,7 @@ import static com.yahoo.language.LinguisticsCase.toLowerCase; /** * Traverse a query tree and lowercase terms based on decision made in subclasses. * - * @since 5.1.3 - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public abstract class LowercasingSearcher extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/QueryTreeUtil.java b/container-search/src/main/java/com/yahoo/search/querytransform/QueryTreeUtil.java index 6a7e0d69db4..e4841ae6bd1 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/QueryTreeUtil.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/QueryTreeUtil.java @@ -32,4 +32,5 @@ public class QueryTreeUtil { } } } + } diff --git a/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java b/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java index 8bc0fa56c27..6025b0154e9 100644 --- a/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java @@ -19,25 +19,25 @@ import java.util.Set; * @author baldersheim */ public class ValidateMatchPhaseSearcher extends Searcher { + private Set<String> validMatchPhaseAttributes = new HashSet<>(); private Set<String> validDiversityAttributes = new HashSet<>(); + public ValidateMatchPhaseSearcher(AttributesConfig attributesConfig) { for (AttributesConfig.Attribute a : attributesConfig.attribute()) { if (a.fastsearch() && - (a.collectiontype() == AttributesConfig.Attribute.Collectiontype.SINGLE) && - isNumeric(a.datatype())) - { + (a.collectiontype() == AttributesConfig.Attribute.Collectiontype.SINGLE) && isNumeric(a.datatype())) { validMatchPhaseAttributes.add(a.name()); } } for (AttributesConfig.Attribute a : attributesConfig.attribute()) { if ((a.collectiontype() == AttributesConfig.Attribute.Collectiontype.SINGLE) && - ((a.datatype() == AttributesConfig.Attribute.Datatype.STRING) || isNumeric(a.datatype()))) - { + ((a.datatype() == AttributesConfig.Attribute.Datatype.STRING) || isNumeric(a.datatype()))) { validDiversityAttributes.add(a.name()); } } } + private boolean isNumeric(AttributesConfig.Attribute.Datatype.Enum dt) { return dt == AttributesConfig.Attribute.Datatype.DOUBLE || dt == AttributesConfig.Attribute.Datatype.FLOAT || @@ -46,6 +46,7 @@ public class ValidateMatchPhaseSearcher extends Searcher { dt == AttributesConfig.Attribute.Datatype.INT32 || dt == AttributesConfig.Attribute.Datatype.INT64; } + @Override public Result search(Query query, Execution execution) { ErrorMessage e = validate(query); @@ -67,4 +68,5 @@ public class ValidateMatchPhaseSearcher extends Searcher { } return null; } + } |