diff options
| -rw-r--r-- | config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java | 5 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/YqlParser.java | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java index 35c7bfd35ec..9351254034e 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java @@ -14,6 +14,11 @@ import static org.junit.jupiter.api.Assertions.fail; public class NodeResourcesTest { @Test + public void testCost() { + assertEquals(5.408, new NodeResources(32, 128, 1200, 1).cost(), 0.0001); + } + + @Test void testToString() { assertEquals("[vcpu: 1.0, memory: 10.0 Gb, disk 100.0 Gb, architecture: x86_64]", new NodeResources(1., 10., 100., 0).toString()); diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java index 3a1927983d2..1203f69dd3c 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java +++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java @@ -707,7 +707,7 @@ public class YqlParser implements Parser { } private Item buildUserInput(OperatorNode<ExpressionOperator> ast) { - // TODO add support for default arguments if property results in nothing + // TODO: Add support for default arguments if property results in nothing List<OperatorNode<ExpressionOperator>> args = ast.getArgument(1); String wordData = getStringContents(args.get(0)); @@ -727,7 +727,7 @@ public class YqlParser implements Parser { item = instantiateWordItem(defaultIndex, wordData, ast, null, SegmentWhen.ALWAYS, false, language); } else { item = parseUserInput(grammar, defaultIndex, wordData, language, allowEmpty); - propagateUserInputAnnotations(ast, item); + propagateUserInputAnnotationsRecursively(ast, item); } // Set grammar-specific annotations @@ -767,7 +767,7 @@ public class YqlParser implements Parser { } } - private void propagateUserInputAnnotations(OperatorNode<ExpressionOperator> ast, Item item) { + private void propagateUserInputAnnotationsRecursively(OperatorNode<ExpressionOperator> ast, Item item) { ToolBox.visit(new AnnotationPropagator(ast), item); } |