Merge pull request #17490 from vespa-engine/geirst/hnsw-index-parameters-validation

A tensor field that specifies hnsw index parameters must also specify…

1 files changed, 8 insertions, 0 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 dcf238c71c2..397e1c3deab 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
@@ -29,6 +29,7 @@ public class TensorFieldProcessor extends Processor {
                 if (validate) {
                     validateIndexingScripsForTensorField(field);
                     validateAttributeSettingForTensorField(field);
+                    validateHnswIndexParametersRequiresIndexing(field);
                 }
                 processIndexSettingsForTensorField(field, validate);
             }
@@ -84,6 +85,13 @@ public class TensorFieldProcessor extends Processor {
         }
     }
 
+    private void validateHnswIndexParametersRequiresIndexing(SDField field) {
+        var index = field.getIndex(field.getName());
+        if (index != null && index.getHnswIndexParams().isPresent() && !field.doesIndexing()) {
+            fail(search, field, "A tensor that specifies hnsw index parameters must also specify 'index' in 'indexing'");
+        }
+    }
+
     private void processIndexSettingsForTensorField(SDField field, boolean validate) {
         if (!field.doesIndexing()) {
             return;