honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-25 01:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internal: small QueryShardContext cleanup

Browse Source 
Added some comments about changes that we might be able to make later on in the refactoring. Also exposed handleTermsLookup in the context directly, removed unused similarityService getter and corrected simpleMatchToIndexNames call according to changes happened on master (the method variant that accept types will go away, types are ignored anyway).
This commit is contained in:
javanna 2015-08-31 10:05:47 +02:00 committed by Luca Cavanna
parent c403bdbd62
commit c3070062db
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/org/elasticsearch/index/query/QueryShardContext.java
View File

@ -30,7 +30,6 @@ import org.apache.lucene.search.join.BitDocIdSetFilter;
import org.apache.lucene.search.similarities.Similarity;
import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseFieldMatcher;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentParser;
@ -41,16 +40,13 @@ import org.elasticsearch.index.mapper.*;
import org.elasticsearch.index.mapper.core.StringFieldMapper;
import org.elasticsearch.index.mapper.object.ObjectMapper;
import org.elasticsearch.index.query.support.NestedScope;
import org.elasticsearch.index.similarity.SimilarityService;
import org.elasticsearch.indices.cache.query.terms.TermsLookup;
import org.elasticsearch.script.ScriptService;
import org.elasticsearch.search.fetch.innerhits.InnerHitsContext;
import org.elasticsearch.search.internal.SearchContext;
import org.elasticsearch.search.lookup.SearchLookup;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
/**
* Context object used to create lucene queries on the shard level.
@ -133,6 +129,7 @@ public class QueryShardContext {
return this.index;
}
//norelease we might be able to avoid exposing the service to the outside world once all queries are refactored
public IndexQueryParserService indexQueryParserService() {
return indexQueryParser;
}
@ -149,11 +146,6 @@ public class QueryShardContext {
return indexQueryParser.mapperService;
}
@Nullable
public SimilarityService similarityService() {
return indexQueryParser.similarityService;
}
public Similarity searchSimilarity() {
return indexQueryParser.similarityService != null ? indexQueryParser.similarityService.similarity() : null;
}
@ -217,7 +209,7 @@ public class QueryShardContext {
}
public Collection<String> simpleMatchToIndexNames(String pattern) {
return indexQueryParser.mapperService.simpleMatchToIndexNames(pattern, getTypes());
return indexQueryParser.mapperService.simpleMatchToIndexNames(pattern);
}
public MappedFieldType fieldMapper(String name) {
@ -325,6 +317,10 @@ public class QueryShardContext {
}
public boolean matchesIndices(String... indices) {
return this.indexQueryParserService().matchesIndices(indices);
return this.indexQueryParser.matchesIndices(indices);
}
public List<Object> handleTermsLookup(TermsLookup termsLookup) {
return this.indexQueryParser.handleTermsLookup(termsLookup);
}
}