This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit eb208d2dbd82dbf1026ea4b189f0f9de528dd7a9 Author: Yongqiang YANG <98214048+dataroar...@users.noreply.github.com> AuthorDate: Fri Mar 8 22:50:17 2024 +0800 [fix](forward) set error code for query state to handle exception of (#31975) --- fe/fe-core/src/main/java/org/apache/doris/qe/QueryState.java | 3 +-- .../src/test/java/org/apache/doris/mysql/MysqlErrPacketTest.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 a5f52f26288..8d66fd957ba 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 @@ -93,8 +93,7 @@ public class QueryState { } public void setError(String errorMsg) { - this.stateType = MysqlStateType.ERR; - this.errorMessage = errorMsg; + this.setError(ErrorCode.ERR_UNKNOWN_ERROR, errorMsg); } public void setError(ErrorCode code, String msg) { diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlErrPacketTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlErrPacketTest.java index 0a296a324fb..a57e6d669ae 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlErrPacketTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlErrPacketTest.java @@ -46,7 +46,7 @@ public class MysqlErrPacketTest { // assert indicator Assert.assertEquals(0xff, MysqlProto.readInt1(buffer)); // error code - Assert.assertEquals(1064, MysqlProto.readInt2(buffer)); + Assert.assertEquals(1105, MysqlProto.readInt2(buffer)); // sql state marker Assert.assertEquals('#', MysqlProto.readInt1(buffer)); // sql state --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org