Merge branch 'master' into bratseth/node-metrics

2 files changed, 12 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperationContainer.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperationContainer.java
index 09e8b3ccdfa..ab9148992e0 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperationContainer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperationContainer.java
@@ -11,7 +11,7 @@ public interface FieldOperationContainer {
     /** Adds an operation */
     void addOperation(FieldOperation op);
 
-    /** Apply all operations. Operations must be sorted in thjeir natural order before applying each operation. */
+    /** Apply all operations. Operations must be sorted in their natural order before applying each operation. */
     void applyOperations(SDField field);
 
     String getName();
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java
index 39f543c7db3..7f9da28b9ca 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java
@@ -4,6 +4,7 @@ package com.yahoo.searchdefinition.fieldoperation;
 import com.yahoo.searchdefinition.Index;
 import com.yahoo.searchdefinition.Index.Type;
 import com.yahoo.searchdefinition.document.BooleanIndexDefinition;
+import com.yahoo.searchdefinition.document.HnswIndexParams;
 import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.searchdefinition.document.Stemming;
 
@@ -31,6 +32,8 @@ public class IndexOperation implements FieldOperation {
     private OptionalDouble densePostingListThreshold = OptionalDouble.empty();
     private Optional<Boolean> enableBm25 = Optional.empty();
 
+    private Optional<HnswIndexParams.Builder> hnswIndexParams = Optional.empty();
+
     public String getIndexName() {
         return indexName;
     }
@@ -91,6 +94,9 @@ public class IndexOperation implements FieldOperation {
         if (enableBm25.isPresent()) {
             index.setInterleavedFeatures(enableBm25.get());
         }
+        if (hnswIndexParams.isPresent()) {
+            index.setHnswIndexParams(hnswIndexParams.get().build());
+        }
     }
 
     public Type getType() {
@@ -116,8 +122,13 @@ public class IndexOperation implements FieldOperation {
     public void setDensePostingListThreshold(double densePostingListThreshold) {
         this.densePostingListThreshold = OptionalDouble.of(densePostingListThreshold);
     }
+
     public void setEnableBm25(boolean value) {
         enableBm25 = Optional.of(value);
     }
 
+    public void setHnswIndexParams(HnswIndexParams.Builder params) {
+        this.hnswIndexParams = Optional.of(params);
+    }
+
 }