Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove max recursion from Operations.java to AutomatonTestUtil.java (#12298) 

Co-authored-by: tangdonghai <tangdonghai@meituan.com>
This commit is contained in:
tang donghai 2023-05-16 19:09:28 +08:00 committed by GitHub
parent 8af305892d
commit f53eb28af0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java
View File

@ -61,9 +61,6 @@ public final class Operations {
*/ */
public static final int DEFAULT_DETERMINIZE_WORK_LIMIT = 10000; public static final int DEFAULT_DETERMINIZE_WORK_LIMIT = 10000;
/** Maximum level of recursion allowed in recursive operations. */
public static final int MAX_RECURSION_LEVEL = 1000;
private Operations() {} private Operations() {}
/** /**

5
lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/AutomatonTestUtil.java
View File

@ -46,6 +46,9 @@ public class AutomatonTestUtil {
/** Default maximum number of states that {@link Operations#determinize} should create. */ /** Default maximum number of states that {@link Operations#determinize} should create. */
public static final int DEFAULT_MAX_DETERMINIZED_STATES = 1000000; public static final int DEFAULT_MAX_DETERMINIZED_STATES = 1000000;
/** Maximum level of recursion allowed in recursive operations. */
public static final int MAX_RECURSION_LEVEL = 1000;
/** Returns random string, including full unicode range. */ /** Returns random string, including full unicode range. */
public static String randomRegexp(Random r) { public static String randomRegexp(Random r) {
while (true) { while (true) {
@ -483,7 +486,7 @@ public class AutomatonTestUtil {
// large automata could exceed java's stack so the maximum level of recursion is bounded to 1000 // large automata could exceed java's stack so the maximum level of recursion is bounded to 1000
private static boolean isFinite( private static boolean isFinite(
Transition scratch, Automaton a, int state, BitSet path, BitSet visited, int level) { Transition scratch, Automaton a, int state, BitSet path, BitSet visited, int level) {
if (level > Operations.MAX_RECURSION_LEVEL) { if (level > MAX_RECURSION_LEVEL) {
throw new IllegalArgumentException("input automaton is too large: " + level); throw new IllegalArgumentException("input automaton is too large: " + level);
} }
path.set(state); path.set(state);