-
Notifications
You must be signed in to change notification settings - Fork 682
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SOLR-13748: Add support for mm parameter to bool query parser (#2025)
--------- Co-authored-by: Andrey Bozhko <[email protected]> Co-authored-by: Mikhail Khludnev <[email protected]>
- Loading branch information
3 people
authored
Dec 8, 2023
1 parent
a2f5e9e
commit c0c2099
Showing
6 changed files
with
167 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
solr/core/src/test/org/apache/solr/search/TestMmBoolQParserPlugin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.solr.search; | ||
|
|
||
| import org.apache.lucene.index.Term; | ||
| import org.apache.lucene.search.BooleanClause; | ||
| import org.apache.lucene.search.BooleanQuery; | ||
| import org.apache.lucene.search.Query; | ||
| import org.apache.lucene.search.TermQuery; | ||
| import org.apache.solr.SolrTestCaseJ4; | ||
| import org.apache.solr.common.SolrException; | ||
| import org.apache.solr.request.SolrQueryRequest; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
|
|
||
| public class TestMmBoolQParserPlugin extends SolrTestCaseJ4 { | ||
|
|
||
| @BeforeClass | ||
| public static void beforeClass() throws Exception { | ||
| initCore("solrconfig.xml", "schema.xml"); | ||
| } | ||
|
|
||
| private static Query parseQuery(SolrQueryRequest req) throws Exception { | ||
| QParser parser = QParser.getParser(req.getParams().get("q"), req); | ||
| return parser.getQuery(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testBooleanQuery() throws Exception { | ||
| Query actual = parseQuery(req("q", "{!bool must=name:foo should=name:bar should=name:qux}")); | ||
|
|
||
| BooleanQuery expected = | ||
| new BooleanQuery.Builder() | ||
| .add(new TermQuery(new Term("name", "foo")), BooleanClause.Occur.MUST) | ||
| .add(new TermQuery(new Term("name", "bar")), BooleanClause.Occur.SHOULD) | ||
| .add(new TermQuery(new Term("name", "qux")), BooleanClause.Occur.SHOULD) | ||
| .setMinimumNumberShouldMatch(0) | ||
| .build(); | ||
|
|
||
| assertEquals(expected, actual); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMinShouldMatch() throws Exception { | ||
| Query actual = | ||
| parseQuery(req("q", "{!bool should=name:foo should=name:bar should=name:qux mm=2}")); | ||
|
|
||
| BooleanQuery expected = | ||
| new BooleanQuery.Builder() | ||
| .add(new TermQuery(new Term("name", "foo")), BooleanClause.Occur.SHOULD) | ||
| .add(new TermQuery(new Term("name", "bar")), BooleanClause.Occur.SHOULD) | ||
| .add(new TermQuery(new Term("name", "qux")), BooleanClause.Occur.SHOULD) | ||
| .setMinimumNumberShouldMatch(2) | ||
| .build(); | ||
|
|
||
| assertEquals(expected, actual); | ||
| } | ||
|
|
||
| @Test | ||
| public void testNoClauses() throws Exception { | ||
| Query actual = parseQuery(req("q", "{!bool}")); | ||
|
|
||
| BooleanQuery expected = new BooleanQuery.Builder().build(); | ||
| assertEquals(expected, actual); | ||
| } | ||
|
|
||
| @Test | ||
| public void testExcludeTags() throws Exception { | ||
| Query actual = | ||
| parseQuery( | ||
| req( | ||
| "q", | ||
| "{!bool must=$ref excludeTags=t2}", | ||
| "ref", | ||
| "{!tag=t1}foo", | ||
| "ref", | ||
| "{!tag=t2}bar", | ||
| "df", | ||
| "name")); | ||
|
|
||
| BooleanQuery expected = | ||
| new BooleanQuery.Builder() | ||
| .add(new TermQuery(new Term("name", "foo")), BooleanClause.Occur.MUST) | ||
| .build(); | ||
| assertEquals(expected, actual); | ||
| } | ||
|
|
||
| @Test | ||
| public void testInvalidMinShouldMatchThrowsException() { | ||
| expectThrows( | ||
| SolrException.class, | ||
| NumberFormatException.class, | ||
| () -> parseQuery(req("q", "{!bool should=name:foo mm=20%}"))); | ||
|
|
||
| expectThrows( | ||
| SolrException.class, | ||
| NumberFormatException.class, | ||
| () -> parseQuery(req("q", "{!bool should=name:foo mm=2.9}"))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters