GC unused enable-bitvector flag

3 files changed, 4 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index b7b54e749f9..f8dafd1082e 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -77,7 +77,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private boolean persistenceThrottlingOfMergeFeedOps = true;
     private boolean useV8GeoPositions = true;
     private List<String> environmentVariables = List.of();
-    private boolean enableBitVectors = false;
     private boolean loadCodeAsHugePages = false;
     private boolean sharedStringRepoNoReclaim = false;
     private boolean useTwoPhaseDocumentGc = false;
@@ -141,7 +140,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public boolean persistenceThrottlingOfMergeFeedOps() { return persistenceThrottlingOfMergeFeedOps; }
     @Override public boolean useV8GeoPositions() { return useV8GeoPositions; }
     @Override public List<String> environmentVariables() { return environmentVariables; }
-    @Override public boolean enableBitVectors() { return this.enableBitVectors; }
     @Override public Architecture adminClusterArchitecture() { return adminClusterNodeResourcesArchitecture; }
     @Override public boolean sharedStringRepoNoReclaim() { return sharedStringRepoNoReclaim; }
     @Override public boolean loadCodeAsHugePages() { return loadCodeAsHugePages; }
@@ -385,11 +383,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties setEnableBitVectors(boolean value) {
-        this.enableBitVectors = value;
-        return this;
-    }
-
     public TestProperties setMbusNetworkThreads(int value) {
         this.mbus_network_threads = value;
         return this;
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() {