aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/searchers
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-04-25 13:33:50 +0200
committerJon Bratseth <bratseth@oath.com>2018-04-25 13:33:50 +0200
commit76d32f1019c48bcc390e1840bce68f1716037cf8 (patch)
treef8c7534bb2e3fa57db763aae689a2e5445b36f85 /container-search/src/main/java/com/yahoo/search/searchers
parent29d894be652512bf2e44ce57ac126a35fb1985e1 (diff)
Nonfunctional changes only
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/searchers')
-rw-r--r--container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java12
1 files changed, 7 insertions, 5 deletions
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;
}
+
}