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

Limit complexity of IntervalQueryBuilderTests#testRandomSource() (#41538) 

IntervalsSources can throw IllegalArgumentExceptions if they would produce
too many disjunctions.  To mitigate against this when building random
sources, we limit the depth of the randomly generated source to four
nested sources

Fixes #41402
This commit is contained in:
Alan Woodward 2019-04-29 13:19:56 +01:00
parent b23709b178
commit a01f451ef7
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,12 +49,7 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
@Override
protected IntervalQueryBuilder doCreateTestQueryBuilder() {
return new IntervalQueryBuilder(STRING_FIELD_NAME, createRandomSource());
}
@Override
public void testUnknownField() throws IOException {
super.testUnknownField();
return new IntervalQueryBuilder(STRING_FIELD_NAME, createRandomSource(0));
}
private static final String[] filters = new String[]{
@ -62,13 +57,6 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
"overlapping", "not_overlapping", "before", "after"
};
private IntervalsSourceProvider.IntervalFilter createRandomFilter() {
if (randomInt(20) > 18) {
return new IntervalsSourceProvider.IntervalFilter(createRandomSource(), randomFrom(filters));
}
return null;
}
private static final String MASKED_FIELD = "masked_field";
private static final String NO_POSITIONS_FIELD = "no_positions_field";
@ -88,29 +76,44 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
new CompressedXContent(Strings.toString(mapping)), MapperService.MergeReason.MAPPING_UPDATE);
}
private IntervalsSourceProvider createRandomSource() {
String useField = rarely() ? MASKED_FIELD : null;
private IntervalsSourceProvider createRandomSource(int depth) {
if (depth > 3) {
return createRandomMatch(depth + 1);
}
switch (randomInt(20)) {
case 0:
case 1:
int orCount = randomInt(4) + 1;
List<IntervalsSourceProvider> orSources = new ArrayList<>();
for (int i = 0; i < orCount; i++) {
orSources.add(createRandomSource());
orSources.add(createRandomSource(depth + 1));
}
return new IntervalsSourceProvider.Disjunction(orSources, createRandomFilter());
return new IntervalsSourceProvider.Disjunction(orSources, createRandomFilter(depth + 1));
case 2:
case 3:
int count = randomInt(5) + 1;
List<IntervalsSourceProvider> subSources = new ArrayList<>();
for (int i = 0; i < count; i++) {
subSources.add(createRandomSource());
subSources.add(createRandomSource(depth + 1));
}
boolean ordered = randomBoolean();
int maxGaps = randomInt(5) - 1;
IntervalsSourceProvider.IntervalFilter filter = createRandomFilter();
IntervalsSourceProvider.IntervalFilter filter = createRandomFilter(depth + 1);
return new IntervalsSourceProvider.Combine(subSources, ordered, maxGaps, filter);
default:
return createRandomMatch(depth + 1);
}
}
private IntervalsSourceProvider.IntervalFilter createRandomFilter(int depth) {
if (depth < 3 && randomInt(20) > 18) {
return new IntervalsSourceProvider.IntervalFilter(createRandomSource(depth + 1), randomFrom(filters));
}
return null;
}
private IntervalsSourceProvider createRandomMatch(int depth) {
String useField = rarely() ? MASKED_FIELD : null;
int wordCount = randomInt(4) + 1;
List<String> words = new ArrayList<>();
for (int i = 0; i < wordCount; i++) {
@ -120,8 +123,7 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
boolean mOrdered = randomBoolean();
int maxMGaps = randomInt(5) - 1;
String analyzer = randomFrom("simple", "keyword", "whitespace");
return new IntervalsSourceProvider.Match(text, maxMGaps, mOrdered, analyzer, createRandomFilter(), useField);
}
return new IntervalsSourceProvider.Match(text, maxMGaps, mOrdered, analyzer, createRandomFilter(depth + 1), useField);
}
@Override
@ -383,5 +385,4 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
}
}