aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-02-26 16:41:25 +0100
committerJon Bratseth <bratseth@oath.com>2018-02-26 16:41:25 +0100
commit174745d431c59bfd7d8077b817dc38090010fd35 (patch)
tree135c22a0f22cbdbdcf0b48bf8b9ea2c4c80d7eca /config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java
parent446dc287bf35768b73e1390df07a9462ae9db800 (diff)
Don't validate when reloading models
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java
index 1f1a311b0e0..39d35cce694 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java
@@ -16,8 +16,8 @@ import java.util.logging.Level;
/**
* Takes the fields and indexes that are of type rank filter, and stores those names on all rank profiles
- * @author vegardh
*
+ * @author Vegard Havdal
*/
public class FilterFieldNames extends Processor {
@@ -26,12 +26,13 @@ public class FilterFieldNames extends Processor {
}
@Override
- public void process() {
+ public void process(boolean validate) {
for (SDField f : search.allConcreteFields()) {
if (f.getRanking().isFilter()) {
filterField(f.getName());
}
}
+
for (RankProfile profile : rankProfileRegistry.localRankProfiles(search)) {
Set<String> filterFields = new LinkedHashSet<>();
findFilterFields(search, profile, filterFields);
@@ -52,12 +53,11 @@ public class FilterFieldNames extends Processor {
private void findFilterFields(Search search, RankProfile profile, Set<String> filterFields) {
for (Iterator<RankProfile.RankSetting> itr = profile.declaredRankSettingIterator(); itr.hasNext(); ) {
RankProfile.RankSetting setting = itr.next();
- if (setting.getType().equals(RankProfile.RankSetting.Type.PREFERBITVECTOR) &&
- ((Boolean)setting.getValue()).booleanValue())
+ if (setting.getType().equals(RankProfile.RankSetting.Type.PREFERBITVECTOR) && ((Boolean)setting.getValue()))
{
String fieldName = setting.getFieldName();
if (search.getConcreteField(fieldName) != null) {
- if (!profile.filterFields().contains(fieldName)) {
+ if ( ! profile.filterFields().contains(fieldName)) {
filterFields.add(fieldName);
}
} else {