diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-29 15:11:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 15:11:09 +0200 |
| commit | b502d119a9ebdddc8bb68ce0448c0374e695a7f4 (patch) | |
| tree | fe906bcb2ad76080965b673775cedaf79c80be6a | |
| parent | 7a4e25f7bed3f3b20c5e6b9919ed8456ffb820f6 (diff) | |
| parent | a69226e622838cea0021aa1762c5ac5cc0cdbdff (diff) | |
Merge pull request #24258 from vespa-engine/balder/always-use-bitvector-if-it-is-a-good-idea
Balder/always use bitvector if it is a good idea
52 files changed, 106 insertions, 365 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java index 567bd564eb5..1ce1c48c0f1 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java @@ -99,7 +99,6 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce private void applyRanking(ImmutableSDField field, Attribute attribute) { Ranking ranking = field.getRanking(); if (ranking != null && ranking.isFilter()) { - attribute.setEnableBitVectors(true); attribute.setEnableOnlyBitVector(true); } } @@ -201,7 +200,6 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce if (attribute.isCreateIfNonExistent()) { aaB.createifnonexistent(true); } - aaB.enablebitvectors(attribute.isEnabledBitVectors()); aaB.enableonlybitvector(attribute.isEnabledOnlyBitVector()); if (attribute.isFastSearch() || attribute.isFastRank()) { // TODO make a separate fastrank flag in config instead of overloading fastsearch @@ -282,9 +280,6 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce if (isAttributeInFieldSet(attribute, fs)) { AttributesConfig.Attribute.Builder attrBuilder = getConfig(attribute.getName(), attribute, false); attrBuilder.maxuncommittedmemory(maxUnCommittedMemory); - if (attribute.isFastSearch()) { - attrBuilder.enablebitvectors(true); - } builder.attribute(attrBuilder); } } diff --git a/config-model/src/main/java/com/yahoo/schema/document/Attribute.java b/config-model/src/main/java/com/yahoo/schema/document/Attribute.java index ca8279752ac..34e86cbf4a8 100644 --- a/config-model/src/main/java/com/yahoo/schema/document/Attribute.java +++ b/config-model/src/main/java/com/yahoo/schema/document/Attribute.java @@ -50,7 +50,6 @@ public final class Attribute implements Cloneable, Serializable { private boolean removeIfZero = false; private boolean createIfNonExistent = false; - private boolean enableBitVectors = false; private boolean enableOnlyBitVector = false; private boolean fastRank = false; @@ -145,8 +144,8 @@ public final class Attribute implements Cloneable, Serializable { /** Creates an attribute with default settings */ public Attribute(String name, DataType fieldType) { this(name, convertDataType(fieldType), convertCollectionType(fieldType), convertTensorType(fieldType), convertTargetType(fieldType)); - setRemoveIfZero(fieldType instanceof WeightedSetDataType ? ((WeightedSetDataType)fieldType).removeIfZero() : false); - setCreateIfNonExistent(fieldType instanceof WeightedSetDataType ? ((WeightedSetDataType)fieldType).createIfNonExistent() : false); + setRemoveIfZero(fieldType instanceof WeightedSetDataType wsdt && wsdt.removeIfZero()); + setCreateIfNonExistent(fieldType instanceof WeightedSetDataType wsdt && wsdt.createIfNonExistent()); } public Attribute(String name, Type type, CollectionType collectionType) { @@ -179,7 +178,7 @@ public final class Attribute implements Cloneable, Serializable { * Multi value attributes are not.</p> */ public boolean isPrefetch() { - if (prefetch!=null) return prefetch.booleanValue(); + if (prefetch!=null) return prefetch; if (tensorType.isPresent()) { return false; @@ -196,7 +195,6 @@ public final class Attribute implements Cloneable, Serializable { public boolean isRemoveIfZero() { return removeIfZero; } public boolean isCreateIfNonExistent() { return createIfNonExistent; } - public boolean isEnabledBitVectors() { return enableBitVectors; } public boolean isEnabledOnlyBitVector() { return enableOnlyBitVector; } public boolean isFastSearch() { return fastSearch; } public boolean isFastRank() { return fastRank; } @@ -230,7 +228,6 @@ public final class Attribute implements Cloneable, Serializable { * True or false to override default, null to use default */ public void setPrefetch(Boolean prefetch) { this.prefetch = prefetch; } - public void setEnableBitVectors(boolean enableBitVectors) { this.enableBitVectors = enableBitVectors; } public void setEnableOnlyBitVector(boolean enableOnlyBitVector) { this.enableOnlyBitVector = enableOnlyBitVector; } public void setFastRank(boolean value) { Supplier<IllegalArgumentException> badGen = () -> @@ -335,23 +332,22 @@ public final class Attribute implements Cloneable, Serializable { /** Converts to the right field type from an attribute type */ private DataType toDataType(Type attributeType) { - switch (attributeType) { - case STRING : return DataType.STRING; - case INTEGER: return DataType.INT; - case LONG: return DataType.LONG; - case FLOAT16: return DataType.FLOAT16; - case FLOAT: return DataType.FLOAT; - case DOUBLE: return DataType.DOUBLE; - case BOOL: return DataType.BOOL; - case BYTE: return DataType.BYTE; - case PREDICATE: return DataType.PREDICATE; - case TENSOR: return DataType.getTensor(tensorType.orElseThrow(IllegalStateException::new)); - case REFERENCE: return createReferenceDataType(); - default: throw new IllegalArgumentException("Unknown attribute type " + attributeType); - } + return switch (attributeType) { + case STRING -> DataType.STRING; + case INTEGER -> DataType.INT; + case LONG -> DataType.LONG; + case FLOAT16 -> DataType.FLOAT16; + case FLOAT -> DataType.FLOAT; + case DOUBLE -> DataType.DOUBLE; + case BOOL -> DataType.BOOL; + case BYTE -> DataType.BYTE; + case PREDICATE -> DataType.PREDICATE; + case TENSOR -> DataType.getTensor(tensorType.orElseThrow(IllegalStateException::new)); + case REFERENCE-> createReferenceDataType(); + default -> throw new IllegalArgumentException("Unknown attribute type " + attributeType); + }; } - @SuppressWarnings("deprecation") private DataType createReferenceDataType() { if (referenceDocumentType.isEmpty()) { throw new IllegalStateException("Referenced document type is not set"); @@ -379,15 +375,14 @@ public final class Attribute implements Cloneable, Serializable { public int hashCode() { return Objects.hash( name, type, collectionType, sorting, dictionary, isPrefetch(), fastAccess, removeIfZero, - createIfNonExistent, isPosition, mutable, paged, enableBitVectors, enableOnlyBitVector, + createIfNonExistent, isPosition, mutable, paged, enableOnlyBitVector, tensorType, referenceDocumentType, distanceMetric, hnswIndexParams); } @Override public boolean equals(Object object) { - if (! (object instanceof Attribute)) return false; + if (! (object instanceof Attribute other)) return false; - Attribute other = (Attribute)object; if (!this.name.equals(other.name)) return false; return isCompatible(other); } @@ -399,7 +394,6 @@ public final class Attribute implements Cloneable, Serializable { if (this.isPrefetch() != other.isPrefetch()) return false; if (this.removeIfZero != other.removeIfZero) return false; if (this.createIfNonExistent != other.createIfNonExistent) return false; - if (this.enableBitVectors != other.enableBitVectors) return false; if (this.enableOnlyBitVector != other.enableOnlyBitVector) return false; if (this.fastSearch != other.fastSearch) return false; if (this.mutable != other.mutable) return false; diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java index 443dfb1602d..d00af722158 100644 --- a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java @@ -86,7 +86,6 @@ public class ConvertParsedFields { } attribute.setFastAccess(parsed.getFastAccess()); attribute.setMutable(parsed.getMutable()); - attribute.setEnableBitVectors(parsed.getEnableBitVectors()); attribute.setEnableOnlyBitVector(parsed.getEnableOnlyBitVector()); // attribute.setTensorType(?) diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ParsedAttribute.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedAttribute.java index de06436a1eb..26916a6685e 100644 --- a/config-model/src/main/java/com/yahoo/schema/parser/ParsedAttribute.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedAttribute.java @@ -14,7 +14,6 @@ import java.util.Optional; **/ class ParsedAttribute extends ParsedBlock { - private boolean enableBitVectors = false; private boolean enableOnlyBitVector = false; private boolean enableFastAccess = false; private boolean enableFastRank = false; @@ -32,7 +31,6 @@ class ParsedAttribute extends ParsedBlock { List<String> getAliases() { return List.copyOf(aliases.keySet()); } String lookupAliasedFrom(String alias) { return aliases.get(alias); } Optional<String> getDistanceMetric() { return Optional.ofNullable(distanceMetric); } - boolean getEnableBitVectors() { return this.enableBitVectors; } boolean getEnableOnlyBitVector() { return this.enableOnlyBitVector; } boolean getFastAccess() { return this.enableFastAccess; } boolean getFastRank() { return this.enableFastRank; } @@ -56,7 +54,6 @@ class ParsedAttribute extends ParsedBlock { return this.sortSettings; } - void setEnableBitVectors(boolean value) { this.enableBitVectors = value; } void setEnableOnlyBitVector(boolean value) { this.enableOnlyBitVector = value; } void setFastAccess(boolean value) { this.enableFastAccess = true; } void setFastRank(boolean value) { this.enableFastRank = true; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java index daade2d74d9..877ea1d59e7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java @@ -24,12 +24,12 @@ import com.yahoo.vespa.model.search.Tuning; import org.w3c.dom.Element; import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; +import java.util.LinkedHashMap; +import java.util.Optional; +import java.util.Objects; import java.util.TreeMap; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -118,10 +118,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> } private boolean getFlushOnShutdown(Boolean flushOnShutdownElem) { - if (flushOnShutdownElem != null) { - return flushOnShutdownElem; - } - return true; + return Objects.requireNonNullElse(flushOnShutdownElem, true); } private Double getQueryTimeout(ModelElement clusterElem) { @@ -151,7 +148,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> 0, docTypeName, clusterName); - search.addSearchCluster(deployState, cluster, getQueryTimeout(clusterElem), Arrays.asList(docType)); + search.addSearchCluster(deployState, cluster, getQueryTimeout(clusterElem), List.of(docType)); } private void buildIndexedSearchCluster(DeployState deployState, ModelElement clusterElem, diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj index 7ccaf956b43..a9c67a0bb60 100644 --- a/config-model/src/main/javacc/SchemaParser.jj +++ b/config-model/src/main/javacc/SchemaParser.jj @@ -1048,9 +1048,9 @@ void attributeSetting(ParsedAttribute attribute) : <FASTRANK> { attribute.setFastRank(true); } | <FASTSEARCH> { attribute.setFastSearch(true); } | <FASTACCESS> { attribute.setFastAccess(true); } - | <MUTABLE> { attribute.setMutable(true); } - | <PAGED> { attribute.setPaged(true); } - | <ENABLEBITVECTORS> { attribute.setEnableBitVectors(true); } + | <MUTABLE> { attribute.setMutable(true); } + | <PAGED> { attribute.setPaged(true); } + | <ENABLEBITVECTORS> { deployLogger.logApplicationPackage(Level.WARNING, "'enable-bit-vectors' is deprecated and void -> remove it. Will be removed in vespa-9"); } | <ENABLEONLYBITVECTOR> { attribute.setEnableOnlyBitVector(true); } | attributeSorting(attribute) | <ALIAS> { String alias; String aliasedName=attribute.name(); } [aliasedName = identifier()] <COLON> alias = identifierWithDash() { diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg index 0b4e28f0cbf..2d7d445bb04 100644 --- a/config-model/src/test/derived/advanced/attributes.cfg +++ b/config-model/src/test/derived/advanced/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg index e24ed687b93..38bcd36884d 100644 --- a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg +++ b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg index 3168ec24b98..8099555c692 100644 --- a/config-model/src/test/derived/attributeprefetch/attributes.cfg +++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -163,7 +158,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -193,7 +187,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -223,7 +216,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -253,7 +245,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -283,7 +274,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -313,7 +303,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -343,7 +332,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -373,7 +361,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -403,7 +390,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -433,7 +419,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -463,7 +448,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg index 07a3631819d..ad082058a79 100644 --- a/config-model/src/test/derived/attributes/attributes.cfg +++ b/config-model/src/test/derived/attributes/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -163,7 +158,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -193,7 +187,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -223,7 +216,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -253,7 +245,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -283,7 +274,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -313,7 +303,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -343,7 +332,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -373,7 +361,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -403,7 +390,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector true attribute[].fastaccess false attribute[].arity 8 @@ -433,7 +419,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess true attribute[].arity 8 @@ -463,7 +448,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector true attribute[].fastaccess false attribute[].arity 8 @@ -493,7 +477,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -523,7 +506,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -553,7 +535,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg index 0772b797777..2b3ba750504 100644 --- a/config-model/src/test/derived/complex/attributes.cfg +++ b/config-model/src/test/derived/complex/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -163,7 +158,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -193,7 +187,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -223,7 +216,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -253,7 +245,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/function_arguments/attributes.cfg b/config-model/src/test/derived/function_arguments/attributes.cfg index 101fe901ce2..7678476aba1 100644 --- a/config-model/src/test/derived/function_arguments/attributes.cfg +++ b/config-model/src/test/derived/function_arguments/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg b/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg index 7280596be5b..11e71f610ed 100644 --- a/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg +++ b/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg index 99a0d93fd35..831327f8a0f 100644 --- a/config-model/src/test/derived/hnsw_index/attributes.cfg +++ b/config-model/src/test/derived/hnsw_index/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg index 70f1f21b465..51de756114b 100644 --- a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg +++ b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/imported_position_field/attributes.cfg b/config-model/src/test/derived/imported_position_field/attributes.cfg index 2d1d1b232b1..2ab30bcef83 100644 --- a/config-model/src/test/derived/imported_position_field/attributes.cfg +++ b/config-model/src/test/derived/imported_position_field/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/imported_struct_fields/attributes.cfg b/config-model/src/test/derived/imported_struct_fields/attributes.cfg index 31eb66776d4..36106ca74bf 100644 --- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg +++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -163,7 +158,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -193,7 +187,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -223,7 +216,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg index 7f2cb39dc3d..ad511fedeab 100644 --- a/config-model/src/test/derived/importedfields/attributes.cfg +++ b/config-model/src/test/derived/importedfields/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -163,7 +158,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -193,7 +187,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -223,7 +216,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg index 9ab0cb0c67e..6abafd7fb8f 100644 --- a/config-model/src/test/derived/inheritance/attributes.cfg +++ b/config-model/src/test/derived/inheritance/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg index 27a18a58bfd..5138cf8257c 100644 --- a/config-model/src/test/derived/inheritfromparent/attributes.cfg +++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg index 0cfcc75d3b3..f0171f8c213 100644 --- a/config-model/src/test/derived/map_attribute/attributes.cfg +++ b/config-model/src/test/derived/map_attribute/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg index 7e6f7c282db..91ea48b566e 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg +++ b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/multiplesummaries/attributes.cfg b/config-model/src/test/derived/multiplesummaries/attributes.cfg index 448c1f4957a..27d2987f0af 100644 --- a/config-model/src/test/derived/multiplesummaries/attributes.cfg +++ b/config-model/src/test/derived/multiplesummaries/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg index 0c37cdb207f..69693b19078 100644 --- a/config-model/src/test/derived/music/attributes.cfg +++ b/config-model/src/test/derived/music/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -163,7 +158,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -193,7 +187,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -223,7 +216,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -253,7 +245,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -283,7 +274,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -313,7 +303,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg index 60d174d4b12..469c7a2a549 100644 --- a/config-model/src/test/derived/newrank/attributes.cfg +++ b/config-model/src/test/derived/newrank/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -163,7 +158,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -193,7 +187,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -223,7 +216,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -253,7 +245,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -283,7 +274,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg index d5810e78185..4f80da6d374 100644 --- a/config-model/src/test/derived/predicate_attribute/attributes.cfg +++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 5 diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg index 65a0df45fd6..86c10cea86a 100644 --- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg +++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg index a79bf71f65c..c035f474ba7 100644 --- a/config-model/src/test/derived/reference_fields/attributes.cfg +++ b/config-model/src/test/derived/reference_fields/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/schemainheritance/attributes.cfg b/config-model/src/test/derived/schemainheritance/attributes.cfg index a6ee394dcf3..be3aa9517d0 100644 --- a/config-model/src/test/derived/schemainheritance/attributes.cfg +++ b/config-model/src/test/derived/schemainheritance/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg index f2074be891f..a15fe5297cf 100644 --- a/config-model/src/test/derived/sorting/attributes.cfg +++ b/config-model/src/test/derived/sorting/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "en_US" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending false attribute[].sortfunction RAW attribute[].sortstrength SECONDARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction LOWERCASE attribute[].sortstrength TERTIARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending false attribute[].sortfunction UCA attribute[].sortstrength QUATERNARY attribute[].sortlocale "en_US" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction RAW attribute[].sortstrength IDENTICAL attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -163,7 +158,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "en_US" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -193,7 +187,6 @@ attribute[].sortascending false attribute[].sortfunction RAW attribute[].sortstrength SECONDARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -223,7 +216,6 @@ attribute[].sortascending true attribute[].sortfunction LOWERCASE attribute[].sortstrength TERTIARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -253,7 +245,6 @@ attribute[].sortascending false attribute[].sortfunction UCA attribute[].sortstrength QUATERNARY attribute[].sortlocale "en_US" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -283,7 +274,6 @@ attribute[].sortascending true attribute[].sortfunction RAW attribute[].sortstrength IDENTICAL attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -313,7 +303,6 @@ attribute[].sortascending false attribute[].sortfunction LOWERCASE attribute[].sortstrength SECONDARY attribute[].sortlocale "en_US" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/structandfieldset/attributes.cfg b/config-model/src/test/derived/structandfieldset/attributes.cfg index 42557c2de3a..d099bfc6cae 100644 --- a/config-model/src/test/derived/structandfieldset/attributes.cfg +++ b/config-model/src/test/derived/structandfieldset/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector true attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg index 4cfb2eb97df..752e236bb19 100644 --- a/config-model/src/test/derived/tensor/attributes.cfg +++ b/config-model/src/test/derived/tensor/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg index f7cfbc5216c..69b2e5d0e78 100644 --- a/config-model/src/test/derived/types/attributes.cfg +++ b/config-model/src/test/derived/types/attributes.cfg @@ -13,7 +13,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -43,7 +42,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -73,7 +71,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -103,7 +100,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -133,7 +129,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -163,7 +158,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -193,7 +187,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -223,7 +216,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -253,7 +245,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -283,7 +274,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -313,7 +303,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors true attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -343,7 +332,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 @@ -373,7 +361,6 @@ attribute[].sortascending true attribute[].sortfunction UCA attribute[].sortstrength PRIMARY attribute[].sortlocale "" -attribute[].enablebitvectors false attribute[].enableonlybitvector false attribute[].fastaccess false attribute[].arity 8 diff --git a/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java index eb9daf02aad..64f3bda4ac4 100644 --- a/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java @@ -244,16 +244,16 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { assertEquals(13333, cfg.attribute().get(2).maxuncommittedmemory()); } - private void verifyEnableBitVectorDefault(Schema schema) { + private void verifyEnableOnlyBitVectorDefault(Schema schema) { AttributeFields attributes = new AttributeFields(schema); AttributesConfig.Builder builder = new AttributesConfig.Builder(); attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 13333); AttributesConfig cfg = builder.build(); assertEquals("a", cfg.attribute().get(0).name()); - assertTrue(cfg.attribute().get(0).enablebitvectors()); + assertFalse(cfg.attribute().get(0).enableonlybitvector()); assertEquals("b", cfg.attribute().get(1).name()); - assertFalse(cfg.attribute().get(1).enablebitvectors()); + assertTrue(cfg.attribute().get(1).enableonlybitvector()); } @Test @@ -267,10 +267,14 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { " }\n" + " field b type int { \n" + " indexing: attribute \n" + + " attribute {\n" + + " fast-search\n" + + " enable-only-bit-vector\n" + + " }\n" + " }\n" + " }\n" + "}\n"); - verifyEnableBitVectorDefault(schema); + verifyEnableOnlyBitVectorDefault(schema); } @Test @@ -296,7 +300,6 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { single.setRemoveIfZero(true); single.setCreateIfNonExistent(true); single.setPrefetch(Boolean.TRUE); - single.setEnableBitVectors(true); single.setEnableOnlyBitVector(true); single.setFastSearch(true); single.setPaged(true); @@ -318,7 +321,6 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { assertTrue(array.isRemoveIfZero()); assertTrue(array.isCreateIfNonExistent()); assertTrue(array.isPrefetch()); - assertTrue(array.isEnabledBitVectors()); assertTrue(array.isEnabledOnlyBitVector()); assertTrue(array.isFastSearch()); assertTrue(array.isPaged()); diff --git a/configdefinitions/src/vespa/attributes.def b/configdefinitions/src/vespa/attributes.def index 38cc763704c..31f2bfc281d 100644 --- a/configdefinitions/src/vespa/attributes.def +++ b/configdefinitions/src/vespa/attributes.def @@ -17,8 +17,6 @@ attribute[].sortascending bool default=true attribute[].sortfunction enum { RAW, LOWERCASE, UCA } default=UCA attribute[].sortstrength enum { PRIMARY, SECONDARY, TERTIARY, QUATERNARY, IDENTICAL } default=PRIMARY attribute[].sortlocale string default="" -# Allow bitvector postings in addition to btree postings ? -attribute[].enablebitvectors bool default=false # Allow only bitvector postings, i.e. drop btree postings to save memory.? attribute[].enableonlybitvector bool default=false # Allow fast access to this attribute at all times. diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp index b8579d66c5f..3a0ae8576ca 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp @@ -22,7 +22,7 @@ namespace DDBCSP getConfig(int64_t generation, const Schema::SP &schema, - shared_ptr<const DocumentTypeRepo> repo, + const shared_ptr<const DocumentTypeRepo> & repo, const AttributesConfig &attributes) { return test::DocumentDBConfigBuilder(generation, schema, "client", "test"). @@ -43,9 +43,6 @@ assertDefaultAttribute(const AttributesConfig::Attribute &attribute, if (!EXPECT_FALSE(attribute.paged)) { return false; } - if (!EXPECT_FALSE(attribute.enablebitvectors)) { - return false; - } if (!EXPECT_FALSE(attribute.enableonlybitvector)) { return false; } @@ -66,9 +63,6 @@ assertFastSearchAttribute(const AttributesConfig::Attribute &attribute, if (!EXPECT_FALSE(attribute.paged)) { return false; } - if (!EXPECT_FALSE(attribute.enablebitvectors)) { - return false; - } if (!EXPECT_FALSE(attribute.enableonlybitvector)) { return false; } @@ -89,9 +83,6 @@ assertFastSearchAndMoreAttribute(const AttributesConfig::Attribute &attribute, if (!EXPECT_TRUE(attribute.paged)) { return false; } - if (!EXPECT_TRUE(attribute.enablebitvectors)) { - return false; - } if (!EXPECT_TRUE(attribute.enableonlybitvector)) { return false; } @@ -208,7 +199,7 @@ assertScoutedAttributes(const AttributesConfig::AttributeVector &attributes) AttributesConfig::Attribute -setupDefaultAttribute(const vespalib::string name) +setupDefaultAttribute(const vespalib::string & name) { AttributesConfig::Attribute attribute; attribute.name = name; @@ -217,7 +208,7 @@ setupDefaultAttribute(const vespalib::string name) AttributesConfig::Attribute -setupFastSearchAttribute(const vespalib::string name) +setupFastSearchAttribute(const vespalib::string & name) { AttributesConfig::Attribute attribute; attribute.name = name; @@ -227,13 +218,12 @@ setupFastSearchAttribute(const vespalib::string name) AttributesConfig::Attribute -setupFastSearchAndMoreAttribute(const vespalib::string name) +setupFastSearchAndMoreAttribute(const vespalib::string & name) { AttributesConfig::Attribute attribute; attribute.name = name; attribute.fastsearch = true; attribute.paged = true; - attribute.enablebitvectors = true; attribute.enableonlybitvector = true; return attribute; } diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp index e5a087e1bf2..b2bd81aaf9d 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp @@ -25,7 +25,6 @@ void AttributesConfigScout::adjust(AttributesConfig::Attribute &attr, const AttributesConfig::Attribute &liveAttr) { - attr.enablebitvectors = liveAttr.enablebitvectors; attr.enableonlybitvector = liveAttr.enableonlybitvector; attr.fastsearch = liveAttr.fastsearch; attr.paged = liveAttr.paged; @@ -43,8 +42,7 @@ AttributesConfigScout::adjust(AttributesConfig::Attribute &attr) const auto it = _map.find(attr.name); if (it != _map.end()) { const auto &liveAttr = _live.attribute[it->second]; - search::attribute::Config liveCfg = - ConfigConverter::convert(liveAttr); + search::attribute::Config liveCfg = ConfigConverter::convert(liveAttr); AttributeTypeMatcher matching_types; if (matching_types(cfg, liveCfg)) { adjust(attr, liveAttr); diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.h b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.h index a0db26273a5..9ffb2976a7a 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.h @@ -4,8 +4,7 @@ #include <vespa/config-attributes.h> -namespace proton -{ +namespace proton { /** * Class to create adjusted attributes config that minimizes the number of @@ -32,7 +31,7 @@ private: adjust(AttributesConfig::Attribute &attr); public: - AttributesConfigScout(const AttributesConfig &live); + explicit AttributesConfigScout(const AttributesConfig &live); std::shared_ptr<AttributesConfig> adjust(const AttributesConfig &config); diff --git a/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp b/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp index d1dde5ef6ea..7cfe7eaab75 100644 --- a/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp +++ b/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp @@ -57,7 +57,6 @@ struct BitVectorTest make(Config cfg, const vespalib::string &pref, bool fastSearch, - bool enableBitVectors, bool enableOnlyBitVector, bool filter); @@ -65,16 +64,10 @@ struct BitVectorTest addDocs(const AttributePtr &v, size_t sz); template <typename VectorType> - void populate(VectorType &v, - uint32_t low, - uint32_t high, - bool set); + void populate(VectorType &v, uint32_t low, uint32_t high, bool set); template <typename VectorType> - void populateAll(VectorType &v, - uint32_t low, - uint32_t high, - bool set); + void populateAll(VectorType &v, uint32_t low, uint32_t high, bool set); void buildTermQuery(std::vector<char> & buffer, @@ -116,7 +109,6 @@ struct BitVectorTest void test(BasicType bt, CollectionType ct, const vespalib::string &pref, bool fastSearch, - bool enableBitVectors, bool enableOnlyBitVector, bool filter); @@ -130,8 +122,8 @@ template <typename VectorType> VectorType & BitVectorTest::as(AttributePtr &v) { - VectorType *res = dynamic_cast<VectorType *>(v.get()); - assert(res != NULL); + auto *res = dynamic_cast<VectorType *>(v.get()); + assert(res != nullptr); return *res; } @@ -249,12 +241,10 @@ BitVectorTest::AttributePtr BitVectorTest::make(Config cfg, const vespalib::string &pref, bool fastSearch, - bool enableBitVectors, bool enableOnlyBitVector, bool filter) { cfg.setFastSearch(fastSearch); - cfg.setEnableBitVectors(enableBitVectors); cfg.setEnableOnlyBitVector(enableOnlyBitVector); cfg.setIsFilter(filter); AttributePtr v = AttributeFactory::createAttribute(pref, cfg); @@ -458,7 +448,7 @@ BitVectorTest::checkSearch(AttributePtr v, TermFieldMatchData md; sc->fetchPostings(search::queryeval::ExecuteInfo::TRUE); SearchBasePtr sb = sc->createIterator(&md, true); - checkSearch(v, std::move(sb), md, + checkSearch(std::move(v), std::move(sb), md, expFirstDocId, expLastDocId, expDocFreq, weights, checkStride); } @@ -470,18 +460,17 @@ BitVectorTest::test(BasicType bt, CollectionType ct, const vespalib::string &pref, bool fastSearch, - bool enableBitVectors, bool enableOnlyBitVector, bool filter) { Config cfg(bt, ct); - AttributePtr v = make(cfg, pref, fastSearch, enableBitVectors, enableOnlyBitVector, filter); + AttributePtr v = make(cfg, pref, fastSearch, enableOnlyBitVector, filter); addDocs(v, 1024); - VectorType &tv = as<VectorType>(v); + auto &tv = as<VectorType>(v); populate(tv, 2, 1023, true); SearchContextPtr sc = getSearch<VectorType>(tv, true); - checkSearch(v, std::move(sc), 2, 1022, 205, !enableBitVectors && !filter, true); + checkSearch(v, std::move(sc), 2, 1022, 205, !fastSearch && !filter, true); sc = getSearch<VectorType>(tv, false); checkSearch(v, std::move(sc), 2, 1022, 205, !enableOnlyBitVector && !filter, true); const search::IDocumentWeightAttribute *dwa = v->asDocumentWeightAttribute(); @@ -504,13 +493,13 @@ BitVectorTest::test(BasicType bt, checkSearch(v, std::move(sc), 977, 1022, 10, !enableOnlyBitVector &&!filter, true); populate(tv, 2, 973, true); sc = getSearch<VectorType>(tv, true); - checkSearch(v, std::move(sc), 2, 1022, 205, !enableBitVectors && !filter, true); + checkSearch(v, std::move(sc), 2, 1022, 205, !fastSearch && !filter, true); addDocs(v, 15000); sc = getSearch<VectorType>(tv, true); checkSearch(v, std::move(sc), 2, 1022, 205, !enableOnlyBitVector && !filter, true); populateAll(tv, 10, 15000, true); sc = getSearch<VectorType>(tv, true); - checkSearch(v, std::move(sc), 2, 14999, 14992, !enableBitVectors && !filter, false); + checkSearch(v, std::move(sc), 2, 14999, 14992, !fastSearch && !filter, false); } @@ -519,14 +508,12 @@ void BitVectorTest::test(BasicType bt, CollectionType ct, const vespalib::string &pref) { LOG(info, "test run, pref is %s", pref.c_str()); - test<VectorType, BufferType>(bt, ct, pref, false, false, false, false); - test<VectorType, BufferType>(bt, ct, pref, false, false, false, true); - test<VectorType, BufferType>(bt, ct, pref, true, false, false, false); - test<VectorType, BufferType>(bt, ct, pref, true, false, false, true); - test<VectorType, BufferType>(bt, ct, pref, true, true, false, false); - test<VectorType, BufferType>(bt, ct, pref, true, true, false, true); - test<VectorType, BufferType>(bt, ct, pref, true, true, true, false); - test<VectorType, BufferType>(bt, ct, pref, true, true, true, true); + test<VectorType, BufferType>(bt, ct, pref, false, false, false); + test<VectorType, BufferType>(bt, ct, pref, false, false, true); + test<VectorType, BufferType>(bt, ct, pref, true, false, false); + test<VectorType, BufferType>(bt, ct, pref, true, false, true); + test<VectorType, BufferType>(bt, ct, pref, true, true, false); + test<VectorType, BufferType>(bt, ct, pref, true, true, true); } @@ -605,8 +592,8 @@ TEST_F("Test bitvectors with weighted set value string", BitVectorTest) class Verifier : public search::test::SearchIteratorVerifier { public: - Verifier(bool inverted); - ~Verifier(); + explicit Verifier(bool inverted); + ~Verifier() override; SearchIterator::UP create(bool strict) const override { return BitVectorIterator::create(_bv.get(), getDocIdLimit(), _tfmd, strict, _inverted); diff --git a/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp b/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp index 573284ffa35..36babec6a89 100644 --- a/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp +++ b/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp @@ -23,28 +23,25 @@ using MyPostingStore = PostingStore<int32_t>; namespace { -static constexpr uint32_t lid_limit = 20000; -static constexpr uint32_t huge_sequence_length = 800; +constexpr uint32_t lid_limit = 20000; +constexpr uint32_t huge_sequence_length = 800; struct PostingStoreSetup { - bool enable_bitvectors; bool enable_only_bitvector; - PostingStoreSetup(bool enable_bitvectors_in, bool enable_only_bitvector_in) - : enable_bitvectors(enable_bitvectors_in), - enable_only_bitvector(enable_only_bitvector_in) + explicit PostingStoreSetup(bool enable_only_bitvector_in) + : enable_only_bitvector(enable_only_bitvector_in) { } }; std::ostream& operator<<(std::ostream& os, const PostingStoreSetup setup) { - os << (setup.enable_bitvectors ? "bv" : "nobv") << "_" << (setup.enable_only_bitvector ? "onlybv" : "mixed"); + os << (setup.enable_only_bitvector ? "onlybv" : "mixed"); return os; } Config make_config(PostingStoreSetup param) { Config cfg; - cfg.setEnableBitVectors(param.enable_bitvectors); cfg.setEnableOnlyBitVector(param.enable_only_bitvector); return cfg; } @@ -216,7 +213,6 @@ PostingStoreTest::test_compact_btree_nodes(uint32_t sequence_length) EXPECT_EQ(make_exp_sequence(5, 5 + sequence_length), get_sequence(ref2)); auto usage_after = store.getMemoryUsage(); if (sequence_length < huge_sequence_length || - !_config.getEnableBitVectors() || !_config.getEnableOnlyBitVector()) { EXPECT_GT(usage_before.deadBytes(), usage_after.deadBytes()); } else { @@ -226,7 +222,7 @@ PostingStoreTest::test_compact_btree_nodes(uint32_t sequence_length) VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(PostingStoreMultiTest, PostingStoreTest, - testing::Values(PostingStoreSetup(false, false), PostingStoreSetup(true, false), PostingStoreSetup(true, true)), testing::PrintToStringParamName()); + testing::Values(PostingStoreSetup(false), PostingStoreSetup(true)), testing::PrintToStringParamName()); TEST_P(PostingStoreTest, require_that_nodes_for_multiple_small_btrees_are_compacted) { diff --git a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp index e866c57342e..5ce20c06ab5 100644 --- a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp +++ b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp @@ -155,8 +155,8 @@ protected: template <typename VectorType, typename BufferType> void testPostingList(const AttributePtr& ptr1, uint32_t numDocs, const std::vector<BufferType>& values); void testPostingList(); - void testPostingList(bool enableBitVector, bool enable_only_bitvector); - void testPostingList(bool enableBitVector, bool enable_only_bitvector, uint32_t numDocs, uint32_t numUniqueValues); + void testPostingList(bool enable_only_bitvector); + void testPostingList(bool enable_only_bitvector, uint32_t numDocs, uint32_t numUniqueValues); template <typename AttributeType, typename ValueType> void checkPostingList(AttributeType & vec, ValueType value, DocSet expected); @@ -554,7 +554,7 @@ PostingListAttributeTest::testPostingList(const AttributePtr& ptr1, uint32_t num { LOG(info, "testPostingList: vector '%s'", ptr1->getName().c_str()); - auto& vec1 = static_cast<VectorType &>(*ptr1.get()); + auto& vec1 = dynamic_cast<VectorType &>(*ptr1); addDocs(ptr1, numDocs); uint32_t part = numDocs / values.size(); @@ -595,20 +595,19 @@ PostingListAttributeTest::testPostingList(const AttributePtr& ptr1, uint32_t num void PostingListAttributeTest::testPostingList() { - testPostingList(false, false); - testPostingList(true, false); - testPostingList(true, true); + testPostingList(false); + testPostingList(true); } void -PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only_bitvector) +PostingListAttributeTest::testPostingList(bool enable_only_bitvector) { - testPostingList(enableBitVector, enable_only_bitvector, 1000, 50); - testPostingList(enableBitVector, enable_only_bitvector, 2000, 10); // This should force bitvector + testPostingList(enable_only_bitvector, 1000, 50); + testPostingList(enable_only_bitvector, 2000, 10); // This should force bitvector } void -PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only_bitvector, uint32_t numDocs, uint32_t numUniqueValues) +PostingListAttributeTest::testPostingList(bool enable_only_bitvector, uint32_t numDocs, uint32_t numUniqueValues) { { // IntegerAttribute @@ -619,7 +618,6 @@ PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only { Config cfg(Config(BasicType::INT32, CollectionType::SINGLE)); cfg.setFastSearch(true); - cfg.setEnableBitVectors(enableBitVector); cfg.setEnableOnlyBitVector(enable_only_bitvector); AttributePtr ptr1 = create_attribute("sint32", cfg); testPostingList<Int32PostingListAttribute>(ptr1, numDocs, values); @@ -627,7 +625,6 @@ PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only { Config cfg(Config(BasicType::INT32, CollectionType::ARRAY)); cfg.setFastSearch(true); - cfg.setEnableBitVectors(enableBitVector); cfg.setEnableOnlyBitVector(enable_only_bitvector); AttributePtr ptr1 = create_attribute("aint32", cfg); testPostingList<Int32ArrayPostingListAttribute>(ptr1, numDocs, values); @@ -635,7 +632,6 @@ PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only { Config cfg(Config(BasicType::INT32, CollectionType::WSET)); cfg.setFastSearch(true); - cfg.setEnableBitVectors(enableBitVector); cfg.setEnableOnlyBitVector(enable_only_bitvector); AttributePtr ptr1 = create_attribute("wsint32", cfg); testPostingList<Int32WsetPostingListAttribute>(ptr1, numDocs, values); @@ -650,7 +646,6 @@ PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only { Config cfg(Config(BasicType::FLOAT, CollectionType::SINGLE)); cfg.setFastSearch(true); - cfg.setEnableBitVectors(enableBitVector); cfg.setEnableOnlyBitVector(enable_only_bitvector); AttributePtr ptr1 = create_attribute("sfloat", cfg); testPostingList<FloatPostingListAttribute>(ptr1, numDocs, values); @@ -658,7 +653,6 @@ PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only { Config cfg(Config(BasicType::FLOAT, CollectionType::ARRAY)); cfg.setFastSearch(true); - cfg.setEnableBitVectors(enableBitVector); cfg.setEnableOnlyBitVector(enable_only_bitvector); AttributePtr ptr1 = create_attribute("afloat", cfg); testPostingList<FloatArrayPostingListAttribute>(ptr1, numDocs, values); @@ -666,7 +660,6 @@ PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only { Config cfg(Config(BasicType::FLOAT, CollectionType::WSET)); cfg.setFastSearch(true); - cfg.setEnableBitVectors(enableBitVector); cfg.setEnableOnlyBitVector(enable_only_bitvector); AttributePtr ptr1 = create_attribute("wsfloat", cfg); testPostingList<FloatWsetPostingListAttribute>(ptr1, numDocs, values); @@ -687,7 +680,6 @@ PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only { Config cfg(Config(BasicType::STRING, CollectionType::SINGLE)); cfg.setFastSearch(true); - cfg.setEnableBitVectors(enableBitVector); cfg.setEnableOnlyBitVector(enable_only_bitvector); AttributePtr ptr1 = create_attribute("sstr", cfg); testPostingList<StringPostingListAttribute>(ptr1, numDocs, charValues); @@ -695,7 +687,6 @@ PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only { Config cfg(Config(BasicType::STRING, CollectionType::ARRAY)); cfg.setFastSearch(true); - cfg.setEnableBitVectors(enableBitVector); cfg.setEnableOnlyBitVector(enable_only_bitvector); AttributePtr ptr1 = create_attribute("astr", cfg); testPostingList<StringArrayPostingListAttribute>(ptr1, numDocs, charValues); @@ -703,7 +694,6 @@ PostingListAttributeTest::testPostingList(bool enableBitVector, bool enable_only { Config cfg(Config(BasicType::STRING, CollectionType::WSET)); cfg.setFastSearch(true); - cfg.setEnableBitVectors(enableBitVector); cfg.setEnableOnlyBitVector(enable_only_bitvector); AttributePtr ptr1 = create_attribute("wsstr", cfg); testPostingList<StringWsetPostingListAttribute>(ptr1, numDocs, charValues); diff --git a/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp b/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp index 2183138811b..986848c39b7 100644 --- a/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp +++ b/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp @@ -31,7 +31,6 @@ TEST_F("test default attribute config", Fixture) EXPECT_EQUAL(CollectionType::Type::SINGLE, f._config.collectionType().type()); EXPECT_TRUE(!f._config.fastSearch()); - EXPECT_TRUE(!f._config.getEnableBitVectors()); EXPECT_TRUE(!f._config.getEnableOnlyBitVector()); EXPECT_TRUE(!f._config.getIsFilter()); EXPECT_TRUE(!f._config.fastAccess()); @@ -39,14 +38,11 @@ TEST_F("test default attribute config", Fixture) } TEST_F("test integer weightedset attribute config", - Fixture(BasicType::Type::INT32, - CollectionType::Type::WSET)) + Fixture(BasicType::Type::INT32, CollectionType::Type::WSET)) { EXPECT_EQUAL(BasicType::Type::INT32, f._config.basicType().type()); - EXPECT_EQUAL(CollectionType::Type::WSET, - f._config.collectionType().type()); + EXPECT_EQUAL(CollectionType::Type::WSET, f._config.collectionType().type()); EXPECT_TRUE(!f._config.fastSearch()); - EXPECT_TRUE(!f._config.getEnableBitVectors()); EXPECT_TRUE(!f._config.getEnableOnlyBitVector()); EXPECT_TRUE(!f._config.getIsFilter()); EXPECT_TRUE(!f._config.fastAccess()); diff --git a/searchlib/src/vespa/searchcommon/attribute/config.cpp b/searchlib/src/vespa/searchcommon/attribute/config.cpp index 69dab6ad88e..70c2377289f 100644 --- a/searchlib/src/vespa/searchcommon/attribute/config.cpp +++ b/searchlib/src/vespa/searchcommon/attribute/config.cpp @@ -19,7 +19,6 @@ Config::Config(BasicType bt, CollectionType ct, bool fastSearch_) noexcept : _basicType(bt), _type(ct), _fastSearch(fastSearch_), - _enableBitVectors(false), _enableOnlyBitVector(false), _isFilter(false), _fastAccess(false), @@ -49,7 +48,6 @@ Config::operator==(const Config &b) const return _basicType == b._basicType && _type == b._type && _fastSearch == b._fastSearch && - _enableBitVectors == b._enableBitVectors && _enableOnlyBitVector == b._enableOnlyBitVector && _isFilter == b._isFilter && _fastAccess == b._fastAccess && diff --git a/searchlib/src/vespa/searchcommon/attribute/config.h b/searchlib/src/vespa/searchcommon/attribute/config.h index edd5dbcc7a1..0102f362532 100644 --- a/searchlib/src/vespa/searchcommon/attribute/config.h +++ b/searchlib/src/vespa/searchcommon/attribute/config.h @@ -44,12 +44,6 @@ public: const std::optional<HnswIndexParams>& hnsw_index_params() const { return _hnsw_index_params; } /** - * Check if attribute posting list can consist of a bitvector in - * addition to (or instead of) a btree. - */ - bool getEnableBitVectors() const { return _enableBitVectors; } - - /** * Check if attribute posting list can consist of only a bitvector with * no corresponding btree. */ @@ -89,15 +83,6 @@ public: } /** - * Enable attribute posting list to consist of a bitvector in - * addition to (or instead of) a btree. - */ - Config & setEnableBitVectors(bool enableBitVectors) { - _enableBitVectors = enableBitVectors; - return *this; - } - - /** * Enable attribute posting list to consist of only a bitvector with * no corresponding btree. Some information degradation might occur when * document frequency goes down, since recreated btree representation @@ -132,7 +117,6 @@ private: BasicType _basicType; CollectionType _type; bool _fastSearch; - bool _enableBitVectors; bool _enableOnlyBitVector; bool _isFilter; bool _fastAccess; diff --git a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp index ed7d5abb8f8..894ede513a2 100644 --- a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp +++ b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp @@ -46,8 +46,8 @@ getCollectionTypeMap() return map; } -static DataTypeMap _dataTypeMap = getDataTypeMap(); -static CollectionTypeMap _collectionTypeMap = getCollectionTypeMap(); +DataTypeMap _dataTypeMap = getDataTypeMap(); +CollectionTypeMap _collectionTypeMap = getCollectionTypeMap(); DictionaryConfig::Type convert(AttributesConfig::Attribute::Dictionary::Type type_cfg) { @@ -77,7 +77,7 @@ convert(AttributesConfig::Attribute::Dictionary::Match match_cfg) { DictionaryConfig convert_dictionary(const AttributesConfig::Attribute::Dictionary & dictionary) { - return DictionaryConfig(convert(dictionary.type), convert(dictionary.match)); + return {convert(dictionary.type), convert(dictionary.match)}; } Config::Match @@ -103,7 +103,6 @@ ConfigConverter::convert(const AttributesConfig::Attribute & cfg) Config retval(bType, cType); PredicateParams predicateParams; retval.setFastSearch(cfg.fastsearch); - retval.setEnableBitVectors(cfg.enablebitvectors); retval.setEnableOnlyBitVector(cfg.enableonlybitvector); retval.setIsFilter(cfg.enableonlybitvector); retval.setFastAccess(cfg.fastaccess); diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp index 79276ce6f55..6ef3b575c3e 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp @@ -128,9 +128,6 @@ PostingListAttributeBase<P>::forwardedOnAddDoc(DocId doc, size_t wantSize, size_t wantCapacity) { - if (!_postingList._enableBitVectors) { - return false; - } if (doc >= wantSize) { wantSize = doc + 1; } diff --git a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp index 1b296f7d03e..79ec976ac50 100644 --- a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp @@ -17,17 +17,8 @@ namespace search::attribute { using vespalib::btree::BTreeNoLeafData; using vespalib::datastore::EntryRefFilter; -// #define FORCE_BITVECTORS - - PostingStoreBase2::PostingStoreBase2(IEnumStoreDictionary& dictionary, Status &status, const Config &config) - : -#ifdef FORCE_BITVECTORS - _enableBitVectors(true), -#else - _enableBitVectors(config.getEnableBitVectors()), -#endif - _enableOnlyBitVector(config.getEnableOnlyBitVector()), + : _enableOnlyBitVector(config.getEnableOnlyBitVector()), _isFilter(config.getIsFilter()), _bvSize(64u), _bvCapacity(128u), @@ -101,7 +92,7 @@ PostingStore<DataT>::removeSparseBitVectors() (void) typeId; assert(isBitVector(typeId)); BitVectorEntry *bve = getWBitVectorEntry(iRef); - GrowableBitVector &bv = *bve->_bv.get(); + GrowableBitVector &bv = *bve->_bv; uint32_t docFreq = bv.writer().countTrueBits(); if (bve->_tree.valid()) { RefType iRef2(bve->_tree); @@ -175,9 +166,7 @@ PostingStore<DataT>::consider_remove_sparse_bitvector(std::vector<EntryRef>& ref template <typename DataT> void -PostingStore<DataT>::applyNew(EntryRef &ref, - AddIter a, - AddIter ae) +PostingStore<DataT>::applyNew(EntryRef &ref, AddIter a, AddIter ae) { // No old data assert(!ref.valid()); @@ -185,7 +174,7 @@ PostingStore<DataT>::applyNew(EntryRef &ref, uint32_t clusterSize = additionSize; if (clusterSize <= clusterLimit) { applyNewArray(ref, a, ae); - } else if (_enableBitVectors && clusterSize >= _maxBvDocFreq) { + } else if (clusterSize >= _maxBvDocFreq) { applyNewBitVector(ref, a, ae); } else { applyNewTree(ref, a, ae, CompareT()); @@ -292,12 +281,9 @@ PostingStore<DataT>::makeBitVector(EntryRef &ref) template <typename DataT> void -PostingStore<DataT>::applyNewBitVector(EntryRef &ref, - AddIter aOrg, - AddIter ae) +PostingStore<DataT>::applyNewBitVector(EntryRef &ref, AddIter aOrg, AddIter ae) { assert(!ref.valid()); - RefType iRef(ref); vespalib::GenerationHolder &genHolder = _store.getGenerationHolder(); auto bvsp = std::make_shared<GrowableBitVector>(_bvSize, _bvCapacity, genHolder); BitVector &bv = bvsp->writer(); @@ -410,12 +396,10 @@ PostingStore<DataT>::apply(EntryRef &ref, } else { BTreeType *tree = getWTreeEntry(iRef); applyTree(tree, a, ae, r, re, CompareT()); - if (_enableBitVectors) { - uint32_t docFreq = tree->size(_allocator); - if (docFreq >= _maxBvDocFreq) { - makeBitVector(ref); - return; - } + uint32_t docFreq = tree->size(_allocator); + if (docFreq >= _maxBvDocFreq) { + makeBitVector(ref); + return; } normalizeTree(ref, tree, wasArray); } diff --git a/searchlib/src/vespa/searchlib/attribute/postingstore.h b/searchlib/src/vespa/searchlib/attribute/postingstore.h index 6512c59fa79..aabe5840618 100644 --- a/searchlib/src/vespa/searchlib/attribute/postingstore.h +++ b/searchlib/src/vespa/searchlib/attribute/postingstore.h @@ -37,7 +37,6 @@ public: class PostingStoreBase2 { public: - bool _enableBitVectors; bool _enableOnlyBitVector; bool _isFilter; protected: diff --git a/searchlib/src/vespa/searchlib/attribute/sourceselector.cpp b/searchlib/src/vespa/searchlib/attribute/sourceselector.cpp index 0a39e5defc9..26a98f488ac 100644 --- a/searchlib/src/vespa/searchlib/attribute/sourceselector.cpp +++ b/searchlib/src/vespa/searchlib/attribute/sourceselector.cpp @@ -100,7 +100,7 @@ SourceSelector::LoadInfo::load() SourceSelector::SourceSelector(Source defaultSource, AttributeVector::SP realSource) : ISourceSelector(defaultSource), - _realSource(realSource) + _realSource(std::move(realSource)) { } SourceSelector::SaveInfo::UP diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp index 0af1ffa7b33..a0ee40e6674 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp @@ -196,7 +196,7 @@ Domain::getSynced() const if (_parts.empty()) { return s; } - DomainPartList::const_iterator it(_parts.end()); + auto it(_parts.end()); --it; s = it->second->getSynced(); if (s == 0 && it != _parts.begin()) { @@ -224,9 +224,9 @@ DomainPart::SP Domain::findPart(SerialNum s) { std::lock_guard guard(_partsMutex); - DomainPartList::iterator it(_parts.upper_bound(s)); + auto it(_parts.upper_bound(s)); if (!_parts.empty() && it != _parts.begin()) { - DomainPartList::iterator prev(it); + auto prev(it); --prev; if (prev->second->range().to() > s) { return prev->second; @@ -235,7 +235,7 @@ Domain::findPart(SerialNum s) if (it != _parts.end()) { return it->second; } - return DomainPart::SP(); + return {}; } DomainPart::SP @@ -282,7 +282,7 @@ Domain::cleanSessions() return; } std::lock_guard guard(_sessionMutex); - for (SessionList::iterator it(_sessions.begin()), mt(_sessions.end()); it != mt; ) { + for (auto it(_sessions.begin()), mt(_sessions.end()); it != mt; ) { Session * session(it->second.get()); if (session->inSync()) { _sessions.erase(it++); @@ -334,7 +334,7 @@ Domain::startCommit(DoneCallback onDone) { commitChunk(std::move(completed), guard); return result; } - return CommitResult(); + return {}; } void @@ -397,7 +397,7 @@ Domain::erase(SerialNum to) bool retval(true); /// Do not erase the last element UniqueLock guard(_partsMutex); - for (DomainPartList::iterator it(_parts.begin()); (_parts.size() > 1) && (it->second.get()->range().to() < to); it = _parts.begin()) { + for (auto it(_parts.begin()); (_parts.size() > 1) && (it->second->range().to() < to); it = _parts.begin()) { DomainPart::SP dp(it->second); _parts.erase(it); guard.unlock(); @@ -429,7 +429,7 @@ Domain::startSession(int sessionId) { int retval(-1); std::lock_guard guard(_sessionMutex); - SessionList::iterator found = _sessions.find(sessionId); + auto found = _sessions.find(sessionId); if (found != _sessions.end()) { found->second->setStartTime(vespalib::steady_clock::now()); if ( _executor.execute(Session::createTask(found->second)).get() == nullptr ) { @@ -448,7 +448,7 @@ Domain::closeSession(int sessionId) DurationSeconds sessionRunTime(0); { std::lock_guard guard(_sessionMutex); - SessionList::iterator found = _sessions.find(sessionId); + auto found = _sessions.find(sessionId); if (found != _sessions.end()) { sessionRunTime = (vespalib::steady_clock::now() - found->second->getStartTime()); retval = 1; @@ -457,7 +457,7 @@ Domain::closeSession(int sessionId) while (retval == 1) { std::this_thread::sleep_for(10ms); std::lock_guard guard(_sessionMutex); - SessionList::iterator found = _sessions.find(sessionId); + auto found = _sessions.find(sessionId); if (found != _sessions.end()) { if ( ! found->second->isVisitRunning()) { _sessions.erase(sessionId); diff --git a/searchlib/src/vespa/searchlib/transactionlog/session.cpp b/searchlib/src/vespa/searchlib/transactionlog/session.cpp index b913110f974..b11f4027ae7 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/session.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/session.cpp @@ -12,13 +12,13 @@ LOG_SETUP(".transactionlog.session"); namespace search::transactionlog { vespalib::Executor::Task::UP -Session::createTask(const Session::SP & session) +Session::createTask(Session::SP session) { - return std::make_unique<VisitTask>(session); + return std::make_unique<VisitTask>(std::move(session)); } -Session::VisitTask::VisitTask(const Session::SP & session) - : _session(session) +Session::VisitTask::VisitTask(Session::SP session) + : _session(std::move(session)) { _session->startVisit(); } diff --git a/searchlib/src/vespa/searchlib/transactionlog/session.h b/searchlib/src/vespa/searchlib/transactionlog/session.h index 3e55387b81c..9565a1d617f 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/session.h +++ b/searchlib/src/vespa/searchlib/transactionlog/session.h @@ -29,14 +29,14 @@ public: int id() const { return _id; } bool inSync() const { return _inSync; } bool finished() const; - static Task::UP createTask(const Session::SP & session); + static Task::UP createTask(Session::SP session); void setStartTime(steady_time startTime) { _startTime = startTime; } steady_time getStartTime() const { return _startTime; } bool isVisitRunning() const { return _visitRunning; } private: class VisitTask : public Task { public: - VisitTask(const Session::SP & session); + VisitTask(Session::SP session); ~VisitTask(); private: void run() override; |