Skip to content

[Parser] Skip error recovery in the SLL stage of the tree and table SQL parsers #19175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackieTien97 merged 1 commit into from
Nov 8, 2026
Merged

[Parser] Skip error recovery in the SLL stage of the tree and table SQL parsers #19175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...atanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
import org.apache.iotdb.service.rpc.thrift.TSSetSchemaTemplateReq;
import org.apache.iotdb.service.rpc.thrift.TSUnsetSchemaTemplateReq;

import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
Expand Down Expand Up @@ -857,6 +858,9 @@ private static Statement invokeParser(String sql, ZoneId zoneId) {

IoTDBSqlParser parser1 = new IoTDBSqlParser(tokens1);
parser1.getInterpreter().setPredictionMode(PredictionMode.SLL);
// Any error in this stage falls back to the LL stage below, which reports it, so
// the SLL stage needs no recovery; BailErrorStrategy also skips the per-rule sync() checks.
parser1.setErrorHandler(new BailErrorStrategy());
parser1.removeErrorListeners();
parser1.addErrorListener(SqlParseError.INSTANCE);

Expand Down
13 changes: 10 additions & 3 deletions ...e/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser;

import org.antlr.v4.runtime.ANTLRErrorListener;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonToken;
Expand All @@ -47,6 +48,7 @@
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.atn.PredictionMode;
import org.antlr.v4.runtime.misc.Pair;
import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.antlr.v4.runtime.tree.TerminalNode;

import java.time.ZoneId;
Expand Down Expand Up @@ -158,7 +160,7 @@ private Node invokeParser(

// Override the default error strategy to not attempt inserting or deleting a token.
// Otherwise, it messes up error reporting
parser.setErrorHandler(
DefaultErrorStrategy reportingErrorStrategy =
new DefaultErrorStrategy() {
@Override
public Token recoverInline(Parser recognizer) throws RecognitionException {
Expand All @@ -167,7 +169,11 @@ public Token recoverInline(Parser recognizer) throws RecognitionException {
}
throw new InputMismatchException(recognizer, nextTokensState, nextTokensContext);
}
});
};
// Any error in the SLL stage falls back to the LL stage, which reports it with the strategy
// above, so the SLL stage needs no recovery; BailErrorStrategy also skips the per-rule sync()
// checks.
parser.setErrorHandler(new BailErrorStrategy());

parser.addParseListener(new PostProcessor(Arrays.asList(parser.getRuleNames()), parser));

Expand All @@ -183,10 +189,11 @@ public Token recoverInline(Parser recognizer) throws RecognitionException {
// first, try parsing with potentially faster SLL mode
parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
tree = parseFunction.apply(parser);
} catch (ParsingException ex) {
} catch (ParsingException | ParseCancellationException ex) {
// if we fail, parse with LL mode
tokenStream.seek(0); // rewind input stream
parser.reset();
parser.setErrorHandler(reportingErrorStrategy);

parser.getInterpreter().setPredictionMode(PredictionMode.LL);
tree = parseFunction.apply(parser);
Expand Down
Loading