diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-02-23 19:46:26 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-02-23 19:46:26 +0100 |
commit | 96916155c91b78bba6ce81b02b086e14872a0dcc (patch) | |
tree | 1904126a1a5ece5c830efffec94d1ae1d4294cd6 | |
parent | 5d6894ace270b408527786810b65cd8972379a71 (diff) |
'tokenize', to make this work better as a query type
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/query/parser/TokenizeParser.java (renamed from container-search/src/main/java/com/yahoo/prelude/query/parser/NoGrammarParser.java) | 9 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/Query.java | 4 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java | 4 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java | 8 |
4 files changed, 9 insertions, 16 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/NoGrammarParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenizeParser.java index 70e5ba66c6a..dbbc321d057 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/NoGrammarParser.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenizeParser.java @@ -1,17 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser; -import com.yahoo.prelude.query.BlockItem; import com.yahoo.prelude.query.IntItem; import com.yahoo.prelude.query.Item; -import com.yahoo.prelude.query.Substring; import com.yahoo.prelude.query.WeakAndItem; -import com.yahoo.prelude.query.WordItem; import com.yahoo.search.query.parser.ParserEnvironment; -import static com.yahoo.prelude.query.parser.Token.Kind.MINUS; import static com.yahoo.prelude.query.parser.Token.Kind.NUMBER; -import static com.yahoo.prelude.query.parser.Token.Kind.UNDERSCORE; import static com.yahoo.prelude.query.parser.Token.Kind.WORD; /** @@ -20,9 +15,9 @@ import static com.yahoo.prelude.query.parser.Token.Kind.WORD; * * @author bratseth */ -public final class NoGrammarParser extends AbstractParser { +public final class TokenizeParser extends AbstractParser { - public NoGrammarParser(ParserEnvironment environment) { + public TokenizeParser(ParserEnvironment environment) { super(environment); } diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java index 83be5e7f6cd..fb7281e1f24 100644 --- a/container-search/src/main/java/com/yahoo/search/Query.java +++ b/container-search/src/main/java/com/yahoo/search/Query.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search; -import ai.vespa.cloud.Environment; -import ai.vespa.cloud.Zone; import ai.vespa.cloud.ZoneInfo; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -110,7 +108,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { YQL(6, "yql"), SELECT(7, "select"), WEAKAND(8, "weakAnd"), - NONE(9, "none"); + TOKENIZE(9, "tokenize"); private final int intValue; private final String stringValue; diff --git a/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java b/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java index 4d1cdc320cc..40d1c3e7877 100644 --- a/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java +++ b/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java @@ -46,8 +46,8 @@ public final class ParserFactory { return new SelectParser(environment); case WEAKAND: return new AllParser(environment, true); - case NONE: - return new NoGrammarParser(environment); + case TOKENIZE: + return new TokenizeParser(environment); default: throw new UnsupportedOperationException(type.toString()); } diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java index 7f51cfa1667..77d8b2b973e 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java @@ -2565,21 +2565,21 @@ public class ParseTestCase { @Test public void testNoGrammar1() { - tester.assertParsed("WEAKAND(100) foobar", "foobar", Query.Type.NONE); + tester.assertParsed("WEAKAND(100) foobar", "foobar", Query.Type.TOKENIZE); } @Test public void testNoGrammar2() { - tester.assertParsed("WEAKAND(100) foobar", "-foobar", Query.Type.NONE); + tester.assertParsed("WEAKAND(100) foobar", "-foobar", Query.Type.TOKENIZE); } @Test public void testNoGrammar3() { - tester.assertParsed("WEAKAND(100) foo bar", "foo -bar", Query.Type.NONE); + tester.assertParsed("WEAKAND(100) foo bar", "foo -bar", Query.Type.TOKENIZE); } @Test public void testNoGrammar4() { - tester.assertParsed("WEAKAND(100) foo bar baz one two 37", "foo -(bar baz \"one two\" 37)", Query.Type.NONE); + tester.assertParsed("WEAKAND(100) foo bar baz one two 37", "foo -(bar baz \"one two\" 37)", Query.Type.TOKENIZE); } } |