From 277de979c3a46ed63035cd200b4f53c9f7f59f5a Mon Sep 17 00:00:00 2001 From: Siyang Tang <82279870+TangSiyang2001@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:54:21 +0800 Subject: [PATCH] [fix](mysql-channel) initialize mysql serializer by default (#31083) --- .../main/java/org/apache/doris/mysql/DummyMysqlChannel.java | 3 --- .../src/main/java/org/apache/doris/mysql/MysqlChannel.java | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/DummyMysqlChannel.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/DummyMysqlChannel.java index 05b72552f9..4d738cb639 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/DummyMysqlChannel.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/DummyMysqlChannel.java @@ -27,9 +27,6 @@ import java.nio.ByteBuffer; * And don't need to allocate a real ByteBuffer. */ public class DummyMysqlChannel extends MysqlChannel { - public DummyMysqlChannel() { - this.serializer = MysqlSerializer.newInstance(); - } public void setSequenceId(int sequenceId) { this.sequenceId = sequenceId; 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 5dfa7947ab..90354ae9cb 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 @@ -75,7 +75,7 @@ public class MysqlChannel { protected boolean isSslHandshaking; private SSLEngine sslEngine; - protected volatile MysqlSerializer serializer; + protected volatile MysqlSerializer serializer = MysqlSerializer.newInstance(); // mysql flag CLIENT_DEPRECATE_EOF private boolean clientDeprecatedEOF; @@ -111,8 +111,6 @@ public class MysqlChannel { remoteHostPortString = connection.getPeerAddress().toString(); remoteIp = connection.getPeerAddress().toString(); } - // The serializer and buffers should only be created if this is a real MysqlChannel - this.serializer = MysqlSerializer.newInstance(); this.defaultBuffer = ByteBuffer.allocate(16 * 1024); this.headerByteBuffer = ByteBuffer.allocate(PACKET_HEADER_LEN); this.sendBuffer = ByteBuffer.allocate(2 * 1024 * 1024);