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

Disable caching when queries are profiled (#48195) 

This change disables the query and request cache when
profile is set to true in the request. This means that profiled queries
will not check caches to execute the query and the result will never be
added in the cache either.

Closes #33298
This commit is contained in:
Jim Ferenczi 2019-11-20 15:33:41 +01:00 committed by jimczi
parent 1cde4a6364
commit 81548df2d9
6 changed files with 61 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/java/org/elasticsearch/indices/IndicesService.java
View File

@ -1247,6 +1247,11 @@ public class IndicesService extends AbstractLifecycleComponent
return false;
}
// Profiled queries should not use the cache
if (request.source() != null && request.source().profile()) {
return false;
}
IndexSettings settings = context.indexShard().indexSettings();
// if not explicitly set in the request, use the index setting, if not, use the request
if (request.requestCache() == null) {

2
server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
View File

@ -120,7 +120,7 @@ public class ContextIndexSearcher extends IndexSearcher {
timer.start();
final Weight weight;
try {
weight = super.createWeight(query, scoreMode, boost);
weight = query.createWeight(this, scoreMode, boost);
} finally {
timer.stop();
profiler.pollLastElement();

2
server/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java
View File

@ -120,7 +120,7 @@ public final class ProfileWeight extends Weight {
@Override
public boolean isCacheable(LeafReaderContext ctx) {
return subQueryWeight.isCacheable(ctx);
return false;
}
}

44
server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java
View File

@ -414,9 +414,49 @@ public class IndicesRequestCacheIT extends ESIntegTestCase {
assertCacheState(client, "index", 2, 2);
}
public void testProfileDisableCache() throws Exception {
Client client = client();
assertAcked(
client.admin().indices().prepareCreate("index")
.addMapping("_doc", "k", "type=keyword")
.setSettings(
Settings.builder()
.put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true)
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0)
)
.get()
);
indexRandom(true, client.prepareIndex("index", "_doc").setSource("k", "hello"));
ensureSearchable("index");
int expectedHits = 0;
int expectedMisses = 0;
for (int i = 0; i < 5; i++) {
boolean profile = i % 2 == 0;
SearchResponse resp = client.prepareSearch("index")
.setRequestCache(true)
.setProfile(profile)
.setQuery(QueryBuilders.termQuery("k", "hello"))
.get();
assertSearchResponse(resp);
ElasticsearchAssertions.assertAllSuccessful(resp);
assertThat(resp.getHits().getTotalHits().value, equalTo(1L));
if (profile == false) {
if (i == 1) {
expectedMisses ++;
} else {
expectedHits ++;
}
}
assertCacheState(client, "index", expectedHits, expectedMisses);
}
}
private static void assertCacheState(Client client, String index, long expectedHits, long expectedMisses) {
RequestCacheStats requestCacheStats = client.admin().indices().prepareStats(index).setRequestCache(true).get().getTotal()
.getRequestCache();
RequestCacheStats requestCacheStats = client.admin().indices().prepareStats(index)
.setRequestCache(true)
.get().getTotal().getRequestCache();
// Check the hit count and miss count together so if they are not
// correct we can see both values
assertEquals(Arrays.asList(expectedHits, expectedMisses, 0L),

1
server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java
View File

@ -54,7 +54,6 @@ public class QueryProfilerIT extends ESIntegTestCase {
* This test simply checks to make sure nothing crashes. Test indexes 100-150 documents,
* constructs 20-100 random queries and tries to profile them
*/
@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-8658")
public void testProfileQuery() throws Exception {
createIndex("test");
ensureGreen();

31
server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java
View File

@ -30,6 +30,7 @@ import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.LRUQueryCache;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryCachingPolicy;
@ -47,6 +48,7 @@ import org.apache.lucene.util.TestUtil;
import org.elasticsearch.search.internal.ContextIndexSearcher;
import org.elasticsearch.search.profile.ProfileResult;
import org.elasticsearch.test.ESTestCase;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@ -81,7 +83,16 @@ public class QueryProfilerTests extends ESTestCase {
reader = w.getReader();
w.close();
searcher = new ContextIndexSearcher(reader, IndexSearcher.getDefaultSimilarity(),
IndexSearcher.getDefaultQueryCache(), MAYBE_CACHE_POLICY);
IndexSearcher.getDefaultQueryCache(), ALWAYS_CACHE_POLICY);
}
@After
public void checkNoCache() {
LRUQueryCache cache = (LRUQueryCache) searcher.getQueryCache();
assertThat(cache.getHitCount(), equalTo(0L));
assertThat(cache.getCacheCount(), equalTo(0L));
assertThat(cache.getTotalCount(), equalTo(cache.getMissCount()));
assertThat(cache.getCacheSize(), equalTo(0L));
}
@AfterClass
@ -158,10 +169,6 @@ public class QueryProfilerTests extends ESTestCase {
public void testApproximations() throws IOException {
QueryProfiler profiler = new QueryProfiler();
// disable query caching since we want to test approximations, which won't
// be exposed on a cached entry
ContextIndexSearcher searcher = new ContextIndexSearcher(reader, IndexSearcher.getDefaultSimilarity(),
null, MAYBE_CACHE_POLICY);
searcher.setProfiler(profiler);
Query query = new RandomApproximationQuery(new TermQuery(new Term("foo", "bar")), random());
searcher.count(query);
@ -184,7 +191,6 @@ public class QueryProfilerTests extends ESTestCase {
long rewriteTime = profiler.getRewriteTime();
assertThat(rewriteTime, greaterThan(0L));
}
public void testCollector() throws IOException {
@ -288,17 +294,4 @@ public class QueryProfilerTests extends ESTestCase {
}
};
private static final QueryCachingPolicy NEVER_CACHE_POLICY = new QueryCachingPolicy() {
@Override
public void onUse(Query query) {}
@Override
public boolean shouldCache(Query query) throws IOException {
return false;
}
};
}