diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-21 17:24:21 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-21 17:48:22 +0200 |
commit | e67760622daa2a26290a4d6f05f5ec73a9a827da (patch) | |
tree | e6d7ae4c9a51b6ded293cca19832630fdc41b60d /config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java | |
parent | 26607eb5cc541e36e9f77159fa68e29a21a2840b (diff) |
Control attribute maxuncommittedmemory with feature flag
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java index 54e9a4ccb61..6165cdd2dc1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java @@ -16,6 +16,7 @@ import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.searchdefinition.RankProfileRegistry; import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.derived.validation.Validation; +import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.io.IOException; @@ -28,7 +29,7 @@ import java.util.concurrent.ExecutorService; * * @author bratseth */ -public class DerivedConfiguration { +public class DerivedConfiguration implements AttributesConfig.Producer { private final Schema schema; private Summaries summaries; @@ -43,6 +44,7 @@ public class DerivedConfiguration { private IndexSchema indexSchema; private ImportedFields importedFields; private final QueryProfileRegistry queryProfiles; + private final long maxUncommittedMemory; /** * Creates a complete derived configuration from a search definition. @@ -82,6 +84,7 @@ public class DerivedConfiguration { Validator.ensureNotNull("Search definition", schema); this.schema = schema; this.queryProfiles = queryProfiles; + this.maxUncommittedMemory = deployProperties.featureFlags().maxUnCommittedMemory(); if ( ! schema.isDocumentsOnly()) { streamingFields = new VsmFields(schema); streamingSummary = new VsmSummary(schema); @@ -159,6 +162,15 @@ public class DerivedConfiguration { return attributeFields; } + @Override + public void getConfig(AttributesConfig.Builder builder) { + getConfig(builder, AttributeFields.FieldSet.ALL); + } + + public void getConfig(AttributesConfig.Builder builder, AttributeFields.FieldSet fs) { + attributeFields.getConfig(builder, fs, maxUncommittedMemory); + } + public IndexingScript getIndexingScript() { return indexingScript; } |