don't call isFinite from XAnalyzingSuggester; re-enable test on Java 8

This commit is contained in:
mikemccand 2014-05-09 18:23:46 -04:00
parent 90e019b4a4
commit 5e40a4b95a
2 changed files with 1 additions and 10 deletions

View File

@ -903,8 +903,6 @@ public class XAnalyzingSuggester extends Lookup {
replaceSep(automaton, preserveSep, sepLabel); replaceSep(automaton, preserveSep, sepLabel);
assert SpecialOperations.isFinite(automaton);
// Get all paths from the automaton (there can be // Get all paths from the automaton (there can be
// more than one path, eg if the analyzer created a // more than one path, eg if the analyzer created a
// graph using SynFilter or WDF): // graph using SynFilter or WDF):
@ -1091,4 +1089,4 @@ public class XAnalyzingSuggester extends Lookup {
} }
} }
} }

View File

@ -126,13 +126,6 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
final boolean usePayloads = getRandom().nextBoolean(); final boolean usePayloads = getRandom().nextBoolean();
final int options = preserveSeparators ? AnalyzingSuggester.PRESERVE_SEP : 0; final int options = preserveSeparators ? AnalyzingSuggester.PRESERVE_SEP : 0;
// NOTE: remove once we fix isFinite to not
// recurse; this is just a stopgap to mute the test:
// This test fails on Java8, I think because that
// version allocates less stack in the Jenkins envs
// where we run tests
assumeFalse(Constants.JRE_IS_MINIMUM_JAVA8);
XAnalyzingSuggester reference = new XAnalyzingSuggester(new StandardAnalyzer(TEST_VERSION_CURRENT), null, new StandardAnalyzer( XAnalyzingSuggester reference = new XAnalyzingSuggester(new StandardAnalyzer(TEST_VERSION_CURRENT), null, new StandardAnalyzer(
TEST_VERSION_CURRENT), options, 256, -1, preservePositionIncrements, null, false, 1, XAnalyzingSuggester.SEP_LABEL, XAnalyzingSuggester.PAYLOAD_SEP, XAnalyzingSuggester.END_BYTE, XAnalyzingSuggester.HOLE_CHARACTER); TEST_VERSION_CURRENT), options, 256, -1, preservePositionIncrements, null, false, 1, XAnalyzingSuggester.SEP_LABEL, XAnalyzingSuggester.PAYLOAD_SEP, XAnalyzingSuggester.END_BYTE, XAnalyzingSuggester.HOLE_CHARACTER);
LineFileDocs docs = new LineFileDocs(getRandom()); LineFileDocs docs = new LineFileDocs(getRandom());