From 38213cb7e224dddcccda542191b8e81f495cf6a4 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Mon, 24 Jun 2019 09:22:45 +0000 Subject: Rename experimentalpostinglistformat -> interleavedfeatures in indexschema.def. --- .../searchdefinition/derived/IndexSchema.java | 2 +- .../src/test/derived/indexschema/indexschema.cfg | 48 +++++++++++----------- .../src/test/derived/uri_array/indexschema.cfg | 16 ++++---- .../src/test/derived/uri_wset/indexschema.cfg | 16 ++++---- configdefinitions/src/vespa/indexschema.def | 4 +- .../src/tests/schema/load-save-cfg/indexschema.cfg | 2 +- searchcommon/src/tests/schema/schema_test.cpp | 6 +-- .../src/vespa/searchcommon/common/schema.cpp | 12 +++--- .../src/vespa/searchcommon/common/schema.h | 10 ++--- .../vespa/searchcommon/common/schemaconfigurer.cpp | 2 +- .../src/tests/diskindex/fusion/fusion_test.cpp | 2 +- .../memoryindex/field_index/field_index_test.cpp | 2 +- .../src/vespa/searchlib/diskindex/fieldreader.cpp | 6 +-- searchlib/src/vespa/searchlib/diskindex/fusion.cpp | 6 +-- .../src/vespa/searchlib/diskindex/indexbuilder.cpp | 2 +- searchlib/src/vespa/searchlib/index/schemautil.cpp | 4 +- searchlib/src/vespa/searchlib/index/schemautil.h | 6 +-- .../memoryindex/field_index_collection.cpp | 2 +- 18 files changed, 74 insertions(+), 74 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java index 6f6e97a0876..3b62807ce73 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java @@ -114,7 +114,7 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer { .prefix(f.hasPrefix()) .phrases(f.hasPhrases()) .positions(f.hasPositions()) - .experimentalpostinglistformat(f.useExperimentalPostingListFormat()); + .interleavedfeatures(f.useExperimentalPostingListFormat()); if (!f.getCollectionType().equals("SINGLE")) { ifB.collectiontype(IndexschemaConfig.Indexfield.Collectiontype.Enum.valueOf(f.getCollectionType())); } diff --git a/config-model/src/test/derived/indexschema/indexschema.cfg b/config-model/src/test/derived/indexschema/indexschema.cfg index 612af087b0c..998e53136a4 100644 --- a/config-model/src/test/derived/indexschema/indexschema.cfg +++ b/config-model/src/test/derived/indexschema/indexschema.cfg @@ -5,7 +5,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sb" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -13,7 +13,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sc" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -21,7 +21,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sd" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -29,7 +29,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sf" indexfield[].datatype STRING indexfield[].collectiontype ARRAY @@ -37,7 +37,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sg" indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET @@ -45,7 +45,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sh" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -53,7 +53,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "si" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -61,7 +61,7 @@ indexfield[].prefix true indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "exact1" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -69,7 +69,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "exact2" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -77,7 +77,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "experimental" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -85,7 +85,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat true +indexfield[].interleavedfeatures true indexfield[].name "nostemstring1" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -93,7 +93,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "nostemstring2" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -101,7 +101,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "nostemstring3" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -109,7 +109,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "nostemstring4" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -117,7 +117,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "fs9" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -125,7 +125,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sd_literal" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -133,7 +133,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sh.fragment" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -141,7 +141,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sh.host" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -149,7 +149,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sh.hostname" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -157,7 +157,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sh.path" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -165,7 +165,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sh.port" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -173,7 +173,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sh.query" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -181,7 +181,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "sh.scheme" indexfield[].datatype STRING indexfield[].collectiontype SINGLE @@ -189,7 +189,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false fieldset[].name "fs9" fieldset[].field[].name "se" fieldset[].name "fs1" diff --git a/config-model/src/test/derived/uri_array/indexschema.cfg b/config-model/src/test/derived/uri_array/indexschema.cfg index 1a556daf558..1d0012b89be 100644 --- a/config-model/src/test/derived/uri_array/indexschema.cfg +++ b/config-model/src/test/derived/uri_array/indexschema.cfg @@ -5,7 +5,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.fragment" indexfield[].datatype STRING indexfield[].collectiontype ARRAY @@ -13,7 +13,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.host" indexfield[].datatype STRING indexfield[].collectiontype ARRAY @@ -21,7 +21,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.hostname" indexfield[].datatype STRING indexfield[].collectiontype ARRAY @@ -29,7 +29,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.path" indexfield[].datatype STRING indexfield[].collectiontype ARRAY @@ -37,7 +37,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.port" indexfield[].datatype STRING indexfield[].collectiontype ARRAY @@ -45,7 +45,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.query" indexfield[].datatype STRING indexfield[].collectiontype ARRAY @@ -53,7 +53,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.scheme" indexfield[].datatype STRING indexfield[].collectiontype ARRAY @@ -61,4 +61,4 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false diff --git a/config-model/src/test/derived/uri_wset/indexschema.cfg b/config-model/src/test/derived/uri_wset/indexschema.cfg index 7fe7f7a4941..897f7004d48 100644 --- a/config-model/src/test/derived/uri_wset/indexschema.cfg +++ b/config-model/src/test/derived/uri_wset/indexschema.cfg @@ -5,7 +5,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.fragment" indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET @@ -13,7 +13,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.host" indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET @@ -21,7 +21,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.hostname" indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET @@ -29,7 +29,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.path" indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET @@ -37,7 +37,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.port" indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET @@ -45,7 +45,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.query" indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET @@ -53,7 +53,7 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false indexfield[].name "my_uri.scheme" indexfield[].datatype STRING indexfield[].collectiontype WEIGHTEDSET @@ -61,4 +61,4 @@ indexfield[].prefix false indexfield[].phrases false indexfield[].positions true indexfield[].averageelementlen 512 -indexfield[].experimentalpostinglistformat false +indexfield[].interleavedfeatures false diff --git a/configdefinitions/src/vespa/indexschema.def b/configdefinitions/src/vespa/indexschema.def index c0c9f175837..245570ef7b5 100644 --- a/configdefinitions/src/vespa/indexschema.def +++ b/configdefinitions/src/vespa/indexschema.def @@ -16,8 +16,8 @@ indexfield[].phrases bool default=false indexfield[].positions bool default=true ## Average element length indexfield[].averageelementlen int default=512 -## Whether we should use a new experimental posting list format for this field. -indexfield[].experimentalpostinglistformat bool default=false +## Whether the index field should use posting lists with interleaved features or not. +indexfield[].interleavedfeatures bool default=false ## The name of the field collection (aka logical view). fieldset[].name string diff --git a/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg b/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg index b6c547c52c9..b9d82b9b569 100644 --- a/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg +++ b/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg @@ -5,7 +5,7 @@ indexfield[1].name b indexfield[1].datatype INT64 indexfield[2].name c indexfield[2].datatype STRING -indexfield[2].experimentalpostinglistformat true +indexfield[2].interleavedfeatures true fieldset[1] fieldset[0].name default fieldset[0].field[2] diff --git a/searchcommon/src/tests/schema/schema_test.cpp b/searchcommon/src/tests/schema/schema_test.cpp index e360ee1ba7a..3d35b11a51a 100644 --- a/searchcommon/src/tests/schema/schema_test.cpp +++ b/searchcommon/src/tests/schema/schema_test.cpp @@ -32,7 +32,7 @@ assertIndexField(const Schema::IndexField& exp, { assertField(exp, act); EXPECT_EQ(exp.getAvgElemLen(), act.getAvgElemLen()); - EXPECT_EQ(exp.use_experimental_posting_list_format(), act.use_experimental_posting_list_format()); + EXPECT_EQ(exp.use_interleaved_features(), act.use_interleaved_features()); } void @@ -183,7 +183,7 @@ TEST(SchemaTest, test_load_and_save) EXPECT_EQ(3u, s.getNumIndexFields()); assertIndexField(SIF("a", SDT::STRING), s.getIndexField(0)); assertIndexField(SIF("b", SDT::INT64), s.getIndexField(1)); - assertIndexField(SIF("c", SDT::STRING).set_experimental_posting_list_format(true), s.getIndexField(2)); + assertIndexField(SIF("c", SDT::STRING).set_interleaved_features(true), s.getIndexField(2)); EXPECT_EQ(9u, s.getNumAttributeFields()); assertField(SAF("a", SDT::STRING, SCT::SINGLE), @@ -448,7 +448,7 @@ TEST(SchemaTest, require_that_index_field_is_loaded_with_default_values_when_pro ASSERT_EQ(1, index_fields.size()); assertIndexField(SIF("foo", DataType::STRING, CollectionType::SINGLE). setAvgElemLen(512). - set_experimental_posting_list_format(false), + set_interleaved_features(false), index_fields[0]); assertIndexField(SIF("foo", DataType::STRING, CollectionType::SINGLE), index_fields[0]); } diff --git a/searchcommon/src/vespa/searchcommon/common/schema.cpp b/searchcommon/src/vespa/searchcommon/common/schema.cpp index 6d3bae31508..afc023a68d7 100644 --- a/searchcommon/src/vespa/searchcommon/common/schema.cpp +++ b/searchcommon/src/vespa/searchcommon/common/schema.cpp @@ -132,7 +132,7 @@ Schema::Field::operator!=(const Field &rhs) const Schema::IndexField::IndexField(vespalib::stringref name, DataType dt) : Field(name, dt), _avgElemLen(512), - _experimental_posting_list_format(false) + _interleaved_features(false) { } @@ -140,14 +140,14 @@ Schema::IndexField::IndexField(vespalib::stringref name, DataType dt, CollectionType ct) : Field(name, dt, ct), _avgElemLen(512), - _experimental_posting_list_format(false) + _interleaved_features(false) { } Schema::IndexField::IndexField(const std::vector &lines) : Field(lines), _avgElemLen(ConfigParser::parse("averageelementlen", lines, 512)), - _experimental_posting_list_format(ConfigParser::parse("experimentalpostinglistformat", lines, false)) + _interleaved_features(ConfigParser::parse("interleavedfeatures", lines, false)) { } @@ -156,7 +156,7 @@ Schema::IndexField::write(vespalib::asciistream & os, vespalib::stringref prefix { Field::write(os, prefix); os << prefix << "averageelementlen " << static_cast(_avgElemLen) << "\n"; - os << prefix << "experimentalpostinglistformat " << (_experimental_posting_list_format ? "true" : "false") << "\n"; + os << prefix << "interleavedfeatures " << (_interleaved_features ? "true" : "false") << "\n"; // TODO: Remove prefix, phrases and positions when breaking downgrade is no longer an issue. os << prefix << "prefix false" << "\n"; @@ -169,7 +169,7 @@ Schema::IndexField::operator==(const IndexField &rhs) const { return Field::operator==(rhs) && _avgElemLen == rhs._avgElemLen && - _experimental_posting_list_format == rhs._experimental_posting_list_format; + _interleaved_features == rhs._interleaved_features; } bool @@ -177,7 +177,7 @@ Schema::IndexField::operator!=(const IndexField &rhs) const { return Field::operator!=(rhs) || _avgElemLen != rhs._avgElemLen || - _experimental_posting_list_format != rhs._experimental_posting_list_format; + _interleaved_features != rhs._interleaved_features; } Schema::FieldSet::FieldSet(const std::vector & lines) : diff --git a/searchcommon/src/vespa/searchcommon/common/schema.h b/searchcommon/src/vespa/searchcommon/common/schema.h index bb2163e5577..0b675710e8b 100644 --- a/searchcommon/src/vespa/searchcommon/common/schema.h +++ b/searchcommon/src/vespa/searchcommon/common/schema.h @@ -77,8 +77,8 @@ public: class IndexField : public Field { private: uint32_t _avgElemLen; - // TODO: Remove when experimental posting list format is made default - bool _experimental_posting_list_format; + // TODO: Remove when posting list format with interleaved features is made default + bool _interleaved_features; public: IndexField(vespalib::stringref name, DataType dt); @@ -89,8 +89,8 @@ public: IndexField(const std::vector &lines); IndexField &setAvgElemLen(uint32_t avgElemLen) { _avgElemLen = avgElemLen; return *this; } - IndexField &set_experimental_posting_list_format(bool value) { - _experimental_posting_list_format = value; + IndexField &set_interleaved_features(bool value) { + _interleaved_features = value; return *this; } @@ -98,7 +98,7 @@ public: vespalib::stringref prefix) const override; uint32_t getAvgElemLen() const { return _avgElemLen; } - bool use_experimental_posting_list_format() const { return _experimental_posting_list_format; } + bool use_interleaved_features() const { return _interleaved_features; } bool operator==(const IndexField &rhs) const; bool operator!=(const IndexField &rhs) const; diff --git a/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp b/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp index 59ed15eefb0..a46f99d158d 100644 --- a/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp +++ b/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp @@ -145,7 +145,7 @@ SchemaBuilder::build(const IndexschemaConfig &cfg, Schema &schema) schema.addIndexField(Schema::IndexField(f.name, convertIndexDataType(f.datatype), convertIndexCollectionType(f.collectiontype)). setAvgElemLen(f.averageelementlen). - set_experimental_posting_list_format(f.experimentalpostinglistformat)); + set_interleaved_features(f.interleavedfeatures)); } for (size_t i = 0; i < cfg.fieldset.size(); ++i) { const IndexschemaConfig::Fieldset &fs = cfg.fieldset[i]; 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(); // The common case } } @@ -238,7 +238,7 @@ FieldReaderEmpty::getFeatureParams(PostingListParams ¶ms) FieldReaderStripInfo::FieldReaderStripInfo(const IndexIterator &index, std::shared_ptr 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 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(_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(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>(schema, fieldId, inspector.get_field_length_info(field.getName()))); } else { -- cgit v1.2.3