Warn if enable-bit-vectors is used. It is default and has no effect any longer.

author: Henning Baldersheim <balder@yahoo-inc.com> 2022-09-29 13:22:13 +0200
committer: Henning Baldersheim <balder@yahoo-inc.com> 2022-09-29 13:22:13 +0200
commit: 7302ce45688748474129c0f0a50778818c1784eb (patch)
tree: a6aa733b648d2c2c02004c339eb185568881f7f4
parent: 606796ed3b3bce9953e419effa9365103ca4032d (diff)
35 files changed, 35 insertions, 211 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.
author	Henning Baldersheim <balder@yahoo-inc.com>	2022-09-29 13:22:13 +0200
committer	Henning Baldersheim <balder@yahoo-inc.com>	2022-09-29 13:22:13 +0200
commit	7302ce45688748474129c0f0a50778818c1784eb (patch)
tree	a6aa733b648d2c2c02004c339eb185568881f7f4
parent	606796ed3b3bce9953e419effa9365103ca4032d (diff)