From 200210e7084ecb100b4c0a975a99df1015a89b60 Mon Sep 17 00:00:00 2001
From: Zhengguo Yang <yangzhgg@gmail.com>
Date: Mon, 6 Dec 2021 11:13:01 +0800
Subject: [PATCH] [fix] (ut) fix fe unit test failed, this is because we fix
 the MAX_PHYSICAL_PACKET_LENGTH to 0xffffff

---
 fe/fe-core/pom.xml                                       | 4 ++--
 .../java/org/apache/doris/mysql/MysqlChannelTest.java    | 9 +++++----
 fe/pom.xml                                               | 3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 51f50abf85..22d48d0841 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -714,10 +714,10 @@ under the License.
                 <configuration>
                     <!-->set larger, eg, 3, to reduce the time or running FE unit tests<-->
                     <forkCount>${fe_ut_parallel}</forkCount>
-                    <!-->not reuse forked jvm, so that each unit test will run in separate jvm. to avoid singleton confict<-->
+                    <!-->not reuse forked jvm, so that each unit test will run in separate jvm. to avoid singleton conflict<-->
                     <reuseForks>false</reuseForks>
                     <argLine>
-                        -javaagent:${settings.localRepository}/org/jmockit/jmockit/1.48/jmockit-1.48.jar
+                        -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
                     </argLine>
                 </configuration>
             </plugin>
diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlChannelTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlChannelTest.java
index 417480e9c4..a2a05a63b4 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlChannelTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlChannelTest.java
@@ -20,6 +20,7 @@ package org.apache.doris.mysql;
 import mockit.Delegate;
 import mockit.Expectations;
 import mockit.Mocked;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -99,7 +100,7 @@ public class MysqlChannelTest {
                 minTimes = 0;
                 result = new Delegate() {
                     int fakeRead(ByteBuffer buffer) {
-                        int maxLen = 0xffffff - 1;
+                        int maxLen = MysqlChannel.MAX_PHYSICAL_PACKET_LENGTH;
                         MysqlSerializer serializer = MysqlSerializer.newInstance();
                         if (readIdx == 0) {
                             // packet
@@ -147,8 +148,8 @@ public class MysqlChannelTest {
         MysqlChannel channel1 = new MysqlChannel(channel);
 
         ByteBuffer buf = channel1.fetchOnePacket();
-        Assert.assertEquals(0xffffff - 1 + 10, buf.remaining());
-        for (int i = 0; i < 0xffffff - 1 + 10; ++i) {
+        Assert.assertEquals(MysqlChannel.MAX_PHYSICAL_PACKET_LENGTH + 10, buf.remaining());
+        for (int i = 0; i < MysqlChannel.MAX_PHYSICAL_PACKET_LENGTH + 10; ++i) {
             Assert.assertEquals('a' + (i % 26), buf.get());
         }
     }
@@ -162,7 +163,7 @@ public class MysqlChannelTest {
                 minTimes = 0;
                 result = new Delegate() {
                     int fakeRead(ByteBuffer buffer) {
-                        int maxLen = 0xffffff - 1;
+                        int maxLen = MysqlChannel.MAX_PHYSICAL_PACKET_LENGTH;
                         MysqlSerializer serializer = MysqlSerializer.newInstance();
                         if (readIdx == 0) {
                             // packet
diff --git a/fe/pom.xml b/fe/pom.xml
index 216fd981f0..d37843dad1 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -53,6 +53,7 @@ under the License.
         <skip.plugin>false</skip.plugin>
         <hive.version>2.3.7</hive.version>
         <hadoop.version>2.8.0</hadoop.version>
+        <jmockit.version>1.49</jmockit.version>
     </properties>
 
     <profiles>
@@ -266,7 +267,7 @@ under the License.
             <dependency>
                 <groupId>org.jmockit</groupId>
                 <artifactId>jmockit</artifactId>
-                <version>1.49</version>
+                <version>${jmockit.version}</version>
                 <scope>test</scope>
             </dependency>