diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-05-05 07:47:45 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-05-05 07:47:45 +0200 |
commit | 700a5a68f095e999f85c8ca3fd34645612310019 (patch) | |
tree | 899c8bee096b5f0aa0fd448531917352e5a43a08 /container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java | |
parent | 053bb05104feda086657aca2ac8932318ea4f3f4 (diff) |
Revert "Merge pull request #22439 from vespa-engine/revert-22429-bratseth/schema-info-5-take-2"
This reverts commit 3726fd997c0cbacd37e64ff493f8775fc3fcdd9f, reversing
changes made to d9ea4c99b13fa83a75bd8612d5f6c4d50510e3e9.
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java index 84ed9ae8e3d..c5a74ece866 100644 --- a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java +++ b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java @@ -1,11 +1,17 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.schema; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.yahoo.container.QrSearchersConfig; +import com.yahoo.prelude.fastsearch.DocsumDefinition; +import com.yahoo.prelude.fastsearch.DocsumField; +import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig; import com.yahoo.search.config.SchemaInfoConfig; import com.yahoo.tensor.TensorType; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -24,6 +30,7 @@ class SchemaInfoConfigurer { static Schema toSchema(SchemaInfoConfig.Schema schemaInfoConfig) { Schema.Builder builder = new Schema.Builder(schemaInfoConfig.name()); + for (var profileConfig : schemaInfoConfig.rankprofile()) { RankProfile.Builder profileBuilder = new RankProfile.Builder(profileConfig.name()); profileBuilder.setHasSummaryFeatures(profileConfig.hasSummaryFeatures()); @@ -32,6 +39,17 @@ class SchemaInfoConfigurer { profileBuilder.addInput(inputConfig.name(), TensorType.fromSpec(inputConfig.type())); builder.add(profileBuilder.build()); } + + for (var summaryConfig : schemaInfoConfig.summaryclass()) { + DocumentSummary.Builder summaryBuilder = new DocumentSummary.Builder(summaryConfig.name()); + for (var field : summaryConfig.fields()) { + if (field.dynamic()) + summaryBuilder.setDynamic(true); + summaryBuilder.add(new DocumentSummary.Field(field.name(), field.type())); + } + builder.add(summaryBuilder.build()); + } + return builder.build(); } |