-
Notifications
You must be signed in to change notification settings - Fork 25k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Query refactoring: SpanMultiTermQueryBuilder and Parser
Moving the query building functionality from the parser to the builders new toQuery() method analogous to other recent query refactorings. Relates to #10217 Closes #12182
- Loading branch information
Showing
6 changed files
with
200 additions
and
37 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
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
82 changes: 82 additions & 0 deletions
82
core/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTest.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,82 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch 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.elasticsearch.index.query; | ||
|
|
||
| import org.apache.lucene.search.MultiTermQuery; | ||
| import org.apache.lucene.search.Query; | ||
| import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class SpanMultiTermQueryBuilderTest extends BaseQueryTestCase<SpanMultiTermQueryBuilder> { | ||
|
|
||
| @Override | ||
| protected Query doCreateExpectedQuery(SpanMultiTermQueryBuilder testQueryBuilder, QueryParseContext context) throws IOException { | ||
| Query multiTermQuery = testQueryBuilder.multiTermQueryBuilder().toQuery(context); | ||
| return new SpanMultiTermQueryWrapper<>((MultiTermQuery) multiTermQuery); | ||
| } | ||
|
|
||
| @Override | ||
| protected SpanMultiTermQueryBuilder doCreateTestQueryBuilder() { | ||
| MultiTermQueryBuilder multiTermQueryBuilder = RandomQueryBuilder.createMultiTermQuery(random()); | ||
| return new SpanMultiTermQueryBuilder(multiTermQueryBuilder); | ||
| } | ||
|
|
||
| @Test | ||
| public void testValidate() { | ||
| int totalExpectedErrors = 0; | ||
| MultiTermQueryBuilder multiTermQueryBuilder; | ||
| if (randomBoolean()) { | ||
| multiTermQueryBuilder = new RangeQueryBuilder(""); | ||
| totalExpectedErrors++; | ||
| } else { | ||
| multiTermQueryBuilder = new RangeQueryBuilder("field"); | ||
| } | ||
| SpanMultiTermQueryBuilder queryBuilder = new SpanMultiTermQueryBuilder(multiTermQueryBuilder); | ||
| assertValidate(queryBuilder, totalExpectedErrors); | ||
| } | ||
|
|
||
| @Test(expected = NullPointerException.class) | ||
| public void testInnerQueryNull() { | ||
| new SpanMultiTermQueryBuilder(null); | ||
| } | ||
|
|
||
| /** | ||
| * test checks that we throw an {@link UnsupportedOperationException} if the query wrapped | ||
| * by {@link SpanMultiTermQueryBuilder} does not generate a lucene {@link MultiTermQuery}. | ||
| * This is currently the case for {@link RangeQueryBuilder} when the target field is mapped | ||
| * to a date. | ||
| */ | ||
| @Test | ||
| public void testUnsupportedInnerQueryType() throws IOException { | ||
| QueryParseContext parseContext = createContext(); | ||
| // test makes only sense if date field is mapped | ||
| if (parseContext.fieldMapper(DATE_FIELD_NAME) != null) { | ||
| try { | ||
| RangeQueryBuilder query = new RangeQueryBuilder(DATE_FIELD_NAME); | ||
| new SpanMultiTermQueryBuilder(query).toQuery(createContext()); | ||
| fail("Exception expected, range query on date fields should not generate a lucene " + MultiTermQuery.class.getName()); | ||
| } catch (UnsupportedOperationException e) { | ||
| assert(e.getMessage().contains("unsupported inner query, should be " + MultiTermQuery.class.getName())); | ||
| } | ||
| } | ||
| } | ||
| } |