Revert "Jonmv/reindexing when new extra field is added"

3 files changed, 8 insertions, 21 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaReindexAction.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaReindexAction.java
index c2d23844687..8b4060e7d19 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaReindexAction.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaReindexAction.java
@@ -46,7 +46,7 @@ public class VespaReindexAction extends VespaConfigChangeAction implements Confi
         return new VespaReindexAction(clusterId(), validationId, newMessage, newServices, documentType);
     }
 
-    @Override public Optional<ValidationId> validationId() { return Optional.ofNullable(validationId); }
+    @Override public Optional<ValidationId> validationId() { return Optional.of(validationId); }
     @Override public String getDocumentType() { return documentType; }
     @Override public boolean ignoreForInternalRedeploy() { return false; }
     @Override public String toString() { return super.toString() + ", documentType='" + documentType + "'"; }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java
index 20872bcf326..91e370211f1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.model.application.validation.change.search;
 
 import com.yahoo.config.application.api.ValidationId;
+import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.document.ImmutableSDField;
@@ -12,8 +13,8 @@ import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression;
 import com.yahoo.vespa.model.application.validation.change.VespaConfigChangeAction;
 import com.yahoo.vespa.model.application.validation.change.VespaReindexAction;
 
+import java.time.Instant;
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
 
@@ -36,18 +37,12 @@ public class IndexingScriptChangeValidator {
 
     public List<VespaConfigChangeAction> validate() {
         List<VespaConfigChangeAction> result = new ArrayList<>();
-        for (ImmutableSDField nextField : new LinkedHashSet<>(nextSearch.allConcreteFields())) {
+        for (ImmutableSDField nextField : nextSearch.allConcreteFields()) {
             String fieldName = nextField.getName();
             ImmutableSDField currentField = currentSearch.getConcreteField(fieldName);
             if (currentField != null) {
                 validateScripts(currentField, nextField).ifPresent(r -> result.add(r));
             }
-            else if (nextField.isExtraField()) {
-                result.add(VespaReindexAction.of(id,
-                                                 null,
-                                                 "Non-document field '" + nextField.getName() +
-                                                 "' added; this may be populated by reindexing"));
-            }
         }
         return result;
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java
index b1fda081b64..20f5a9c841c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java
@@ -2,12 +2,14 @@
 package com.yahoo.vespa.model.application.validation.change.search;
 
 import com.yahoo.config.application.api.ValidationId;
+import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression;
 import com.yahoo.vespa.model.application.validation.change.VespaConfigChangeAction;
 import com.yahoo.vespa.model.application.validation.change.VespaReindexAction;
 import org.junit.Test;
 
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 
@@ -128,7 +130,7 @@ public class IndexingScriptChangeValidatorTest {
     }
 
     @Test
-    public void requireThatAddingDocumentIndexFieldIsOk() throws Exception {
+    public void requireThatAddingIndexFieldIsOk() throws Exception {
         new Fixture("", "field f1 type string { indexing: index | summary }").
                 assertValidation();
     }
@@ -140,22 +142,12 @@ public class IndexingScriptChangeValidatorTest {
     }
 
     @Test
-    public void requireThatAddingDocumentFieldIsOk() throws Exception {
+    public void requireThatAddingFieldIsOk() throws Exception {
         new Fixture("", FIELD + " { indexing: attribute | summary }").
                 assertValidation();
     }
 
     @Test
-    public void requireThatAddingExtraFieldRequiresReindexing() throws Exception {
-        new Fixture(" field f1 type string { indexing: index }",
-                    " field f1 type string { indexing: index } } " +
-                    " field f2 type string { indexing: input f1 | summary ")
-                .assertValidation(VespaReindexAction.of(ClusterSpec.Id.from("test"),
-                                                        null,
-                                                        "Non-document field 'f2' added; this may be populated by reindexing"));
-    }
-
-    @Test
     public void requireThatAddingSummaryAspectIsOk() throws Exception {
         new Fixture(FIELD + " { indexing: attribute }",
                     FIELD + " { indexing: attribute | summary }").