diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-11-17 13:07:02 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-11-22 09:42:27 +0000 |
commit | 521ba5ce88e08bc75be9b603e1efdaf46aa386f1 (patch) | |
tree | f0d0affd6115f6dc287af6b53c7fd24363a8a33c /config-model | |
parent | d832a6233a5de1b2338981a97f029b94791e62c0 (diff) |
wire feature flag to summary config
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java | 6 |
2 files changed, 6 insertions, 2 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 6165cdd2dc1..b49fde9e5d7 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 @@ -91,7 +91,7 @@ public class DerivedConfiguration implements AttributesConfig.Producer { } if ( ! schema.isDocumentsOnly()) { attributeFields = new AttributeFields(schema); - summaries = new Summaries(schema, deployLogger); + summaries = new Summaries(schema, deployLogger, deployProperties.featureFlags()); summaryMap = new SummaryMap(schema); juniperrc = new Juniperrc(schema); rankProfileList = new RankProfileList(schema, schema.rankingConstants(), schema.rankExpressionFiles(), diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java index 5fdc51e8f5f..1455fbc92e1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java @@ -2,6 +2,7 @@ package com.yahoo.searchdefinition.derived; import com.yahoo.config.application.api.DeployLogger; +import com.yahoo.config.model.api.ModelContext; import com.yahoo.searchdefinition.Schema; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.config.search.SummaryConfig; @@ -14,9 +15,11 @@ import java.util.List; */ public class Summaries extends Derived implements SummaryConfig.Producer { + private final boolean useV8GeoPositions; private List<SummaryClass> summaries=new java.util.ArrayList<>(1); - public Summaries(Schema schema, DeployLogger deployLogger) { + public Summaries(Schema schema, DeployLogger deployLogger, ModelContext.FeatureFlags featureFlags) { + this.useV8GeoPositions = featureFlags.useV8GeoPositions(); // Make sure the default is first summaries.add(new SummaryClass(schema, schema.getSummary("default"), deployLogger)); for (DocumentSummary summary : schema.getSummaries().values()) { @@ -31,6 +34,7 @@ public class Summaries extends Derived implements SummaryConfig.Producer { @Override public void getConfig(SummaryConfig.Builder builder) { builder.defaultsummaryid(summaries.isEmpty() ? -1 : summaries.get(0).hashCode()); + builder.usev8geopositions(useV8GeoPositions); for (SummaryClass summaryClass : summaries) { builder.classes(summaryClass.getSummaryClassConfig()); } |