This is an automated email from the ASF dual-hosted git repository.
lijibing pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new abf1d5f07d3 branch-2.1: [improvement](mysql)Support mysql
COM_RESET_CONNECTION command. #44747 (#44788)
abf1d5f07d3 is described below
commit abf1d5f07d3d8198d1a24e92dd8c147c505a65d1
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 2 12:58:38 2024 +0800
branch-2.1: [improvement](mysql)Support mysql COM_RESET_CONNECTION command.
#44747 (#44788)
Cherry-picked from #44747
Co-authored-by: James <[email protected]>
---
fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java | 5 +++++
fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java | 7 +++++++
.../src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java | 3 +++
3 files changed, 15 insertions(+)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
index e9ef33bd146..c41beba5a6e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -338,6 +338,11 @@ public class ConnectContext {
return lastDBOfCatalog.get(catalog);
}
+ // Used by COM_RESET_CONNECTION
+ public void clearLastDBOfCatalog() {
+ lastDBOfCatalog.clear();
+ }
+
public void setNotEvalNondeterministicFunction(boolean
notEvalNondeterministicFunction) {
this.notEvalNondeterministicFunction = notEvalNondeterministicFunction;
}
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 2a85af3a92f..d2b69e3798b 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
@@ -43,6 +43,7 @@ import org.apache.doris.common.util.SqlParserUtils;
import org.apache.doris.common.util.SqlUtils;
import org.apache.doris.common.util.Util;
import org.apache.doris.datasource.CatalogIf;
+import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.metric.MetricRepo;
import org.apache.doris.mysql.MysqlChannel;
import org.apache.doris.mysql.MysqlCommand;
@@ -186,6 +187,12 @@ public abstract class ConnectProcessor {
ctx.getState().setOk();
}
+ protected void handleResetConnection() {
+ ctx.changeDefaultCatalog(InternalCatalog.INTERNAL_CATALOG_NAME);
+ ctx.clearLastDBOfCatalog();
+ ctx.getState().setOk();
+ }
+
protected void handleStmtReset() {
ctx.getState().setOk();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java
index 931dc3d4717..f86833451f8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java
@@ -340,6 +340,9 @@ public class MysqlConnectProcessor extends ConnectProcessor
{
case COM_SET_OPTION:
handleSetOption();
break;
+ case COM_RESET_CONNECTION:
+ handleResetConnection();
+ break;
default:
ctx.getState().setError(ErrorCode.ERR_UNKNOWN_COM_ERROR,
"Unsupported command(" + command + ")");
LOG.warn("Unsupported command(" + command + ")");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
