From bde1959a8972e6c7410d6155dd1468deb54df5be Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Mon, 12 Jul 2021 12:49:22 +0000 Subject: Add validation of attribute fields using bool type, ensuring the collection type is supported. Currently, only the single value bool type is supported by the search backend. --- .../processing/BoolAttributeValidator.java | 36 ++++++++++++++++++++++ .../searchdefinition/processing/Processing.java | 1 + 2 files changed, 37 insertions(+) create mode 100644 config-model/src/main/java/com/yahoo/searchdefinition/processing/BoolAttributeValidator.java (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/processing') diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/BoolAttributeValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/BoolAttributeValidator.java new file mode 100644 index 00000000000..7ee22c3fd23 --- /dev/null +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/BoolAttributeValidator.java @@ -0,0 +1,36 @@ +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.searchdefinition.processing; + +import com.yahoo.config.application.api.DeployLogger; +import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.vespa.model.container.search.QueryProfiles; + +/** + * Validates attribute fields using bool type, ensuring the collection type is supported. + * + * Currently, only the single value bool type is supported. + * + * @author geirst + */ +public class BoolAttributeValidator extends Processor { + + public BoolAttributeValidator(Search search, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) { + super(search, deployLogger, rankProfileRegistry, queryProfiles); + } + + @Override + public void process(boolean validate, boolean documentsOnly) { + for (var field : search.allConcreteFields()) { + var attribute = field.getAttribute(); + if (attribute == null) { + continue; + } + if (attribute.getType().equals(Attribute.Type.BOOL) && + !attribute.getCollectionType().equals(Attribute.CollectionType.SINGLE)) { + fail(search, field, "Only single value bool attribute fields are supported"); + } + } + } +} diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java index 136d352ece7..750842d398c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java @@ -78,6 +78,7 @@ public class Processing { OnnxModelConfigGenerator::new, OnnxModelTypeResolver::new, RankingExpressionTypeResolver::new, + BoolAttributeValidator::new, // These should be last: IndexingValidation::new, IndexingValues::new); -- cgit v1.2.3