Rename experimentalpostinglistformat -> interleavedfeatures in indexschema.def.

8 files changed, 15 insertions, 15 deletions

diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
index 93a3fde22dd..b77df846ebb 100644
--- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
+++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
@@ -124,7 +124,7 @@ Schema::IndexField
 make_index_field(vespalib::stringref name, CollectionType collection_type, bool interleaved_features)
 {
     Schema::IndexField index_field(name, DataType::STRING, collection_type);
-    index_field.set_experimental_posting_list_format(interleaved_features);
+    index_field.set_interleaved_features(interleaved_features);
     return index_field;
 }
 
diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
index ac5ef45e330..7f2014a2207 100644
--- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
@@ -865,7 +865,7 @@ struct FieldIndexCollectionTypeTest : public ::testing::Test {
         Schema result;
         result.addIndexField(Schema::IndexField("normal", DataType::STRING));
         Schema::IndexField interleaved("interleaved", DataType::STRING);
-        interleaved.set_experimental_posting_list_format(true);
+        interleaved.set_interleaved_features(true);
         result.addIndexField(interleaved);
         return result;
     }
diff --git a/searchlib/src/vespa/searchlib/diskindex/fieldreader.cpp b/searchlib/src/vespa/searchlib/diskindex/fieldreader.cpp
index a6208cee970..aeb4e2976b5 100644
--- a/searchlib/src/vespa/searchlib/diskindex/fieldreader.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/fieldreader.cpp
@@ -195,8 +195,8 @@ FieldReader::allocFieldReader(const SchemaUtil::IndexIterator &index,
 {
     assert(index.isValid());
     if (index.hasMatchingOldFields(oldSchema)) {
-        if (!index.use_experimental_posting_list_format() ||
-            index.has_matching_experimental_posting_list_format(oldSchema)) {
+        if (!index.use_interleaved_features() ||
+            index.has_matching_use_interleaved_features(oldSchema)) {
             return std::make_unique<FieldReader>();      // The common case
         }
     }
@@ -238,7 +238,7 @@ FieldReaderEmpty::getFeatureParams(PostingListParams &params)
 FieldReaderStripInfo::FieldReaderStripInfo(const IndexIterator &index, std::shared_ptr<FieldLengthScanner> field_length_scanner)
     : _hasElements(false),
       _hasElementWeights(false),
-      _want_interleaved_features(index.use_experimental_posting_list_format()),
+      _want_interleaved_features(index.use_interleaved_features()),
       _regenerate_interleaved_features(false),
       _field_length_scanner(std::move(field_length_scanner))
 {
diff --git a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
index 2f302650d37..0ad178d14b3 100644
--- a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
@@ -311,7 +311,7 @@ Fusion::selectCookedOrRawFeatures(Reader &reader, Writer &writer)
 std::shared_ptr<FieldLengthScanner>
 Fusion::allocate_field_length_scanner(const SchemaUtil::IndexIterator &index)
 {
-    if (index.use_experimental_posting_list_format()) {
+    if (index.use_interleaved_features()) {
         PosOccFieldsParams fieldsParams;
         fieldsParams.setSchemaParams(index.getSchema(), index.getIndex());
         assert(fieldsParams.getNumFields() > 0);
@@ -320,7 +320,7 @@ Fusion::allocate_field_length_scanner(const SchemaUtil::IndexIterator &index)
             for (const auto &old_index : _oldIndexes) {
                 const Schema &old_schema = old_index.getSchema();
                 if (index.hasOldFields(old_schema) &&
-                    !index.has_matching_experimental_posting_list_format(old_schema)) {
+                    !index.has_matching_use_interleaved_features(old_schema)) {
                     return std::make_shared<FieldLengthScanner>(_docIdLimit);
                 }
             }
@@ -357,7 +357,7 @@ Fusion::openFieldWriter(const SchemaUtil::IndexIterator &index, FieldWriter &wri
     vespalib::string dir = _outDir + "/" + index.getName();
 
     if (!writer.open(dir + "/", 64, 262144, _dynamicKPosIndexFormat,
-                     index.use_experimental_posting_list_format(), index.getSchema(),
+                     index.use_interleaved_features(), index.getSchema(),
                      index.getIndex(),
                      field_length_info,
                      _tuneFileIndexing._write, _fileHeaderContext)) {
diff --git a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp
index c2e311f18a6..0b43bcf6b8c 100644
--- a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp
@@ -105,7 +105,7 @@ FileHandle::open(vespalib::stringref dir,
     _fieldWriter = std::make_shared<FieldWriter>(docIdLimit, numWordIds);
 
     if (!_fieldWriter->open(dir + "/", 64, 262144u, false,
-                            index.use_experimental_posting_list_format(),
+                            index.use_interleaved_features(),
                             index.getSchema(), index.getIndex(),
                             field_length_info,
                             tuneFileWrite, fileHeaderContext)) {
diff --git a/searchlib/src/vespa/searchlib/index/schemautil.cpp b/searchlib/src/vespa/searchlib/index/schemautil.cpp
index 66edd22d72e..1fce4a1fe99 100644
--- a/searchlib/src/vespa/searchlib/index/schemautil.cpp
+++ b/searchlib/src/vespa/searchlib/index/schemautil.cpp
@@ -69,7 +69,7 @@ SchemaUtil::IndexIterator::hasMatchingOldFields(const Schema &oldSchema) const
 }
 
 bool
-SchemaUtil::IndexIterator::has_matching_experimental_posting_list_format(const Schema &oldSchema) const
+SchemaUtil::IndexIterator::has_matching_use_interleaved_features(const Schema &oldSchema) const
 {
     assert(isValid());
     const Schema::IndexField &newField = getSchema().getIndexField(getIndex());
@@ -79,7 +79,7 @@ SchemaUtil::IndexIterator::has_matching_experimental_posting_list_format(const S
         return false;
     }
     const Schema::IndexField &oldField = oldSchema.getIndexField(oldFieldId);
-    return (oldField.use_experimental_posting_list_format() == newField.use_experimental_posting_list_format());
+    return (oldField.use_interleaved_features() == newField.use_interleaved_features());
 }
 
 bool
diff --git a/searchlib/src/vespa/searchlib/index/schemautil.h b/searchlib/src/vespa/searchlib/index/schemautil.h
index f575b4de9f5..2e77aa67ad4 100644
--- a/searchlib/src/vespa/searchlib/index/schemautil.h
+++ b/searchlib/src/vespa/searchlib/index/schemautil.h
@@ -83,8 +83,8 @@ public:
             return _schema.getIndexField(_index).getName();
         }
 
-        bool use_experimental_posting_list_format() const {
-            return _schema.getIndexField(_index).use_experimental_posting_list_format();
+        bool use_interleaved_features() const {
+            return _schema.getIndexField(_index).use_interleaved_features();
         }
 
         IndexIterator &operator++() {
@@ -120,7 +120,7 @@ public:
          */
         bool hasMatchingOldFields(const Schema &oldSchema) const;
 
-        bool has_matching_experimental_posting_list_format(const Schema &oldSchema) const;
+        bool has_matching_use_interleaved_features(const Schema &oldSchema) const;
     };
 
     static IndexSettings getIndexSettings(const Schema &schema, const uint32_t index);
diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.cpp b/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.cpp
index 0f6b606d644..fcbe406e9ac 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.cpp
@@ -34,7 +34,7 @@ FieldIndexCollection::FieldIndexCollection(const Schema& schema, const IFieldLen
 {
     for (uint32_t fieldId = 0; fieldId < _numFields; ++fieldId) {
         const auto& field = schema.getIndexField(fieldId);
-        if (field.use_experimental_posting_list_format()) {
+        if (field.use_interleaved_features()) {
             _fieldIndexes.push_back(std::make_unique<FieldIndex<true>>(schema, fieldId,
                                                                        inspector.get_field_length_info(field.getName())));
         } else {