This is an automated email from the ASF dual-hosted git repository.
xuyang pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new bb2ed10471c [fix](protocol) CLIENT_MULTI_STATEMENTS not used actually
(#39308) (#39371)
bb2ed10471c is described below
commit bb2ed10471c283be2aacaf292618275db40dd22f
Author: camby <camby...@tencent.com>
AuthorDate: Thu Aug 15 16:55:51 2024 +0800
[fix](protocol) CLIENT_MULTI_STATEMENTS not used actually (#39308) (#39371)
pick #39308 to branch-2.0
---
.../src/main/java/org/apache/doris/mysql/MysqlChannel.java | 11 +++++++++++
.../src/main/java/org/apache/doris/mysql/MysqlProto.java | 6 ++++++
.../src/main/java/org/apache/doris/qe/ConnectProcessor.java | 2 +-
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlChannel.java
b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlChannel.java
index 4b10dc00656..7c45550f325 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlChannel.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlChannel.java
@@ -80,6 +80,9 @@ public class MysqlChannel implements BytesChannel {
// mysql flag CLIENT_DEPRECATE_EOF
private boolean clientDeprecatedEOF;
+ // mysql flag CLIENT_MULTI_STATEMENTS
+ private boolean clientMultiStatements;
+
private ConnectContext context;
protected MysqlChannel() {
@@ -94,6 +97,14 @@ public class MysqlChannel implements BytesChannel {
return clientDeprecatedEOF;
}
+ public void setClientMultiStatements() {
+ clientMultiStatements = true;
+ }
+
+ public boolean clientMultiStatements() {
+ return clientMultiStatements;
+ }
+
public MysqlChannel(StreamConnection connection, ConnectContext context) {
Preconditions.checkNotNull(connection);
this.sequenceId = 0;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlProto.java
b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlProto.java
index dbc49b1e3bd..3d198adb6e5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlProto.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlProto.java
@@ -205,6 +205,12 @@ public class MysqlProto {
if (capability.isDeprecatedEOF()) {
context.getMysqlChannel().setClientDeprecatedEOF();
}
+
+ // we do not save client capability to context, so here we save
CLIENT_MULTI_STATEMENTS to MysqlChannel
+ if (capability.isClientMultiStatements()) {
+ context.getMysqlChannel().setClientMultiStatements();
+ }
+
MysqlAuthPacket authPacket = new MysqlAuthPacket();
if (!authPacket.readFrom(handshakeResponse)) {
ErrorReport.report(ErrorCode.ERR_NOT_SUPPORTED_AUTH_MODE);
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 d306a533bb2..93e58709e4c 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
@@ -348,7 +348,7 @@ public class ConnectProcessor {
// when client not request CLIENT_MULTI_STATEMENTS, mysql
treat all query as
// single statement. Doris treat it with multi statement,
but only return
// the last statement result.
- if (ctx.getCapability().isClientMultiStatements()) {
+ if (ctx.getMysqlChannel().clientMultiStatements()) {
finalizeCommand();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
