summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2020-02-18 12:55:49 +0000
committerGeir Storli <geirst@verizonmedia.com>2020-02-20 07:29:04 +0000
commitde87979afeea21a8a613f2e726be94e3bb2e860c (patch)
treebb27d5827a9e60da2be92212861fee0fb47fb799
parent7a9cc89d9bde01cec32d6c3d6d67c6c51c840e6f (diff)
Don't deactivate processing of index settings when validation is turned off.
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java
index 9cd7fb24e42..2790f2ddf6e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java
@@ -24,16 +24,18 @@ public class TensorFieldProcessor extends Processor {
@Override
public void process(boolean validate, boolean documentsOnly) {
- if ( ! validate) return;
-
for (var field : search.allConcreteFields()) {
if ( field.getDataType() instanceof TensorDataType ) {
- validateIndexingScripsForTensorField(field);
- validateAttributeSettingForTensorField(field);
- processIndexSettingsForTensorField(field);
+ if (validate) {
+ validateIndexingScripsForTensorField(field);
+ validateAttributeSettingForTensorField(field);
+ }
+ processIndexSettingsForTensorField(field, validate);
}
else if (field.getDataType() instanceof CollectionDataType){
- validateDataTypeForCollectionField(field);
+ if (validate) {
+ validateDataTypeForCollectionField(field);
+ }
}
}
}
@@ -68,12 +70,12 @@ public class TensorFieldProcessor extends Processor {
}
}
- private void processIndexSettingsForTensorField(SDField field) {
+ private void processIndexSettingsForTensorField(SDField field, boolean validate) {
if (!field.doesIndexing()) {
return;
}
if (isTensorTypeThatSupportsHnswIndex(field)) {
- if (!field.doesAttributing()) {
+ if (validate && !field.doesAttributing()) {
fail(search, field, "A tensor that has an index must also be an attribute.");
}
var index = field.getIndex(field.getName());