You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2020/12/12 14:06:17 UTC
[lucene-solr] 01/01: Revert "LUCENE-9021 QueryParser: re-use the
LookaheadSuccess exception (#962)"
This is an automated email from the ASF dual-hosted git repository.
mkhl pushed a commit to branch revert-962-jira/LUCENE-9021
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 6dfb55d5956bb27a05a3bc184df10705fe835ad8
Author: Mikhail Khludnev <mk...@users.noreply.github.com>
AuthorDate: Sat Dec 12 06:05:58 2020 -0800
Revert "LUCENE-9021 QueryParser: re-use the LookaheadSuccess exception (#962)"
This reverts commit ccf3e604537e884e25d33dc9d921cc5e5e1fa284.
---
gradle/generation/javacc.gradle | 3 ---
lucene/CHANGES.txt | 2 --
.../src/java/org/apache/lucene/queryparser/classic/QueryParser.java | 2 +-
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/gradle/generation/javacc.gradle b/gradle/generation/javacc.gradle
index 339eada..d2b5093 100644
--- a/gradle/generation/javacc.gradle
+++ b/gradle/generation/javacc.gradle
@@ -120,9 +120,6 @@ configure(project(":lucene:queryparser")) {
text = text.replace(
"new java.util.ArrayList<int[]>",
"new java.util.ArrayList<>")
- text = text.replace(
- "final private LookaheadSuccess jj_ls =",
- "static final private LookaheadSuccess jj_ls =")
return text
})
}
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 23a4717..543611f 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -253,8 +253,6 @@ Optimizations
* LUCENE-9536: Reduced memory usage for OrdinalMap when a segment has all
values. (Julie Tibshirani via Adrien Grand)
-
-* LUCENE-9021: QueryParser: re-use the LookaheadSuccess exception. (Przemek Bruski via Mikhail Khludnev)
Bug Fixes
---------------------
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
index dd03bac..2748816 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
@@ -869,7 +869,7 @@ if (splitOnWhitespace == false) {
@SuppressWarnings("serial")
static private final class LookaheadSuccess extends java.lang.Error { }
- static final private LookaheadSuccess jj_ls = new LookaheadSuccess();
+ final private LookaheadSuccess jj_ls = new LookaheadSuccess();
private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) {
jj_la--;