This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new c1e31a4e257 [Improve](audit) sql that fails to be syntax parsed is not
audited (#48527)
c1e31a4e257 is described below
commit c1e31a4e2571d6c9f89c01b0a83e731c8cbb2e96
Author: shee <[email protected]>
AuthorDate: Thu Oct 30 14:22:08 2025 +0800
[Improve](audit) sql that fails to be syntax parsed is not audited (#48527)
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #47595
Problem Summary:
For PR #47595 , set `stmt` to `error messsage` of
`org.apache.doris.qe.QueryState.ErrType#ANALYSIS_ERR` of query audit, so
many of the original SQL will be abandoned, this is very unreasonable,
It is now more appropriate to set stmt to error message only for queries
that are syntax parsed incorrectly
Now only sql with syntax errors is ignored
Co-authored-by: garenshi <[email protected]>
---
.../nereids/exceptions/SyntaxParseException.java | 32 +++++
.../doris/nereids/parser/ParseErrorListener.java | 3 +-
.../java/org/apache/doris/qe/AuditLogHelper.java | 9 +-
.../java/org/apache/doris/qe/ConnectProcessor.java | 18 ++-
.../main/java/org/apache/doris/qe/QueryState.java | 2 +
.../doris/nereids/parser/EncryptSQLTest.java | 149 ++++++++++++---------
.../doris/nereids/parser/NereidsParserTest.java | 61 ++++-----
.../trees/expressions/ExpressionParserTest.java | 4 +-
8 files changed, 173 insertions(+), 105 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/exceptions/SyntaxParseException.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/exceptions/SyntaxParseException.java
new file mode 100644
index 00000000000..cced3579249
--- /dev/null
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/exceptions/SyntaxParseException.java
@@ -0,0 +1,32 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.exceptions;
+
+import org.apache.doris.nereids.parser.Origin;
+
+import java.util.Optional;
+
+/**
+ * syntax parse exception
+ */
+public class SyntaxParseException extends ParseException {
+
+ public SyntaxParseException(String message, Origin start, Optional<String>
command) {
+ super(message, start, command);
+ }
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/ParseErrorListener.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/ParseErrorListener.java
index 749b37eae0c..56e56c87099 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/ParseErrorListener.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/ParseErrorListener.java
@@ -18,6 +18,7 @@
package org.apache.doris.nereids.parser;
import org.apache.doris.nereids.exceptions.ParseException;
+import org.apache.doris.nereids.exceptions.SyntaxParseException;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CommonToken;
@@ -40,6 +41,6 @@ public class ParseErrorListener extends BaseErrorListener {
} else {
start = new Origin(line, charPositionInLine);
}
- throw new ParseException(msg, start, Optional.empty());
+ throw new SyntaxParseException(msg, start, Optional.empty());
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
index 2c69445c5e6..536194a8c0d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
@@ -406,9 +406,12 @@ public class AuditLogHelper {
statistics == null ? 0 :
statistics.getScanBytesFromRemoteStorage());
}
- boolean isAnalysisErr = ctx.getState().getStateType() ==
MysqlStateType.ERR
- && ctx.getState().getErrType() ==
QueryState.ErrType.ANALYSIS_ERR;
- String encryptSql = isAnalysisErr ? ctx.getState().getErrorMessage() :
origStmt;
+ boolean isSyntaxErr = ctx.getState().getStateType() ==
MysqlStateType.ERR
+ && ctx.getState().getErrType() ==
QueryState.ErrType.SYNTAX_PARSE_ERR;
+ String encryptSql = isSyntaxErr ? "Syntax Error" : origStmt;
+ if (isSyntaxErr) {
+ auditEventBuilder.setErrorMessage("Syntax Error");
+ }
// We put origin query stmt at the end of audit log, for parsing the
log more convenient.
if (parsedStmt instanceof LogicalPlanAdapter) {
LogicalPlan logicalPlan = ((LogicalPlanAdapter)
parsedStmt).getLogicalPlan();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
index 5b8ea1dd1e2..cb6d36dfe83 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
@@ -49,6 +49,7 @@ import org.apache.doris.nereids.SqlCacheContext;
import org.apache.doris.nereids.SqlCacheContext.CacheKeyType;
import org.apache.doris.nereids.StatementContext;
import org.apache.doris.nereids.exceptions.NotSupportedException;
+import org.apache.doris.nereids.exceptions.SyntaxParseException;
import org.apache.doris.nereids.glue.LogicalPlanAdapter;
import org.apache.doris.nereids.minidump.MinidumpUtils;
import org.apache.doris.nereids.parser.NereidsParser;
@@ -428,7 +429,7 @@ public abstract class ConnectProcessor {
SessionVariable sessionVariable) throws ConnectionException {
try {
return new NereidsParser().parseSQL(convertedStmt,
sessionVariable);
- } catch (NotSupportedException e) {
+ } catch (NotSupportedException | SyntaxParseException e) {
List<StatementBase> stmts = tryRetryOriginalSql(originStmt,
convertedStmt, sessionVariable);
if (stmts == null) {
handleQueryException(e, convertedStmt, null, null);
@@ -483,31 +484,34 @@ public abstract class ConnectProcessor {
if (ctx.getMinidump() != null) {
MinidumpUtils.saveMinidumpString(ctx.getMinidump(),
DebugUtil.printId(ctx.queryId()));
}
- if (throwable instanceof ConnectionException) {
+ if (throwable instanceof SyntaxParseException) {
+ // Syntax parse exception.
+ Throwable e = new AnalysisException(throwable.getMessage(),
throwable);
+ ctx.getState().setError(ErrorCode.ERR_UNKNOWN_ERROR,
e.getMessage());
+ ctx.getState().setErrType(QueryState.ErrType.SYNTAX_PARSE_ERR);
+ } else if (throwable instanceof ConnectionException) {
// Throw this exception to close the connection outside.
- LOG.warn("Process one query failed because ConnectionException: ",
throwable);
throw (ConnectionException) throwable;
} else if (throwable instanceof IOException) {
// Client failed.
- LOG.warn("Process one query failed because IOException: ",
throwable);
ctx.getState().setError(ErrorCode.ERR_UNKNOWN_ERROR, "Doris
process failed: " + throwable.getMessage());
} else if (throwable instanceof UserException) {
- LOG.warn("Process one query failed because.", throwable);
ctx.getState().setError(((UserException)
throwable).getMysqlErrorCode(), throwable.getMessage());
// set it as ANALYSIS_ERR so that it won't be treated as a query
failure.
ctx.getState().setErrType(QueryState.ErrType.ANALYSIS_ERR);
} else if (throwable instanceof NotSupportedException) {
- LOG.warn("Process one query failed because.", throwable);
ctx.getState().setError(ErrorCode.ERR_NOT_SUPPORTED_YET,
throwable.getMessage());
// set it as ANALYSIS_ERR so that it won't be treated as a query
failure.
ctx.getState().setErrType(QueryState.ErrType.ANALYSIS_ERR);
} else {
// Catch all throwable.
// If reach here, maybe palo bug.
- LOG.warn("Process one query failed because unknown reason: ",
throwable);
ctx.getState().setError(ErrorCode.ERR_UNKNOWN_ERROR,
throwable.getClass().getSimpleName() + ", msg: " +
throwable.getMessage());
}
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Process one query failed because: {}",
throwable.getMessage());
+ }
auditAfterExec(origStmt, parsedStmt, statistics, true);
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryState.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryState.java
index 89c44babad9..e4592b2b983 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryState.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryState.java
@@ -36,6 +36,7 @@ public class QueryState {
public enum ErrType {
ANALYSIS_ERR,
+ SYNTAX_PARSE_ERR,
OTHER_ERR
}
@@ -59,6 +60,7 @@ public class QueryState {
public void reset() {
stateType = MysqlStateType.OK;
errorCode = null;
+ errType = ErrType.OTHER_ERR;
infoMessage = null;
errorMessage = "";
serverStatus = 0;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/EncryptSQLTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/EncryptSQLTest.java
index b4e19fa55b5..e41245b7cf4 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/EncryptSQLTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/EncryptSQLTest.java
@@ -17,14 +17,18 @@
package org.apache.doris.nereids.parser;
-import org.apache.doris.analysis.StatementBase;
+import org.apache.doris.analysis.AccessTestUtil;
import org.apache.doris.catalog.Env;
+import org.apache.doris.common.Config;
import org.apache.doris.common.jmockit.Deencapsulation;
import org.apache.doris.plugin.AuditEvent;
-import org.apache.doris.qe.AuditLogHelper;
import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.MysqlConnectProcessor;
+import org.apache.doris.qe.StmtExecutor;
import org.apache.doris.resource.workloadschedpolicy.WorkloadRuntimeStatusMgr;
+import mockit.Mock;
+import mockit.MockUp;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -32,14 +36,23 @@ import java.util.List;
public class EncryptSQLTest extends ParserTestBase {
- NereidsParser parser = new NereidsParser();
ConnectContext ctx = ConnectContext.get();
WorkloadRuntimeStatusMgr mgr =
Env.getCurrentEnv().getWorkloadRuntimeStatusMgr();
List<AuditEvent> auditEvents = Deencapsulation.getField(mgr,
"queryAuditEventList");
+ MysqlConnectProcessor processor = new MysqlConnectProcessor(ctx);
+ Env env = AccessTestUtil.fetchAdminCatalog();
@Test
- public void testEncryption() {
+ public void testEncryption() throws Exception {
ctx.setDatabase("test");
+ new MockUp<StmtExecutor>() {
+ @Mock
+ public boolean isForwardToMaster() {
+ return false;
+ }
+ };
+ ctx.setEnv(env);
+ Config.enable_nereids_load = true;
String sql = "EXPORT TABLE export_table TO \"s3://abc/aaa\" "
+ "PROPERTIES("
@@ -182,71 +195,71 @@ public class EncryptSQLTest extends ParserTestBase {
+ ")";
res = "CREATE EXTERNAL TABLE broker_tbl("
- + " k1 tinyint,"
- + " k2 smallint,"
- + " k3 int,"
- + " k4 bigint) "
- + "ENGINE=broker "
- + "PROPERTIES("
- + " \"broker_name\" = \"hdfs\","
- + " \"path\" = \"hdfs://abc/qe/a.txt\""
- + ") "
- + "BROKER PROPERTIES("
- + " \"username\" = \"root\","
- + " \"password\" = \"*XXX\""
- + ")";
+ + " k1 tinyint,"
+ + " k2 smallint,"
+ + " k3 int,"
+ + " k4 bigint) "
+ + "ENGINE=broker "
+ + "PROPERTIES("
+ + " \"broker_name\" = \"hdfs\","
+ + " \"path\" = \"hdfs://abc/qe/a.txt\""
+ + ") "
+ + "BROKER PROPERTIES("
+ + " \"username\" = \"root\","
+ + " \"password\" = \"*XXX\""
+ + ")";
parseAndCheck(sql, res);
sql = "INSERT INTO test_s3load "
- + "SELECT * FROM s3_tbl("
- + " \"uri\" = \"s3://your_bucket_name/s3load_example.csv\","
- + " \"format\" = \"csv\","
- + " \"provider\" = \"OSS\","
- + " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
- + " \"s3.region\" = \"oss-cn-hangzhou\","
- + " \"s3.access_key\" = \"abc\","
- + " \"s3.secret_key\" = \"abc\","
- + " \"column_separator\" = \",\","
- + " \"csv_schema\" = \"user_id:int;name:string;age:int\""
- + ")";
+ + "SELECT * FROM s3_tbl("
+ + " \"uri\" = \"s3://your_bucket_name/s3load_example.csv\","
+ + " \"format\" = \"csv\","
+ + " \"provider\" = \"OSS\","
+ + " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
+ + " \"s3.region\" = \"oss-cn-hangzhou\","
+ + " \"s3.access_key\" = \"abc\","
+ + " \"s3.secret_key\" = \"abc\","
+ + " \"column_separator\" = \",\","
+ + " \"csv_schema\" = \"user_id:int;name:string;age:int\""
+ + ")";
res = "INSERT INTO test_s3load "
- + "SELECT * FROM s3_tbl("
- + " \"uri\" = \"s3://your_bucket_name/s3load_example.csv\","
- + " \"format\" = \"csv\","
- + " \"provider\" = \"OSS\","
- + " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
- + " \"s3.region\" = \"oss-cn-hangzhou\","
- + " \"s3.access_key\" = \"abc\","
- + " \"s3.secret_key\" = \"*XXX\","
- + " \"column_separator\" = \",\","
- + " \"csv_schema\" = \"user_id:int;name:string;age:int\""
- + ")";
+ + "SELECT * FROM s3_tbl("
+ + " \"uri\" = \"s3://your_bucket_name/s3load_example.csv\","
+ + " \"format\" = \"csv\","
+ + " \"provider\" = \"OSS\","
+ + " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
+ + " \"s3.region\" = \"oss-cn-hangzhou\","
+ + " \"s3.access_key\" = \"abc\","
+ + " \"s3.secret_key\" = \"*XXX\","
+ + " \"column_separator\" = \",\","
+ + " \"csv_schema\" = \"user_id:int;name:string;age:int\""
+ + ")";
parseAndCheck(sql, res);
sql = "SELECT * FROM s3_tbl("
- + " \"uri\" = \"s3://your_bucket_name/s3load_example.csv\","
- + " \"format\" = \"csv\","
- + " \"provider\" = \"OSS\","
- + " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
- + " \"s3.region\" = \"oss-cn-hangzhou\","
- + " \"s3.access_key\" = \"abc\","
- + " \"s3.secret_key\" = \"abc\","
- + " \"column_separator\" = \",\","
- + " \"csv_schema\" = \"user_id:int;name:string;age:int\""
- + ")";
+ + " \"uri\" = \"s3://your_bucket_name/s3load_example.csv\","
+ + " \"format\" = \"csv\","
+ + " \"provider\" = \"OSS\","
+ + " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
+ + " \"s3.region\" = \"oss-cn-hangzhou\","
+ + " \"s3.access_key\" = \"abc\","
+ + " \"s3.secret_key\" = \"abc\","
+ + " \"column_separator\" = \",\","
+ + " \"csv_schema\" = \"user_id:int;name:string;age:int\""
+ + ")";
res = "SELECT * FROM s3_tbl("
- + " \"uri\" = \"s3://your_bucket_name/s3load_example.csv\","
- + " \"format\" = \"csv\","
- + " \"provider\" = \"OSS\","
- + " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
- + " \"s3.region\" = \"oss-cn-hangzhou\","
- + " \"s3.access_key\" = \"abc\","
- + " \"s3.secret_key\" = \"*XXX\","
- + " \"column_separator\" = \",\","
- + " \"csv_schema\" = \"user_id:int;name:string;age:int\""
- + ")";
+ + " \"uri\" = \"s3://your_bucket_name/s3load_example.csv\","
+ + " \"format\" = \"csv\","
+ + " \"provider\" = \"OSS\","
+ + " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
+ + " \"s3.region\" = \"oss-cn-hangzhou\","
+ + " \"s3.access_key\" = \"abc\","
+ + " \"s3.secret_key\" = \"*XXX\","
+ + " \"column_separator\" = \",\","
+ + " \"csv_schema\" = \"user_id:int;name:string;age:int\""
+ + ")";
parseAndCheck(sql, res);
sql = "SET LDAP_ADMIN_PASSWORD = PASSWORD('123456')";
@@ -316,11 +329,23 @@ public class EncryptSQLTest extends ParserTestBase {
+ " \"s3.secret_key\" = \"*XXX\""
+ " );";
parseAndCheck(sql, res);
+
+ sql = "selected * from tbl";
+ res = "Syntax Error";
+ parseAndCheck(sql, res);
+
+ sql = "select * from tbl";
+ res = "select * from tbl";
+ processor.executeQuery(sql);
+ AuditEvent event = auditEvents.get(auditEvents.size() - 1);
+ Assertions.assertEquals(res, event.stmt);
+
+ String errorMsg = "errCode = 2, detailMessage = Database [test] does
not exist.";
+ Assertions.assertTrue(event.errorMessage.contains(errorMsg));
}
- private void parseAndCheck(String sql, String expected) {
- StatementBase parsedStmt = parser.parseSQL(sql).get(0);
- AuditLogHelper.logAuditLog(ctx, sql, parsedStmt, null, false);
+ private void parseAndCheck(String sql, String expected) throws Exception {
+ processor.executeQuery(sql);
AuditEvent event = auditEvents.get(auditEvents.size() - 1);
Assertions.assertEquals(expected, event.stmt);
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/NereidsParserTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/NereidsParserTest.java
index 98c8edbbeb6..0d900ff31df 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/NereidsParserTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/NereidsParserTest.java
@@ -26,6 +26,7 @@ import org.apache.doris.nereids.analyzer.UnboundFunction;
import org.apache.doris.nereids.analyzer.UnboundOneRowRelation;
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.exceptions.ParseException;
+import org.apache.doris.nereids.exceptions.SyntaxParseException;
import org.apache.doris.nereids.glue.LogicalPlanAdapter;
import org.apache.doris.nereids.trees.expressions.Cast;
import org.apache.doris.nereids.trees.expressions.Expression;
@@ -92,7 +93,7 @@ public class NereidsParserTest extends ParserTestBase {
public void testParseMultipleError() {
NereidsParser nereidsParser = new NereidsParser();
String sql = "SELECT b FROM test SELECT a FROM test;";
- Assertions.assertThrowsExactly(ParseException.class, () ->
nereidsParser.parseMultiple(sql));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
nereidsParser.parseMultiple(sql));
}
@Test
@@ -112,7 +113,7 @@ public class NereidsParserTest extends ParserTestBase {
@Test
public void testErrorListener() {
parsePlan("select * from t1 where a = 1 illegal_symbol")
- .assertThrowsExactly(ParseException.class)
+ .assertThrowsExactly(SyntaxParseException.class)
.assertMessageEquals("\nextraneous input 'illegal_symbol'
expecting {<EOF>, ';'}(line 1, pos 29)\n");
}
@@ -161,7 +162,7 @@ public class NereidsParserTest extends ParserTestBase {
Assertions.assertEquals(((LogicalAggregate<?>)
logicalPlan).getOutputExpressions().size(), 3);
String windowSql3 = "select rank() over from t1";
- parsePlan(windowSql3).assertThrowsExactly(ParseException.class)
+ parsePlan(windowSql3).assertThrowsExactly(SyntaxParseException.class)
.assertMessageContains("mismatched input 'from' expecting
'('");
}
@@ -396,7 +397,7 @@ public class NereidsParserTest extends ParserTestBase {
// invalid hint position
parsePlan("select * from [shuffle] t1 join t2 on t1.keyy=t2.keyy")
- .assertThrowsExactly(ParseException.class);
+ .assertThrowsExactly(SyntaxParseException.class);
// invalid hint content
parsePlan("select * from t1 join [bucket] t2 on t1.keyy=t2.keyy")
@@ -410,7 +411,7 @@ public class NereidsParserTest extends ParserTestBase {
// invalid multiple hints
parsePlan("select * from t1 join [shuffle,broadcast] t2 on
t1.keyy=t2.keyy")
- .assertThrowsExactly(ParseException.class);
+ .assertThrowsExactly(SyntaxParseException.class);
}
@Test
@@ -1058,10 +1059,10 @@ public class NereidsParserTest extends ParserTestBase {
Assertions.assertEquals(1, unboundFunction.arity());
Assertions.assertEquals("1", ((StringLikeLiteral)
unboundFunction.child(0)).getStringValue());
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("trim(invalid '2' from '1')"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("trim(invalid '2' '1')"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("trim(from '1')"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("trim(both '1')"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("trim(invalid '2' from '1')"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("trim(invalid '2' '1')"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("trim(from '1')"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("trim(both '1')"));
}
@Test
@@ -1109,11 +1110,11 @@ public class NereidsParserTest extends ParserTestBase {
Assertions.assertEquals("Quadratically", ((StringLikeLiteral)
unboundFunction.child(0)).getStringValue());
Assertions.assertEquals(5, ((IntegerLikeLiteral)
unboundFunction.child(1)).getIntValue());
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substring('Sakila' for 2)"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substring('Sakila' from for)"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substring('Sakila' from)"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substring(from 1)"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substring(for 1)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substring('Sakila' for 2)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substring('Sakila' from for)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substring('Sakila' from)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substring(from 1)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substring(for 1)"));
}
@Test
@@ -1161,11 +1162,11 @@ public class NereidsParserTest extends ParserTestBase {
Assertions.assertEquals("Quadratically", ((StringLikeLiteral)
unboundFunction.child(0)).getStringValue());
Assertions.assertEquals(5, ((IntegerLikeLiteral)
unboundFunction.child(1)).getIntValue());
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substr('Sakila' for 2)"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substr('Sakila' from for)"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substr('Sakila' from)"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substr(from 1)"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("substr(for 1)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substr('Sakila' for 2)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substr('Sakila' from for)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substr('Sakila' from)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substr(from 1)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("substr(for 1)"));
}
@Test
@@ -1184,9 +1185,9 @@ public class NereidsParserTest extends ParserTestBase {
Assertions.assertEquals("bar", ((StringLikeLiteral)
unboundFunction.child(0)).getStringValue());
Assertions.assertEquals("foobarbar", ((StringLikeLiteral)
unboundFunction.child(1)).getStringValue());
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("position('bar' in)"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("position(in 'foobarbar')"));
- Assertions.assertThrowsExactly(ParseException.class, () ->
parser.parseExpression("position(in)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("position('bar' in)"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("position(in 'foobarbar')"));
+ Assertions.assertThrowsExactly(SyntaxParseException.class, () ->
parser.parseExpression("position(in)"));
}
@Test
@@ -1224,7 +1225,7 @@ public class NereidsParserTest extends ParserTestBase {
try (MockedStatic<SqlModeHelper> helperMockedStatic =
Mockito.mockStatic(SqlModeHelper.class)) {
helperMockedStatic.when(SqlModeHelper::hasNoBackSlashEscapes).thenReturn(true);
if (onResult == null) {
- Assertions.assertThrowsExactly(ParseException.class, () ->
nereidsParser.parseExpression(sql),
+ Assertions.assertThrowsExactly(SyntaxParseException.class, ()
-> nereidsParser.parseExpression(sql),
"should failed when NO_BACKSLASH_ESCAPES = 1: " + sql);
} else {
Assertions.assertEquals(onResult,
@@ -1236,7 +1237,7 @@ public class NereidsParserTest extends ParserTestBase {
try (MockedStatic<SqlModeHelper> helperMockedStatic =
Mockito.mockStatic(SqlModeHelper.class)) {
helperMockedStatic.when(SqlModeHelper::hasNoBackSlashEscapes).thenReturn(false);
if (offResult == null) {
- Assertions.assertThrowsExactly(ParseException.class, () ->
nereidsParser.parseExpression(sql),
+ Assertions.assertThrowsExactly(SyntaxParseException.class, ()
-> nereidsParser.parseExpression(sql),
"should failed when NO_BACKSLASH_ESCAPES = 0: " + sql);
} else {
Assertions.assertEquals(offResult,
@@ -1276,35 +1277,35 @@ public class NereidsParserTest extends ParserTestBase {
@Test
public void testLambdaSelect() {
parsePlan("SELECT x -> x + 1")
- .assertThrowsExactly(ParseException.class)
+ .assertThrowsExactly(SyntaxParseException.class)
.assertMessageContains("mismatched input '->' expecting
{<EOF>, ';'}");
}
@Test
public void testLambdaGroupBy() {
parsePlan("SELECT 1 from ( select 2 ) t group by x -> x + 1")
- .assertThrowsExactly(ParseException.class)
+ .assertThrowsExactly(SyntaxParseException.class)
.assertMessageContains("mismatched input '->' expecting
{<EOF>, ';'}");
}
@Test
public void testLambdaSort() {
parsePlan("SELECT 1 from ( select 2 ) t order by x -> x + 1")
- .assertThrowsExactly(ParseException.class)
+ .assertThrowsExactly(SyntaxParseException.class)
.assertMessageContains("mismatched input '->' expecting
{<EOF>, ';'}");
}
@Test
public void testLambdaHaving() {
parsePlan("SELECT 1 from ( select 2 ) t having x -> x + 1")
- .assertThrowsExactly(ParseException.class)
+ .assertThrowsExactly(SyntaxParseException.class)
.assertMessageContains("mismatched input '->' expecting
{<EOF>, ';'}");
}
@Test
public void testLambdaJoin() {
parsePlan("SELECT 1 from ( select 2 as a1 ) t1 join ( select 2 as a2 )
as t2 on x -> x + 1 = t1.a1")
- .assertThrowsExactly(ParseException.class)
+ .assertThrowsExactly(SyntaxParseException.class)
.assertMessageContains("mismatched input '->' expecting
{<EOF>, ';'}");
}
@@ -1364,7 +1365,7 @@ public class NereidsParserTest extends ParserTestBase {
nereidsParser.parseSingle(sql);
parsePlan("admin rotate tde root key properties()")
- .assertThrowsExactly(ParseException.class)
+ .assertThrowsExactly(SyntaxParseException.class)
.assertMessageContains("mismatched input ')' expecting");
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/ExpressionParserTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/ExpressionParserTest.java
index f33bd493824..41017520046 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/ExpressionParserTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/ExpressionParserTest.java
@@ -18,7 +18,7 @@
package org.apache.doris.nereids.trees.expressions;
import org.apache.doris.nereids.analyzer.UnboundSlot;
-import org.apache.doris.nereids.exceptions.ParseException;
+import org.apache.doris.nereids.exceptions.SyntaxParseException;
import org.apache.doris.nereids.parser.NereidsParser;
import org.apache.doris.nereids.parser.ParserTestBase;
import org.apache.doris.nereids.trees.expressions.literal.StringLiteral;
@@ -149,7 +149,7 @@ public class ExpressionParserTest extends ParserTestBase {
assertExpr(subtract);
parseExpression("3 += 2")
- .assertThrowsExactly(ParseException.class)
+ .assertThrowsExactly(SyntaxParseException.class)
.assertMessageContains("extraneous input '=' expecting {'(");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
