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

[CI] Interval queries cannot be cached if they use scripts (#49824) 

not adjust testCacheability(), which how fails occasionally when given a random
interval source containing a script. This commit overrides testCacheability() to
explicitly sources with and without script filters.

Fixes #49821
This commit is contained in:
Alan Woodward 2019-12-04 12:16:36 +00:00
parent 312190266e
commit aa443c6362
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java
View File

@ -52,7 +52,7 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
@Override @Override
protected IntervalQueryBuilder doCreateTestQueryBuilder() { protected IntervalQueryBuilder doCreateTestQueryBuilder() {
return new IntervalQueryBuilder(STRING_FIELD_NAME, createRandomSource(0)); return new IntervalQueryBuilder(STRING_FIELD_NAME, createRandomSource(0, true));
} }
private static final String[] filters = new String[]{ private static final String[] filters = new String[]{
@ -84,9 +84,9 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
new CompressedXContent(Strings.toString(mapping)), MapperService.MergeReason.MAPPING_UPDATE); new CompressedXContent(Strings.toString(mapping)), MapperService.MergeReason.MAPPING_UPDATE);
} }
private IntervalsSourceProvider createRandomSource(int depth) { private IntervalsSourceProvider createRandomSource(int depth, boolean useScripts) {
if (depth > 3) { if (depth > 3) {
return createRandomMatch(depth + 1); return createRandomMatch(depth + 1, useScripts);
} }
switch (randomInt(20)) { switch (randomInt(20)) {
case 0: case 0:
@ -94,29 +94,29 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
int orCount = randomInt(4) + 1; int orCount = randomInt(4) + 1;
List<IntervalsSourceProvider> orSources = new ArrayList<>(); List<IntervalsSourceProvider> orSources = new ArrayList<>();
for (int i = 0; i < orCount; i++) { for (int i = 0; i < orCount; i++) {
orSources.add(createRandomSource(depth + 1)); orSources.add(createRandomSource(depth + 1, useScripts));
} }
return new IntervalsSourceProvider.Disjunction(orSources, createRandomFilter(depth + 1)); return new IntervalsSourceProvider.Disjunction(orSources, createRandomFilter(depth + 1, useScripts));
case 2: case 2:
case 3: case 3:
int count = randomInt(5) + 1; int count = randomInt(5) + 1;
List<IntervalsSourceProvider> subSources = new ArrayList<>(); List<IntervalsSourceProvider> subSources = new ArrayList<>();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
subSources.add(createRandomSource(depth + 1)); subSources.add(createRandomSource(depth + 1, useScripts));
} }
boolean ordered = randomBoolean(); boolean ordered = randomBoolean();
int maxGaps = randomInt(5) - 1; int maxGaps = randomInt(5) - 1;
IntervalsSourceProvider.IntervalFilter filter = createRandomFilter(depth + 1); IntervalsSourceProvider.IntervalFilter filter = createRandomFilter(depth + 1, useScripts);
return new IntervalsSourceProvider.Combine(subSources, ordered, maxGaps, filter); return new IntervalsSourceProvider.Combine(subSources, ordered, maxGaps, filter);
default: default:
return createRandomMatch(depth + 1); return createRandomMatch(depth + 1, useScripts);
} }
} }
private IntervalsSourceProvider.IntervalFilter createRandomFilter(int depth) { private IntervalsSourceProvider.IntervalFilter createRandomFilter(int depth, boolean useScripts) {
if (depth < 3 && randomInt(20) > 18) { if (depth < 3 && randomInt(20) > 18) {
if (randomBoolean()) { if (useScripts == false || randomBoolean()) {
return new IntervalsSourceProvider.IntervalFilter(createRandomSource(depth + 1), randomFrom(filters)); return new IntervalsSourceProvider.IntervalFilter(createRandomSource(depth + 1, false), randomFrom(filters));
} }
return new IntervalsSourceProvider.IntervalFilter( return new IntervalsSourceProvider.IntervalFilter(
new Script(ScriptType.INLINE, "mockscript", "1", Collections.emptyMap())); new Script(ScriptType.INLINE, "mockscript", "1", Collections.emptyMap()));
@ -124,7 +124,7 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
return null; return null;
} }
private IntervalsSourceProvider createRandomMatch(int depth) { private IntervalsSourceProvider createRandomMatch(int depth, boolean useScripts) {
String useField = rarely() ? MASKED_FIELD : null; String useField = rarely() ? MASKED_FIELD : null;
int wordCount = randomInt(4) + 1; int wordCount = randomInt(4) + 1;
List<String> words = new ArrayList<>(); List<String> words = new ArrayList<>();
@ -135,7 +135,25 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
boolean mOrdered = randomBoolean(); boolean mOrdered = randomBoolean();
int maxMGaps = randomInt(5) - 1; int maxMGaps = randomInt(5) - 1;
String analyzer = randomFrom("simple", "keyword", "whitespace"); String analyzer = randomFrom("simple", "keyword", "whitespace");
return new IntervalsSourceProvider.Match(text, maxMGaps, mOrdered, analyzer, createRandomFilter(depth + 1), useField); return new IntervalsSourceProvider.Match(text, maxMGaps, mOrdered, analyzer, createRandomFilter(depth + 1, useScripts), useField);
}
@Override
public void testCacheability() throws IOException {
IntervalQueryBuilder queryBuilder = new IntervalQueryBuilder(STRING_FIELD_NAME, createRandomSource(0, false));
QueryShardContext context = createShardContext();
QueryBuilder rewriteQuery = rewriteQuery(queryBuilder, new QueryShardContext(context));
assertNotNull(rewriteQuery.toQuery(context));
assertTrue("query should be cacheable: " + queryBuilder.toString(), context.isCacheable());
IntervalsSourceProvider.IntervalFilter scriptFilter = new IntervalsSourceProvider.IntervalFilter(
new Script(ScriptType.INLINE, "mockscript", "1", Collections.emptyMap())
);
IntervalsSourceProvider source = new IntervalsSourceProvider.Match("text", 0, true, "simple", scriptFilter, null);
queryBuilder = new IntervalQueryBuilder(STRING_FIELD_NAME, source);
rewriteQuery = rewriteQuery(queryBuilder, new QueryShardContext(context));
assertNotNull(rewriteQuery.toQuery(context));
assertFalse("query with scripts should not be cacheable: " + queryBuilder.toString(), context.isCacheable());
} }
@Override @Override
@ -151,7 +169,7 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
if (randomBoolean()) { if (randomBoolean()) {
return new IntervalQueryBuilder(STRING_FIELD_NAME_2, instance.getSourceProvider()); return new IntervalQueryBuilder(STRING_FIELD_NAME_2, instance.getSourceProvider());
} }
return new IntervalQueryBuilder(STRING_FIELD_NAME, createRandomSource(0)); return new IntervalQueryBuilder(STRING_FIELD_NAME, createRandomSource(0, true));
} }
public void testMatchInterval() throws IOException { public void testMatchInterval() throws IOException {