Apache Lucene open-source search software
Early exit from Operations#removeDeadStates when an automaton doesn't have dead states. (#13721)
Adrien Grand4c27bccac544
diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.javaindex 7ad9eedda6f..34a18446191 100644--- a/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java+++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java@@ -339,6 +339,7 @@ public class Automaton implements Accountable, TransitionAccessor {@Overridepublic int getNumTransitions(int state) {assert state >= 0;+ assert state < getNumStates();int count = states[2 * state + 1];if (count == -1) {return 0;diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java b/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.javaindex b9030c19cf0..e141b4b95cf 100644--- a/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java+++ b/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java@@ -86,7 +86,7 @@ public class FiniteStringsIterator {this.emitEmptyString = a.isAccept(0);// Start iteration with node startState.- if (a.getNumTransitions(startState) > 0) {+ if (a.getNumStates() > startState && a.getNumTransitions(startState) > 0) {pathStates.set(startState);nodes[0].resetState(a, startState);string.append(startState);diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.javaindex a29b8b42f97..3cb02c77a82 100644--- a/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java+++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java@@ -986,6 +986,9 @@ public final class Operations {public static Automaton removeDeadStates(Automaton a) {int numStates = a.getNumStates();BitSet liveSet = getLiveStates(a);+ if (liveSet.cardinality() == numStates) {+ return a;+ }int[] map = new int[numStates];