Don't implicitly set word match for tensor attribute fields.

2 files changed, 51 insertions, 4 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java
index 8778f0c26c0..0677cabafb0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java
@@ -29,11 +29,18 @@ public abstract class ContentClusterFixture {
         nextCluster = createCluster(nextSd);
     }
 
+    protected ContentClusterFixture(ContentCluster currentCluster, ContentCluster nextCluster) {
+        this.currentCluster = currentCluster;
+        this.nextCluster = nextCluster;
+    }
+
     public ContentClusterFixture(String entireSd) throws Exception {
-        currentCluster = new ContentClusterBuilder().build(
-            ContentClusterUtils.createMockRoot(List.of(entireSd)));
-        nextCluster = new ContentClusterBuilder().build(
-            ContentClusterUtils.createMockRoot(List.of(entireSd)));
+        currentCluster = createClusterFromEntireSd(entireSd);
+        nextCluster = createClusterFromEntireSd(entireSd);
+    }
+
+    protected static ContentCluster createClusterFromEntireSd(String sdContent) throws Exception {
+        return new ContentClusterBuilder().build(ContentClusterUtils.createMockRoot(List.of(sdContent)));
     }
 
     private static ContentCluster createCluster(String sdContent) throws Exception {
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 cd54a20523f..247f01068fa 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
@@ -39,6 +39,21 @@ public class IndexingScriptChangeValidatorTest {
         }
     }
 
+    private static class ComplexFixture extends ContentClusterFixture {
+        IndexingScriptChangeValidator validator;
+        public ComplexFixture(String currentSd, String nextSd) throws Exception {
+            super(createClusterFromEntireSd(currentSd), createClusterFromEntireSd(nextSd));
+            validator = new IndexingScriptChangeValidator(ClusterSpec.Id.from("test"),
+                    currentDb().getDerivedConfiguration().getSchema(),
+                    nextDb().getDerivedConfiguration().getSchema());
+        }
+
+        @Override
+        public List<VespaConfigChangeAction> validate() {
+            return validator.validate();
+        }
+    }
+
     private static class ScriptFixture {
 
         private final ScriptExpression currentScript;
@@ -56,6 +71,9 @@ public class IndexingScriptChangeValidatorTest {
 
     private static final String FIELD = "field f1 type string";
     private static final String FIELD_F2 = "field f2 type string";
+    private static final String TENSOR_FIELD_F1 = "field f1 type tensor(x[2])";
+    private static final String TENSOR_FIELD_F2 = "field f2 type tensor(x[2])";
+    private static final String TENSOR_FIELD_F3 = "field f3 type tensor(x[2])";
 
     private static VespaConfigChangeAction expectedReindexingAction(String changedMsg, String fromScript, String toScript) {
         return expectedReindexingAction("f1", changedMsg, fromScript, toScript);
@@ -115,6 +133,28 @@ public class IndexingScriptChangeValidatorTest {
     }
 
     @Test
+    void requireThatAddingIndexAspectForExtraTensorFieldWithChangedInputRequireReindexing() throws Exception {
+        new ComplexFixture(joinLines("schema test {",
+                "  document test {",
+                "    " + TENSOR_FIELD_F1 + " { }",
+                "    " + TENSOR_FIELD_F2 + " { }",
+                "  }",
+                "  " + TENSOR_FIELD_F3 + " { indexing: input f1 | attribute }",
+                "}"),
+                joinLines("schema test {",
+                        "  document test {",
+                        "    " + TENSOR_FIELD_F1 + " { }",
+                        "    " + TENSOR_FIELD_F2 + " { }",
+                        "  }",
+                        "  " + TENSOR_FIELD_F3 + " { indexing: input f2 | index | attribute }",
+                        "}")).
+                assertValidation(List.of(expectedReindexingAction("f3", "add index aspect",
+                                "{ input f1 | attribute f3; }",
+                                "{ input f2 | index f3 | attribute f3; }")));
+    }
+
+
+    @Test
     void requireThatSettingDynamicSummaryIsOk() throws Exception {
         new Fixture(FIELD + " { indexing: summary }",
                 FIELD + " { indexing: summary \n summary: dynamic }").