diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-09-29 11:19:52 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-09-29 11:19:52 +0200 |
commit | cf14979ed2766f05bd2f131b93d33996aa6662e3 (patch) | |
tree | 82d4e2f68d57c204da85e23f8a704a8d9e2ac2e8 /config-model/src/main/java | |
parent | bebaada169361ab757dbc89126f5ac8d55f7f8bb (diff) |
Use consistent terminology
Diffstat (limited to 'config-model/src/main/java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/ImmutableSchema.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/LargeRankingExpressions.java (renamed from config-model/src/main/java/com/yahoo/schema/LargeRankExpressions.java) | 23 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/RankingExpressionBody.java (renamed from config-model/src/main/java/com/yahoo/schema/RankExpressionBody.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/Schema.java | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java | 18 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java | 16 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java | 4 |
9 files changed, 41 insertions, 40 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java b/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java index 894415091e4..f002676f05d 100644 --- a/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java +++ b/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java @@ -34,7 +34,7 @@ import java.util.Set; /** * Application builder. Usage: * 1) Add all schemas, using the addXXX() methods, - * 2) provide the available rank types and rank expressions, using the setRankXXX() methods, + * 2) provide the available rank types and ranking expressions, using the setRankXXX() methods, * 3) invoke the {@link #build} method * * @author bratseth diff --git a/config-model/src/main/java/com/yahoo/schema/ImmutableSchema.java b/config-model/src/main/java/com/yahoo/schema/ImmutableSchema.java index c352d9c417f..82583addb9b 100644 --- a/config-model/src/main/java/com/yahoo/schema/ImmutableSchema.java +++ b/config-model/src/main/java/com/yahoo/schema/ImmutableSchema.java @@ -36,7 +36,7 @@ public interface ImmutableSchema { DeployLogger getDeployLogger(); ModelContext.Properties getDeployProperties(); Map<Reference, RankProfile.Constant> constants(); - LargeRankExpressions rankExpressionFiles(); + LargeRankingExpressions rankExpressionFiles(); Map<String, OnnxModel> onnxModels(); Stream<ImmutableSDField> allImportedFields(); SDDocumentType getDocument(); diff --git a/config-model/src/main/java/com/yahoo/schema/LargeRankExpressions.java b/config-model/src/main/java/com/yahoo/schema/LargeRankingExpressions.java index cfdd4729b97..2ae9041b1a2 100644 --- a/config-model/src/main/java/com/yahoo/schema/LargeRankExpressions.java +++ b/config-model/src/main/java/com/yahoo/schema/LargeRankingExpressions.java @@ -8,43 +8,44 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -public class LargeRankExpressions { - private final Map<String, RankExpressionBody> expressions = new ConcurrentHashMap<>(); +public class LargeRankingExpressions { + + private final Map<String, RankingExpressionBody> expressions = new ConcurrentHashMap<>(); private final FileRegistry fileRegistry; private final int limit; - public LargeRankExpressions(FileRegistry fileRegistry) { + public LargeRankingExpressions(FileRegistry fileRegistry) { this(fileRegistry, 8192); } - public LargeRankExpressions(FileRegistry fileRegistry, int limit) { + public LargeRankingExpressions(FileRegistry fileRegistry, int limit) { this.fileRegistry = fileRegistry; this.limit = limit; } - public void add(RankExpressionBody expression) { + public void add(RankingExpressionBody expression) { String name = expression.getName(); - RankExpressionBody prev = expressions.putIfAbsent(name, expression); + RankingExpressionBody prev = expressions.putIfAbsent(name, expression); if (prev == null) { expression.validate(); expression.register(fileRegistry); } else { if ( ! prev.getBlob().equals(expression.getBlob())) { - throw new IllegalArgumentException("Rank expression '" + name + - "' defined twice. Previous blob with " + prev.getBlob().remaining() + - " bytes, while current has " + expression.getBlob().remaining() + " bytes"); + throw new IllegalArgumentException("Ranking expression '" + name + + "' defined twice. Previous blob with " + prev.getBlob().remaining() + + " bytes, while current has " + expression.getBlob().remaining() + " bytes"); } } } public int limit() { return limit; } /** Returns a read-only list of ranking constants ordered by name */ - public Collection<RankExpressionBody> expressions() { + public Collection<RankingExpressionBody> expressions() { return expressions.values().stream().sorted().collect(Collectors.toUnmodifiableList()); } // Note: Use by integration tests in internal repo /** Returns a read-only map of the ranking constants in this indexed by name */ - public Map<String, RankExpressionBody> asMap() { + public Map<String, RankingExpressionBody> asMap() { return Collections.unmodifiableMap(expressions); } diff --git a/config-model/src/main/java/com/yahoo/schema/RankExpressionBody.java b/config-model/src/main/java/com/yahoo/schema/RankingExpressionBody.java index d383a25aecb..89fad690ca2 100644 --- a/config-model/src/main/java/com/yahoo/schema/RankExpressionBody.java +++ b/config-model/src/main/java/com/yahoo/schema/RankingExpressionBody.java @@ -7,11 +7,11 @@ import java.nio.ByteBuffer; import static java.util.Objects.requireNonNull; -public class RankExpressionBody extends DistributableResource { +public class RankingExpressionBody extends DistributableResource { private final ByteBuffer blob; - public RankExpressionBody(String name, ByteBuffer blob) { + public RankingExpressionBody(String name, ByteBuffer blob) { super(name, name + ".lz4", PathType.BLOB); this.blob = requireNonNull(blob, "Blob cannot be null"); } diff --git a/config-model/src/main/java/com/yahoo/schema/Schema.java b/config-model/src/main/java/com/yahoo/schema/Schema.java index c1556bcfccc..180c8e6012f 100644 --- a/config-model/src/main/java/com/yahoo/schema/Schema.java +++ b/config-model/src/main/java/com/yahoo/schema/Schema.java @@ -83,8 +83,8 @@ public class Schema implements ImmutableSchema { /** The explicitly defined summaries of this schema. _Must_ preserve order. */ private final Map<String, DocumentSummary> summaries = new LinkedHashMap<>(); - /** External rank expression files of this */ - private final LargeRankExpressions largeRankExpressions; + /** External ranking expression files of this */ + private final LargeRankingExpressions largeRankingExpressions; /** Constants that will be available in all rank profiles. */ // TODO: Remove on Vespa 9: Should always be in a rank profile @@ -150,7 +150,7 @@ public class Schema implements ImmutableSchema { this.deployLogger = deployLogger; this.properties = properties; this.documentsOnly = documentsOnly; - largeRankExpressions = new LargeRankExpressions(fileRegistry); + largeRankingExpressions = new LargeRankingExpressions(fileRegistry); } /** @@ -223,7 +223,7 @@ public class Schema implements ImmutableSchema { } @Override - public LargeRankExpressions rankExpressionFiles() { return largeRankExpressions; } + public LargeRankingExpressions rankExpressionFiles() { return largeRankingExpressions; } public void add(RankProfile.Constant constant) { constants.put(constant.name(), constant); diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java index c549f9af7ce..27e6d6e57a6 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java @@ -5,7 +5,7 @@ import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.schema.LargeRankExpressions; +import com.yahoo.schema.LargeRankingExpressions; import com.yahoo.schema.OnnxModel; import com.yahoo.schema.RankProfileRegistry; import com.yahoo.searchlib.rankingexpression.Reference; @@ -36,14 +36,14 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ private final Map<String, RawRankProfile> rankProfiles; private final FileDistributedConstants constants; - private final LargeRankExpressions largeRankExpressions; + private final LargeRankingExpressions largeRankingExpressions; private final FileDistributedOnnxModels onnxModels; public static final RankProfileList empty = new RankProfileList(); private RankProfileList() { constants = new FileDistributedConstants(null, List.of()); - largeRankExpressions = new LargeRankExpressions(null); + largeRankingExpressions = new LargeRankingExpressions(null); onnxModels = new FileDistributedOnnxModels(null, List.of()); rankProfiles = Map.of(); } @@ -55,11 +55,11 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ * @param attributeFields the attribute fields to create a ranking for */ public RankProfileList(Schema schema, - LargeRankExpressions largeRankExpressions, + LargeRankingExpressions largeRankingExpressions, AttributeFields attributeFields, DeployState deployState) { setName(schema == null ? "default" : schema.getName()); - this.largeRankExpressions = largeRankExpressions; + this.largeRankingExpressions = largeRankingExpressions; this.rankProfiles = deriveRankProfiles(schema, attributeFields, deployState); this.constants = deriveFileDistributedConstants(schema, rankProfiles.values(), deployState); this.onnxModels = deriveFileDistributedOnnxModels(schema, rankProfiles.values(), deployState); @@ -77,7 +77,7 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ Map<String, RawRankProfile> rawRankProfiles = new LinkedHashMap<>(); if (schema != null) { // profiles belonging to a schema have a default profile RawRankProfile rawRank = new RawRankProfile(deployState.rankProfileRegistry().get(schema, "default"), - largeRankExpressions, + largeRankingExpressions, deployState.getQueryProfiles().getRegistry(), deployState.getImportedModels(), attributeFields, @@ -113,8 +113,8 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ ExecutorService executor) { Map<String, Future<RawRankProfile>> futureRawRankProfiles = new LinkedHashMap<>(); for (RankProfile profile : profiles) { - futureRawRankProfiles.put(profile.name(), executor.submit(() -> new RawRankProfile(profile, largeRankExpressions, queryProfiles, importedModels, - attributeFields, deployProperties))); + futureRawRankProfiles.put(profile.name(), executor.submit(() -> new RawRankProfile(profile, largeRankingExpressions, queryProfiles, importedModels, + attributeFields, deployProperties))); } try { Map<String, RawRankProfile> rawRankProfiles = new LinkedHashMap<>(); @@ -196,7 +196,7 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ } public void getConfig(RankingExpressionsConfig.Builder builder) { - largeRankExpressions.expressions().forEach((expr) -> builder.expression.add(new RankingExpressionsConfig.Expression.Builder().name(expr.getName()).fileref(expr.getFileReference()))); + largeRankingExpressions.expressions().forEach((expr) -> builder.expression.add(new RankingExpressionsConfig.Expression.Builder().name(expr.getName()).fileref(expr.getFileReference()))); } public void getConfig(RankingConstantsConfig.Builder builder) { diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java index 11af3b0bf78..59f4035f34f 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java @@ -9,8 +9,8 @@ import com.yahoo.config.model.api.ModelContext; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.schema.FeatureNames; import com.yahoo.schema.OnnxModel; -import com.yahoo.schema.LargeRankExpressions; -import com.yahoo.schema.RankExpressionBody; +import com.yahoo.schema.LargeRankingExpressions; +import com.yahoo.schema.RankingExpressionBody; import com.yahoo.schema.document.RankType; import com.yahoo.schema.RankProfile; import com.yahoo.schema.expressiontransforms.OnnxModelTransformer; @@ -60,7 +60,7 @@ public class RawRankProfile implements RankProfilesConfig.Producer { private final Collection<OnnxModel> onnxModels; /** Creates a raw rank profile from the given rank profile. */ - public RawRankProfile(RankProfile rankProfile, LargeRankExpressions largeExpressions, + public RawRankProfile(RankProfile rankProfile, LargeRankingExpressions largeExpressions, QueryProfileRegistry queryProfiles, ImportedMlModels importedModels, AttributeFields attributeFields, ModelContext.Properties deployProperties) { this.name = rankProfile.name(); @@ -344,7 +344,7 @@ public class RawRankProfile implements RankProfilesConfig.Producer { } /** Derives the properties this produces */ - public List<Pair<String, String>> derive(LargeRankExpressions largeRankExpressions) { + public List<Pair<String, String>> derive(LargeRankingExpressions largeRankingExpressions) { List<Pair<String, String>> properties = new ArrayList<>(); for (RankProfile.RankProperty property : rankProperties) { if (RankingExpression.propertyName(RankProfile.FIRST_PHASE).equals(property.getName())) { @@ -453,20 +453,20 @@ public class RawRankProfile implements RankProfilesConfig.Producer { } } if (properties.size() >= 1000000) throw new IllegalArgumentException("Too many rank properties"); - distributeLargeExpressionsAsFiles(properties, largeRankExpressions); + distributeLargeExpressionsAsFiles(properties, largeRankingExpressions); return properties; } - private void distributeLargeExpressionsAsFiles(List<Pair<String, String>> properties, LargeRankExpressions largeRankExpressions) { + private void distributeLargeExpressionsAsFiles(List<Pair<String, String>> properties, LargeRankingExpressions largeRankingExpressions) { for (ListIterator<Pair<String, String>> iter = properties.listIterator(); iter.hasNext();) { Pair<String, String> property = iter.next(); String expression = property.getSecond(); - if (expression.length() > largeRankExpressions.limit()) { + if (expression.length() > largeRankingExpressions.limit()) { String propertyName = property.getFirst(); String functionName = RankingExpression.extractScriptName(propertyName); if (functionName != null) { String mangledName = rankprofileName + "." + functionName; - largeRankExpressions.add(new RankExpressionBody(mangledName, ByteBuffer.wrap(expression.getBytes(StandardCharsets.UTF_8)))); + largeRankingExpressions.add(new RankingExpressionBody(mangledName, ByteBuffer.wrap(expression.getBytes(StandardCharsets.UTF_8)))); iter.set(new Pair<>(RankingExpression.propertyExpressionName(functionName), mangledName)); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 9bb03d3f07c..c9b462ce30b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -26,7 +26,7 @@ import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.container.QrConfig; import com.yahoo.path.Path; -import com.yahoo.schema.LargeRankExpressions; +import com.yahoo.schema.LargeRankingExpressions; import com.yahoo.schema.OnnxModel; import com.yahoo.schema.RankProfile; import com.yahoo.schema.RankProfileRegistry; @@ -164,7 +164,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Mode createGlobalRankProfiles(deployState); rankProfileList = new RankProfileList(null, // null search -> global - new LargeRankExpressions(deployState.getFileRegistry()), + new LargeRankingExpressions(deployState.getFileRegistry()), AttributeFields.empty, deployState); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java index 5c531d28a8e..276092e61f4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java @@ -64,7 +64,7 @@ public class RankSetupValidator extends Validator { ".") .toFile(); for (SearchCluster cluster : model.getSearchClusters()) { - // Skipping rank expression checking for streaming clusters, not implemented yet + // Skipping rannking expression checking for streaming clusters, not implemented yet if (cluster.isStreaming()) continue; IndexedSearchCluster sc = (IndexedSearchCluster) cluster; @@ -188,7 +188,7 @@ public class RankSetupValidator extends Validator { private void validateWarn(Exception e, DeployLogger deployLogger) { String msg = "Unable to execute '" + binaryName + - "', validation of rank expressions will only take place when you start Vespa: " + + "', validation of ranking expressions will only take place when you start Vespa: " + Exceptions.toMessageString(e); deployLogger.logApplicationPackage(Level.WARNING, msg); } |