diff options
7 files changed, 21 insertions, 20 deletions
diff --git a/client/go/go.mod b/client/go/go.mod index 7a50c94b6e9..76dfb4cda51 100644 --- a/client/go/go.mod +++ b/client/go/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/alessio/shellescape v1.4.2 github.com/briandowns/spinner v1.23.0 - github.com/fatih/color v1.15.0 + github.com/fatih/color v1.16.0 // This is the most recent version compatible with Go 1.19. Upgrade when we upgrade our Go version github.com/go-json-experiment/json v0.0.0-20230216065249-540f01442424 github.com/klauspost/compress v1.17.2 diff --git a/client/go/go.sum b/client/go/go.sum index 8ccde55ddc3..c05f65513d2 100644 --- a/client/go/go.sum +++ b/client/go/go.sum @@ -17,6 +17,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/go-json-experiment/json v0.0.0-20230216065249-540f01442424 h1:I1EK0t+BDH+kvlozNqrvzKqsWeM2QUKxXH0iW2fjDDw= github.com/go-json-experiment/json v0.0.0-20230216065249-540f01442424/go.mod h1:I+I5/LT2lLP0eZsBNaVDrOrYASx9h7o7mRHmy+535/A= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index cbf328363e6..660c4ae6811 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -130,7 +130,7 @@ <questdb.vespa.version>7.3.3</questdb.vespa.version> <spifly.vespa.version>1.3.6</spifly.vespa.version> <snappy.vespa.version>1.1.10.5</snappy.vespa.version> - <surefire.vespa.version>3.2.1</surefire.vespa.version> + <surefire.vespa.version>3.2.2</surefire.vespa.version> <velocity.vespa.version>2.3</velocity.vespa.version> <velocity.tools.vespa.version>3.1</velocity.tools.vespa.version> <wiremock.vespa.version>3.3.1</wiremock.vespa.version> @@ -154,13 +154,13 @@ <maven-dependency-plugin.vespa.version>3.6.1</maven-dependency-plugin.vespa.version> <maven-deploy-plugin.vespa.version>3.1.1</maven-deploy-plugin.vespa.version> <maven-enforcer-plugin.vespa.version>3.4.1</maven-enforcer-plugin.vespa.version> - <maven-failsafe-plugin.vespa.version>3.2.1</maven-failsafe-plugin.vespa.version> + <maven-failsafe-plugin.vespa.version>3.2.2</maven-failsafe-plugin.vespa.version> <maven-gpg-plugin.vespa.version>3.1.0</maven-gpg-plugin.vespa.version> <maven-install-plugin.vespa.version>3.1.1</maven-install-plugin.vespa.version> <maven-jar-plugin.vespa.version>3.3.0</maven-jar-plugin.vespa.version> - <maven-javadoc-plugin.vespa.version>3.6.0</maven-javadoc-plugin.vespa.version> + <maven-javadoc-plugin.vespa.version>3.6.2</maven-javadoc-plugin.vespa.version> <maven-plugin-api.vespa.version>${maven-core.vespa.version}</maven-plugin-api.vespa.version> - <maven-plugin-tools.vespa.version>3.10.1</maven-plugin-tools.vespa.version> + <maven-plugin-tools.vespa.version>3.10.2</maven-plugin-tools.vespa.version> <maven-resources-plugin.vespa.version>3.3.1</maven-resources-plugin.vespa.version> <maven-resolver.vespa.version>1.9.16</maven-resolver.vespa.version> <maven-shade-plugin.vespa.version>3.5.1</maven-shade-plugin.vespa.version> diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj index 9b088825201..6cd01151dc1 100755 --- a/searchlib/src/main/javacc/RankingExpressionParser.jj +++ b/searchlib/src/main/javacc/RankingExpressionParser.jj @@ -16,6 +16,7 @@ PARSER_BEGIN(RankingExpressionParser) package com.yahoo.searchlib.rankingexpression.parser; +import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.searchlib.rankingexpression.rule.*; import com.yahoo.searchlib.rankingexpression.evaluation.Value; import com.yahoo.searchlib.rankingexpression.evaluation.StringValue; @@ -300,7 +301,7 @@ ReferenceNode legacyQueryFeature() : { ( <DOLLAR> name = identifier() ) { - return new ReferenceNode("query", Arrays.asList((ExpressionNode)new NameNode(name)), null); + return new ReferenceNode(Reference.simple("query", name)); } } diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/ReferenceTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/ReferenceTestCase.java index 5899d4fc07e..fd361d4aaa3 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/ReferenceTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/ReferenceTestCase.java @@ -19,7 +19,6 @@ public class ReferenceTestCase { public void testSimple() { assertTrue(new Reference("foo", new Arguments(new ReferenceNode("arg")), null).isSimple()); assertTrue(new Reference("foo", new Arguments(new ReferenceNode("arg")), "out").isSimple()); - assertTrue(new Reference("foo", new Arguments(new NameNode("arg")), "out").isSimple()); assertFalse(new Reference("foo", new Arguments(), null).isSimple()); } @@ -27,7 +26,6 @@ public class ReferenceTestCase { public void testToString() { assertEquals("foo(arg_1)", new Reference("foo", new Arguments(new ReferenceNode("arg_1")), null).toString()); assertEquals("foo(arg_1).out", new Reference("foo", new Arguments(new ReferenceNode("arg_1")), "out").toString()); - assertEquals("foo(arg_1).out", new Reference("foo", new Arguments(new NameNode("arg_1")), "out").toString()); assertEquals("foo", new Reference("foo", new Arguments(), null).toString()); } diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ArgumentsTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ArgumentsTestCase.java index 2d38c58703c..df91c78c1b4 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ArgumentsTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ArgumentsTestCase.java @@ -21,8 +21,8 @@ public class ArgumentsTestCase { args = new Arguments(Collections.<ExpressionNode>emptyList()); assertTrue(args.expressions().isEmpty()); - NameNode foo = new NameNode("foo"); - NameNode bar = new NameNode("bar"); + var foo = new ReferenceNode("foo"); + var bar = new ReferenceNode("bar"); args = new Arguments(Arrays.asList(foo, bar)); assertEquals(2, args.expressions().size()); assertSame(foo, args.expressions().get(0)); @@ -31,9 +31,9 @@ public class ArgumentsTestCase { @Test public void requireThatHashCodeAndEqualsWork() { - Arguments arg1 = new Arguments(Arrays.asList(new NameNode("foo"), new NameNode("bar"))); - Arguments arg2 = new Arguments(Arrays.asList(new NameNode("foo"), new NameNode("bar"))); - Arguments arg3 = new Arguments(Arrays.asList(new NameNode("foo"))); + Arguments arg1 = new Arguments(Arrays.asList(new ReferenceNode("foo"), new ReferenceNode("bar"))); + Arguments arg2 = new Arguments(Arrays.asList(new ReferenceNode("foo"), new ReferenceNode("bar"))); + Arguments arg3 = new Arguments(Arrays.asList(new ReferenceNode("foo"))); assertEquals(arg1.hashCode(), arg2.hashCode()); assertTrue(arg1.equals(arg2)); diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNodeTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNodeTestCase.java index 225748bbc2e..7d0e0d6da84 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNodeTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNodeTestCase.java @@ -15,19 +15,19 @@ public class ReferenceNodeTestCase { @Test public void requireThatAccessorsWork() { - ReferenceNode node = new ReferenceNode("foo", Arrays.asList(new NameNode("bar"), new NameNode("baz")), "cox"); + ReferenceNode node = new ReferenceNode("foo", Arrays.asList(new ReferenceNode("bar"), new ReferenceNode("baz")), "cox"); assertEquals("foo", node.getName()); List<ExpressionNode> args = node.getArguments().expressions(); assertEquals(2, args.size()); - assertEquals(new NameNode("bar"), args.get(0)); - assertEquals(new NameNode("baz"), args.get(1)); + assertEquals(new ReferenceNode("bar"), args.get(0)); + assertEquals(new ReferenceNode("baz"), args.get(1)); assertEquals("cox", node.getOutput()); - node = node.setArguments(Arrays.<ExpressionNode>asList(new NameNode("bar'"))); - assertEquals(new NameNode("bar'"), node.getArguments().expressions().get(0)); + node = node.setArguments(Arrays.<ExpressionNode>asList(new ReferenceNode("bar@"))); + assertEquals(new ReferenceNode("bar@"), node.getArguments().expressions().get(0)); - node = node.setArguments(Arrays.<ExpressionNode>asList(new NameNode("baz'"))); - assertEquals(new NameNode("baz'"), node.getArguments().expressions().get(0)); + node = node.setArguments(Arrays.<ExpressionNode>asList(new ReferenceNode("baz$"))); + assertEquals(new ReferenceNode("baz$"), node.getArguments().expressions().get(0)); node = node.setOutput("cox'"); assertEquals("cox'", node.getOutput()); |