GC unused enable-bitvector flag

2 files changed, 4 insertions, 6 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 505778ad047..567bd564eb5 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
@@ -183,7 +183,7 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce
     @Override
     public void getConfig(AttributesConfig.Builder builder) {
         //TODO This is just to get some exporting tests to work, Should be undone and removed
-        getConfig(builder, FieldSet.ALL, 77777, false);
+        getConfig(builder, FieldSet.ALL, 77777);
     }
 
     private boolean isAttributeInFieldSet(Attribute attribute, FieldSet fs) {
@@ -277,12 +277,12 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce
         };
     }
 
-    public void getConfig(AttributesConfig.Builder builder, FieldSet fs, long maxUnCommittedMemory, boolean enableBitVectors) {
+    public void getConfig(AttributesConfig.Builder builder, FieldSet fs, long maxUnCommittedMemory) {
         for (Attribute attribute : attributes.values()) {
             if (isAttributeInFieldSet(attribute, fs)) {
                 AttributesConfig.Attribute.Builder attrBuilder = getConfig(attribute.getName(), attribute, false);
                 attrBuilder.maxuncommittedmemory(maxUnCommittedMemory);
-                if (enableBitVectors && attribute.isFastSearch()) {
+                if (attribute.isFastSearch()) {
                     attrBuilder.enablebitvectors(true);
                 }
                 builder.attribute(attrBuilder);
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
index c6a5873a848..11bd14cbe46 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
@@ -40,7 +40,6 @@ public class DerivedConfiguration implements AttributesConfig.Producer {
     private ImportedFields importedFields;
     private final QueryProfileRegistry queryProfiles;
     private final long maxUncommittedMemory;
-    private final boolean enableBitVectors;
 
     /**
      * Creates a complete derived configuration from a search definition.
@@ -71,7 +70,6 @@ public class DerivedConfiguration implements AttributesConfig.Producer {
         this.schema = schema;
         this.queryProfiles = deployState.getQueryProfiles().getRegistry();
         this.maxUncommittedMemory = deployState.getProperties().featureFlags().maxUnCommittedMemory();
-        this.enableBitVectors = deployState.getProperties().featureFlags().enableBitVectors();
         if ( ! schema.isDocumentsOnly()) {
             streamingFields = new VsmFields(schema);
             streamingSummary = new VsmSummary(schema);
@@ -157,7 +155,7 @@ public class DerivedConfiguration implements AttributesConfig.Producer {
     }
 
     public void getConfig(AttributesConfig.Builder builder, AttributeFields.FieldSet fs) {
-        attributeFields.getConfig(builder, fs, maxUncommittedMemory, enableBitVectors);
+        attributeFields.getConfig(builder, fs, maxUncommittedMemory);
     }
 
     public IndexingScript getIndexingScript() {