-
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.
Merge pull request #11885 from MaineC/feature/filter-query-builder-re…
…factoring Refactors FilteredQueryBuilder. Relates to #10217
- Loading branch information
Showing
4 changed files
with
221 additions
and
64 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
105 changes: 105 additions & 0 deletions
105
core/src/test/java/org/elasticsearch/index/query/FilteredQueryBuilderTest.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,105 @@ | ||
| /* | ||
| * 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.ConstantScoreQuery; | ||
| import org.apache.lucene.search.Query; | ||
| import org.elasticsearch.common.lucene.search.Queries; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| @SuppressWarnings("deprecation") | ||
| public class FilteredQueryBuilderTest extends BaseQueryTestCase<FilteredQueryBuilder> { | ||
|
|
||
| @Override | ||
| protected FilteredQueryBuilder doCreateTestQueryBuilder() { | ||
| QueryBuilder queryBuilder = RandomQueryBuilder.createQuery(random()); | ||
| QueryBuilder filterBuilder = RandomQueryBuilder.createQuery(random()); | ||
|
|
||
| FilteredQueryBuilder query = new FilteredQueryBuilder(queryBuilder, filterBuilder); | ||
| return query; | ||
| } | ||
|
|
||
| @Override | ||
| protected Query doCreateExpectedQuery(FilteredQueryBuilder qb, QueryParseContext context) throws IOException { | ||
| Query query = qb.query().toQuery(context); | ||
| Query filter = qb.filter().toQuery(context); | ||
|
|
||
| if (query == null) { | ||
| return null; | ||
| } | ||
|
|
||
| Query result; | ||
| if (filter == null || Queries.isConstantMatchAllQuery(filter)) { | ||
| result = qb.query().toQuery(context); | ||
| } else if (Queries.isConstantMatchAllQuery(query)) { | ||
| result = new ConstantScoreQuery(filter); | ||
| } else { | ||
| result = Queries.filtered(qb.query().toQuery(context), filter); | ||
| } | ||
| result.setBoost(qb.boost()); | ||
| return result; | ||
| } | ||
|
|
||
| @Test | ||
| public void testValidation() { | ||
| QueryBuilder valid = RandomQueryBuilder.createQuery(random()); | ||
| QueryBuilder invalid = RandomQueryBuilder.createInvalidQuery(random()); | ||
|
|
||
| // invalid cases | ||
| FilteredQueryBuilder qb = new FilteredQueryBuilder(invalid); | ||
| QueryValidationException result = qb.validate(); | ||
| assertNotNull(result); | ||
| assertEquals(1, result.validationErrors().size()); | ||
|
|
||
| qb = new FilteredQueryBuilder(valid, invalid); | ||
| result = qb.validate(); | ||
| assertNotNull(result); | ||
| assertEquals(1, result.validationErrors().size()); | ||
|
|
||
| qb = new FilteredQueryBuilder(invalid, valid); | ||
| result = qb.validate(); | ||
| assertNotNull(result); | ||
| assertEquals(1, result.validationErrors().size()); | ||
|
|
||
| qb = new FilteredQueryBuilder(invalid, invalid); | ||
| result = qb.validate(); | ||
| assertNotNull(result); | ||
| assertEquals(2, result.validationErrors().size()); | ||
|
|
||
| // valid cases | ||
| qb = new FilteredQueryBuilder(valid); | ||
| assertNull(qb.validate()); | ||
|
|
||
| qb = new FilteredQueryBuilder(null); | ||
| assertNull(qb.validate()); | ||
|
|
||
| qb = new FilteredQueryBuilder(null, valid); | ||
| assertNull(qb.validate()); | ||
|
|
||
| qb = new FilteredQueryBuilder(valid, null); | ||
| assertNull(qb.validate()); | ||
|
|
||
| qb = new FilteredQueryBuilder(valid, valid); | ||
| assertNull(qb.validate()); | ||
| } | ||
|
|
||
| } |