honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix handling of alias filter in SearchService#canMatch (#59368) 

The check against the alias filter should be done after the request is rewritten.

Close #59367
This commit is contained in:
Stéphane Campinas 2020-07-20 15:15:47 +02:00 committed by jimczi
parent b75207a09f
commit bcebdfe5b1
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/org/elasticsearch/search/SearchService.java
View File

@ -1121,11 +1121,11 @@ public class SearchService extends AbstractLifecycleComponent implements IndexEv
// and we can afford false positives.
final boolean hasRefreshPending = indexShard.hasRefreshPending();
try (Engine.Searcher searcher = indexShard.acquireCanMatchSearcher()) {
final boolean aliasFilterCanMatch = request.getAliasFilter()
.getQueryBuilder() instanceof MatchNoneQueryBuilder == false;
QueryShardContext context = indexService.newQueryShardContext(request.shardId().id(), searcher,
request::nowInMillis, request.getClusterAlias());
Rewriteable.rewrite(request.getRewriteable(), context, false);
final boolean aliasFilterCanMatch = request.getAliasFilter()
.getQueryBuilder() instanceof MatchNoneQueryBuilder == false;
FieldSortBuilder sortBuilder = FieldSortBuilder.getPrimaryFieldSortOrNull(request.source());
MinAndMax<?> minMax = sortBuilder != null ? FieldSortBuilder.getMinMaxOrNull(context, sortBuilder) : null;
final boolean canMatch;

21
server/src/test/java/org/elasticsearch/search/SearchServiceTests.java
View File

@ -64,6 +64,7 @@ import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.indices.settings.InternalOrPrivateSettingsPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.plugins.SearchPlugin;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.script.MockScriptEngine;
import org.elasticsearch.script.MockScriptPlugin;
import org.elasticsearch.script.Script;
@ -724,15 +725,19 @@ public class SearchServiceTests extends ESSingleNodeTestCase {
ShardSearchRequest request = new ShardSearchRequest(OriginalIndices.NONE, searchRequest, indexShard.shardId(), 1,
new AliasFilter(null, Strings.EMPTY_ARRAY), 1.0f, -1, null, null);
assertAcked(
client().admin().indices().prepareAliases()
.addAlias("index", "alias", new MatchNoneQueryBuilder())
.get()
);
searchRequest.source(new SearchSourceBuilder().query(new MatchAllQueryBuilder()));
/*
* Checks that canMatch takes into account the alias filter
*/
// the source cannot be rewritten to a match_none
searchRequest.indices("alias").source(new SearchSourceBuilder().query(new MatchAllQueryBuilder()));
assertFalse(service.canMatch(new ShardSearchRequest(OriginalIndices.NONE, searchRequest, indexShard.shardId(), 1,
new AliasFilter(new MatchNoneQueryBuilder(), "alias"), 1f, -1, null, null)).canMatch());
new AliasFilter(new TermQueryBuilder("foo", "bar"), "alias"), 1f, -1, null, null)).canMatch());
// the source can match and can be rewritten to a match_none, but not the alias filter
final IndexResponse response = client().prepareIndex("index", "_doc", "1").setSource("id", "1").get();
assertEquals(RestStatus.CREATED, response.status());
searchRequest.indices("alias").source(new SearchSourceBuilder().query(new TermQueryBuilder("id", "1")));
assertFalse(service.canMatch(new ShardSearchRequest(OriginalIndices.NONE, searchRequest, indexShard.shardId(), 1,
new AliasFilter(new TermQueryBuilder("foo", "bar"), "alias"), 1f, -1, null, null)).canMatch());
CountDownLatch latch = new CountDownLatch(1);
SearchShardTask task = new SearchShardTask(123L, "", "", "", null, Collections.emptyMap());