Merge pull request #9442 from vespa-engine/geirst/finish-wiring-of-experimental-posting-list-format-flag

Wire 'experimental posting list format' flag to where disk index is c…

3 files changed, 8 insertions, 2 deletions

diff --git a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
index 5bf540fdaaf..35204303bc5 100644
--- a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
@@ -323,7 +323,8 @@ Fusion::openFieldWriter(const SchemaUtil::IndexIterator &index, FieldWriter &wri
 {
     vespalib::string dir = _outDir + "/" + index.getName();
 
-    if (!writer.open(dir + "/", 64, 262144, _dynamicKPosIndexFormat, false, index.getSchema(),
+    if (!writer.open(dir + "/", 64, 262144, _dynamicKPosIndexFormat,
+                     index.use_experimental_posting_list_format(), index.getSchema(),
                      index.getIndex(), _tuneFileIndexing._write, _fileHeaderContext)) {
         throw IllegalArgumentException(make_string("Could not open output posocc + dictionary in %s", dir.c_str()));
     }
diff --git a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp
index 7a6e24f2529..f9620c35908 100644
--- a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp
@@ -97,7 +97,8 @@ FileHandle::open(vespalib::stringref dir,
 
     _fieldWriter = std::make_shared<FieldWriter>(docIdLimit, numWordIds);
 
-    if (!_fieldWriter->open(dir + "/", 64, 262144u, false, false,
+    if (!_fieldWriter->open(dir + "/", 64, 262144u, false,
+                            index.use_experimental_posting_list_format(),
                             index.getSchema(), index.getIndex(),
                             tuneFileWrite, fileHeaderContext)) {
         LOG(error, "Could not open term writer %s for write (%s)",
diff --git a/searchlib/src/vespa/searchlib/index/schemautil.h b/searchlib/src/vespa/searchlib/index/schemautil.h
index c8fe8e4fe32..69b79ecfedd 100644
--- a/searchlib/src/vespa/searchlib/index/schemautil.h
+++ b/searchlib/src/vespa/searchlib/index/schemautil.h
@@ -83,6 +83,10 @@ public:
             return _schema.getIndexField(_index).getName();
         }
 
+        bool use_experimental_posting_list_format() const {
+            return _schema.getIndexField(_index).use_experimental_posting_list_format();
+        }
+
         IndexIterator &operator++() {
             if (_index < _schema.getNumIndexFields()) {
                 ++_index;