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

cleanup freeze methods and move them down to QueryShardContext

This commit is contained in:
Simon Willnauer 2016-10-05 12:22:54 +02:00
parent 5687549ad8
commit a008959f7a
5 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java
View File

@ -48,8 +48,6 @@ public class QueryRewriteContext implements ParseFieldMatcherSupplier {
protected final Client client;
protected final IndexReader reader;
protected final ClusterState clusterState;
protected boolean cachable = true;
private final SetOnce<Boolean> executionMode = new SetOnce<>();
public QueryRewriteContext(IndexSettings indexSettings, MapperService mapperService, ScriptService scriptService,
IndicesQueriesRegistry indicesQueriesRegistry, Client client, IndexReader reader,
@ -119,34 +117,11 @@ public class QueryRewriteContext implements ParseFieldMatcherSupplier {
return new QueryParseContext(defaultScriptLanguage, indicesQueriesRegistry, parser, indexSettings.getParseFieldMatcher());
}
/**
* Returns <code>true</code> iff the result of the processed search request is cachable. Otherwise <code>false</code>
*/
public boolean isCachable() {
return cachable;
}
public BytesReference getTemplateBytes(Script template) {
failIfExecutionMode();
ExecutableScript executable = scriptService.executable(template,
ScriptContext.Standard.SEARCH, Collections.emptyMap());
return (BytesReference) executable.run();
}
public void setExecutionMode() {
this.executionMode.set(Boolean.TRUE);
}
/**
* This method fails if {@link #setExecutionMode()} is called before on this context.
* This is used to <i>seal</i>
*/
protected void failIfExecutionMode() {
this.cachable = false;
if (executionMode.get() == Boolean.TRUE) {
throw new IllegalArgumentException("features that prevent cachability are disabled on this context");
} else {
assert executionMode.get() == null : executionMode.get();
}
}
}

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

@ -36,11 +36,13 @@ import org.apache.lucene.queryparser.classic.QueryParserSettings;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.join.BitSetProducer;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.SetOnce;
import org.elasticsearch.Version;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.IndexSettings;
@ -77,6 +79,8 @@ public class QueryShardContext extends QueryRewriteContext {
private final IndexFieldDataService indexFieldDataService;
private final IndexSettings indexSettings;
private String[] types = Strings.EMPTY_ARRAY;
private boolean cachable = true;
private final SetOnce<Boolean> frozen = new SetOnce<>();
public void setTypes(String... types) {
this.types = types;
@ -271,7 +275,7 @@ public class QueryShardContext extends QueryRewriteContext {
}
public long nowInMillis() {
failIfExecutionMode();
failIfFrozen();
return nowInMillis.getAsLong();
}
@ -339,7 +343,7 @@ public class QueryShardContext extends QueryRewriteContext {
* Compiles (or retrieves from cache) and executes the provided script
*/
public SearchScript getSearchScript(Script script, ScriptContext context, Map<String, String> params) {
failIfExecutionMode();
failIfFrozen();
return scriptService.search(lookup(), script, context, params);
}
/**
@ -348,7 +352,7 @@ public class QueryShardContext extends QueryRewriteContext {
*/
public Function<Map<String, Object>, SearchScript> getLazySearchScript(Script script, ScriptContext context,
Map<String, String> params) {
failIfExecutionMode();
failIfFrozen();
CompiledScript compile = scriptService.compile(script, context, params);
return (p) -> scriptService.search(lookup(), compile, p);
}
@ -357,7 +361,7 @@ public class QueryShardContext extends QueryRewriteContext {
* Compiles (or retrieves from cache) and executes the provided script
*/
public ExecutableScript getExecutableScript(Script script, ScriptContext context, Map<String, String> params) {
failIfExecutionMode();
failIfFrozen();
return scriptService.executable(script, context, params);
}
@ -367,8 +371,42 @@ public class QueryShardContext extends QueryRewriteContext {
*/
public Function<Map<String, Object>, ExecutableScript> getLazyExecutableScript(Script script, ScriptContext context,
Map<String, String> params) {
failIfExecutionMode();
failIfFrozen();
CompiledScript executable = scriptService.compile(script, context, params);
return (p) -> scriptService.executable(executable, p);
}
/**
* if this method is called the query context will throw exception if methods are accessed
* that could yield different results across executions like {@link #getTemplateBytes(Script)}
*/
public void freezeContext() {
this.frozen.set(Boolean.TRUE);
}
/**
* This method fails if {@link #freezeContext()} is called before on this context.
* This is used to <i>seal</i>
*/
protected void failIfFrozen() {
this.cachable = false;
if (frozen.get() == Boolean.TRUE) {
throw new IllegalArgumentException("features that prevent cachability are disabled on this context");
} else {
assert frozen.get() == null : frozen.get();
}
}
@Override
public BytesReference getTemplateBytes(Script template) {
failIfFrozen();
return super.getTemplateBytes(template);
}
/**
* Returns <code>true</code> iff the result of the processed search request is cachable. Otherwise <code>false</code>
*/
public boolean isCachable() {
return cachable;
}
}

2
core/src/main/java/org/elasticsearch/indices/IndicesService.java
View File

@ -1082,7 +1082,7 @@ public class IndicesService extends AbstractLifecycleComponent
}
// if now in millis is used (or in the future, a more generic "isDeterministic" flag
// then we can't cache based on "now" key within the search request, as it is not deterministic
if (context.isCachable() == false) {
if (context.getQueryShardContext().isCachable() == false) {
return false;
}
return true;

2
core/src/main/java/org/elasticsearch/search/SearchService.java
View File

@ -231,7 +231,7 @@ public class SearchService extends AbstractLifecycleComponent implements IndexEv
*/
private void loadOrExecuteQueryPhase(final ShardSearchRequest request, final SearchContext context) throws Exception {
final boolean canCache = indicesService.canCache(request, context);
context.getQueryShardContext().setExecutionMode();
context.getQueryShardContext().freezeContext();
if (canCache) {
indicesService.loadIntoContext(request, context, queryPhase);
} else {

4
core/src/main/java/org/elasticsearch/search/internal/SearchContext.java
View File

@ -159,10 +159,6 @@ public abstract class SearchContext extends AbstractRefCounted implements Releas
public abstract long getOriginNanoTime();
public final boolean isCachable() {
return getQueryShardContext().isCachable();
}
public abstract ScrollContext scrollContext();
public abstract SearchContext scrollContext(ScrollContext scroll);