From 706e6cb32b33fe718ef1fc7325bc78e06b8c84fb Mon Sep 17 00:00:00 2001
From: Geir Storli <geirst@verizonmedia.com>
Date: Tue, 25 Jun 2019 13:28:14 +0000
Subject: Rename flag to turn on new posting list format with interleaved
 features used for bm25.

---
 .../yahoo/searchdefinition/fieldoperation/IndexOperation.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java')

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 459bb247e5f..39f543c7db3 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
@@ -29,8 +29,7 @@ public class IndexOperation implements FieldOperation {
     private OptionalLong lowerBound = OptionalLong.empty();
     private OptionalLong upperBound = OptionalLong.empty();
     private OptionalDouble densePostingListThreshold = OptionalDouble.empty();
-    // TODO: Remove when experimental posting list format is made default
-    private Optional<Boolean> experimentalPostingListFormat = Optional.empty();
+    private Optional<Boolean> enableBm25 = Optional.empty();
 
     public String getIndexName() {
         return indexName;
@@ -89,8 +88,8 @@ public class IndexOperation implements FieldOperation {
             index.setBooleanIndexDefiniton(
                     new BooleanIndexDefinition(arity, lowerBound, upperBound, densePostingListThreshold));
         }
-        if (experimentalPostingListFormat.isPresent()) {
-            index.setExperimentalPostingListFormat(experimentalPostingListFormat.get());
+        if (enableBm25.isPresent()) {
+            index.setInterleavedFeatures(enableBm25.get());
         }
     }
 
@@ -117,8 +116,8 @@ public class IndexOperation implements FieldOperation {
     public void setDensePostingListThreshold(double densePostingListThreshold) {
         this.densePostingListThreshold = OptionalDouble.of(densePostingListThreshold);
     }
-    public void setExperimentalPostingListFormat(boolean value) {
-        experimentalPostingListFormat = Optional.of(value);
+    public void setEnableBm25(boolean value) {
+        enableBm25 = Optional.of(value);
     }
 
 }
-- 
cgit v1.2.3