From dd43f135495e2711801ea16e98ae1e0ae9fa32c7 Mon Sep 17 00:00:00 2001
From: James <lijibing@selectdb.com>
Date: Thu, 24 Apr 2025 16:18:02 +0800
Subject: [PATCH] branch-2.1:[fix](ut)Fix StmtExecutorTest (#50322) (#50362)

backport: https://github.com/apache/doris/pull/50322
---
 .../qe/StmtExecutorInternalQueryTest.java     | 45 +++++++++++++++++++
 .../org/apache/doris/qe/StmtExecutorTest.java | 20 ---------
 2 files changed, 45 insertions(+), 20 deletions(-)
 create mode 100644 fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorInternalQueryTest.java

diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorInternalQueryTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorInternalQueryTest.java
new file mode 100644
index 0000000000..5091ea20dc
--- /dev/null
+++ b/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorInternalQueryTest.java
@@ -0,0 +1,45 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.qe;
+
+import org.apache.doris.analysis.StatementBase;
+import org.apache.doris.nereids.NereidsPlanner;
+
+import mockit.Mock;
+import mockit.MockUp;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class StmtExecutorInternalQueryTest {
+    @Test
+    public void testSetSqlHash() {
+        StmtExecutor executor = new StmtExecutor(new ConnectContext(), "select * from table1");
+        new MockUp<NereidsPlanner>() {
+            @Mock
+            public void plan(StatementBase queryStmt, org.apache.doris.thrift.TQueryOptions queryOptions) {
+                throw new RuntimeException();
+            }
+        };
+        try {
+            executor.executeInternalQuery();
+        } catch (Exception e) {
+            // do nothing
+        }
+        Assert.assertEquals("a8ec30e5ad0820f8c5bd16a82a4491ca", executor.getContext().getSqlHash());
+    }
+}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java
index c1686192f4..112c0f8678 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java
@@ -38,7 +38,6 @@ import org.apache.doris.datasource.InternalCatalog;
 import org.apache.doris.metric.MetricRepo;
 import org.apache.doris.mysql.MysqlChannel;
 import org.apache.doris.mysql.MysqlSerializer;
-import org.apache.doris.nereids.NereidsPlanner;
 import org.apache.doris.planner.OriginalPlanner;
 import org.apache.doris.qe.ConnectContext.ConnectType;
 import org.apache.doris.rewrite.ExprRewriter;
@@ -50,8 +49,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import java_cup.runtime.Symbol;
 import mockit.Expectations;
-import mockit.Mock;
-import mockit.MockUp;
 import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
@@ -804,21 +801,4 @@ public class StmtExecutorTest {
 
         Assert.assertEquals(QueryState.MysqlStateType.ERR, state.getStateType());
     }
-
-    @Test
-    public void testSetSqlHash() {
-        StmtExecutor executor = new StmtExecutor(ctx, "select * from table1");
-        new MockUp<NereidsPlanner>() {
-            @Mock
-            public void plan(StatementBase queryStmt, org.apache.doris.thrift.TQueryOptions queryOptions) {
-                throw new RuntimeException();
-            }
-        };
-        try {
-            executor.executeInternalQuery();
-        } catch (Exception e) {
-            // do nothing
-        }
-        Assert.assertEquals("a8ec30e5ad0820f8c5bd16a82a4491ca", executor.getContext().getSqlHash());
-    }
 }