diff options
| author | Arne Juul <arnej@yahooinc.com> | 2023-11-01 20:02:04 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahooinc.com> | 2023-11-01 20:52:35 +0000 |
| commit | 464d372e8f95b4a56d54957d32f2c5c5641a4c39 (patch) | |
| tree | 0dbdcbdb5cb95c6f0b6ca8a08030a17630cbfe67 /config-model/src/test/java | |
| parent | 3f1a122dc2cdeecf0a1356a18dfe6a46a7f9c2f3 (diff) | |
validate for array/wset attributes, take 2:
* ensure attribute(arrayfield).count does not trigger validation
* log warning via deploylogger instead of throwing exception
Diffstat (limited to 'config-model/src/test/java')
2 files changed, 50 insertions, 2 deletions
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java index 037c5c31334..e8754b07921 100644 --- a/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java @@ -459,6 +459,54 @@ public class RankingExpressionTypeResolverTestCase { } @Test + void requireThatUsingArrayWarns() throws Exception { + InspectableDeployLogger logger = new InspectableDeployLogger(); + ApplicationBuilder builder = new ApplicationBuilder(logger); + builder.addSchema(joinLines( + "search test {", + " document test { ", + " field foo type array<float> {", + " indexing: attribute", + " }", + " }", + " rank-profile my_rank_profile {", + " first-phase {", + " expression: map(attribute(foo), f(x)(42*x))", + " }", + " }", + "}" + )); + builder.build(true); + String message = logger.findMessage("collection"); + assertNotNull(message); + assertEquals("WARNING: Using attribute(foo) collectiontype: ARRAY as ranking expression input", message); + } + + @Test + void requireThatUsingWsetWarns() throws Exception { + InspectableDeployLogger logger = new InspectableDeployLogger(); + ApplicationBuilder builder = new ApplicationBuilder(logger); + builder.addSchema(joinLines( + "search test {", + " document test { ", + " field foo type weightedset<int> {", + " indexing: attribute", + " }", + " }", + " rank-profile my_rank_profile {", + " first-phase {", + " expression: attribute(foo)", + " }", + " }", + "}" + )); + builder.build(true); + String message = logger.findMessage("collection"); + assertNotNull(message); + assertEquals("WARNING: Using attribute(foo) collectiontype: WEIGHTEDSET as ranking expression input", message); + } + + @Test void noWarningWhenUsingTensorsWhenQueryFeaturesAreDeclared() throws Exception { InspectableDeployLogger logger = new InspectableDeployLogger(); ApplicationBuilder builder = new ApplicationBuilder(logger); diff --git a/config-model/src/test/java/com/yahoo/schema/processing/TensorTransformTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/TensorTransformTestCase.java index 58a0b54e6cc..1e1fdf67734 100644 --- a/config-model/src/test/java/com/yahoo/schema/processing/TensorTransformTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/TensorTransformTestCase.java @@ -35,8 +35,8 @@ public class TensorTransformTestCase extends AbstractSchemaTestCase { "max(1.0,2.0)"); assertTransformedExpression("min(attribute(double_field),x)", "min(attribute(double_field),x)"); - assertTransformedExpression("max(attribute(double_field),attribute(double_array_field))", - "max(attribute(double_field),attribute(double_array_field))"); + assertTransformedExpression("max(attribute(double_field),attribute(double_array_field).count)", + "max(attribute(double_field),attribute(double_array_field).count)"); assertTransformedExpression("min(attribute(tensor_field_1),attribute(double_field))", "min(attribute(tensor_field_1),attribute(double_field))"); assertTransformedExpression("reduce(max(attribute(tensor_field_1),attribute(tensor_field_2)),sum)", |