From de87979afeea21a8a613f2e726be94e3bb2e860c Mon Sep 17 00:00:00 2001
From: Geir Storli <geirst@verizonmedia.com>
Date: Tue, 18 Feb 2020 12:55:49 +0000
Subject: Don't deactivate processing of index settings when validation is
 turned off.

---
 .../processing/TensorFieldProcessor.java               | 18 ++++++++++--------
 1 file 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());
-- 
cgit v1.2.3