diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-05-12 21:26:17 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-05-12 21:26:17 +0200 |
commit | fa7c1ee9d68b01d4501f08b9ea937f066fb3e45e (patch) | |
tree | 23637dc005deb2410a773f9561d23b59d8b5461e /config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java | |
parent | c6c407d234fe5b5e926f35bceb8e26d4298d3c4f (diff) |
Revert "Revert "Create distributable constants on deriving""
This reverts commit 78e8952ad0ed18c026aaeb7c471dfc886ccde7cb.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java index e4f312e98e3..2bc10554b25 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java @@ -2,8 +2,9 @@ package com.yahoo.searchdefinition.parser; import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.RankingConstant; +import com.yahoo.searchdefinition.RankProfile; import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.searchlib.rankingexpression.Reference; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -16,7 +17,7 @@ import java.util.Optional; * one schema (.sd) file, using simple data structures * as far as possible. * - * Do not put advanced logic here! + * Do not put complicated logic here! * * @author arnej27959 */ @@ -39,7 +40,7 @@ public class ParsedSchema extends ParsedBlock { private Stemming defaultStemming = null; private final List<ImportedField> importedFields = new ArrayList<>(); private final List<OnnxModel> onnxModels = new ArrayList<>(); - private final List<RankingConstant> rankingConstants = new ArrayList<>(); + private final Map<Reference, RankProfile.Constant> constants = new LinkedHashMap<>(); private final List<String> inherited = new ArrayList<>(); private final List<String> inheritedByDocument = new ArrayList<>(); private final Map<String, ParsedSchema> resolvedInherits = new LinkedHashMap<>(); @@ -70,12 +71,12 @@ public class ParsedSchema extends ParsedBlock { List<ParsedFieldSet> getFieldSets() { return List.copyOf(fieldSets.values()); } List<ParsedIndex> getIndexes() { return List.copyOf(extraIndexes.values()); } List<ParsedStruct> getStructs() { return List.copyOf(extraStructs.values()); } - List<RankingConstant> getRankingConstants() { return List.copyOf(rankingConstants); } List<String> getInherited() { return List.copyOf(inherited); } List<String> getInheritedByDocument() { return List.copyOf(inheritedByDocument); } List<ParsedRankProfile> getRankProfiles() { return List.copyOf(rankProfiles.values()); } List<ParsedSchema> getResolvedInherits() { return List.copyOf(resolvedInherits.values()); } List<ParsedSchema> getAllResolvedInherits() { return List.copyOf(allResolvedInherits.values()); } + List<RankProfile.Constant> getConstants() { return List.copyOf(constants.values()); } void addAnnotation(ParsedAnnotation annotation) { String annName = annotation.name(); @@ -132,8 +133,8 @@ public class ParsedSchema extends ParsedBlock { rankProfiles.put(rpName, profile); } - void addRankingConstant(RankingConstant constant) { - rankingConstants.add(constant); + void add(RankProfile.Constant constant) { + constants.put(constant.name(), constant); } void addStruct(ParsedStruct struct) { |