From 23f152f82883cecbce4f0860d6a91b35744fbea5 Mon Sep 17 00:00:00 2001
From: kikyo <cyborgz1999@gmail.com>
Date: Mon, 18 Sep 2023 11:26:14 +0800
Subject: [PATCH] fix query_id

---
 .../org/apache/doris/qe/StmtExecutor.java     |  3 +++
 .../doris/statistics/util/StatisticsUtil.java |  5 -----
 .../suites/statistics/analyze_stats.groovy    | 21 +++++++++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index c4ef5ad1604fb1..c1812665b63145 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -2558,6 +2558,9 @@ public StatementBase setParsedStmt(StatementBase parsedStmt) {
 
     public List<ResultRow> executeInternalQuery() {
         LOG.debug("INTERNAL QUERY: " + originStmt.toString());
+        UUID uuid = UUID.randomUUID();
+        TUniqueId queryId = new TUniqueId(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
+        context.setQueryId(queryId);
         try {
             List<ResultRow> resultRows = new ArrayList<>();
             try {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
index ed95f4bd1f3645..b4c86843426ace 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
@@ -73,7 +73,6 @@
 import org.apache.doris.statistics.StatisticConstants;
 import org.apache.doris.system.Frontend;
 import org.apache.doris.system.SystemInfoService;
-import org.apache.doris.thrift.TUniqueId;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
@@ -104,7 +103,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.StringJoiner;
-import java.util.UUID;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -187,9 +185,6 @@ public static AutoCloseConnectContext buildConnectContext(boolean limitScan) {
         connectContext.setDatabase(FeConstants.INTERNAL_DB_NAME);
         connectContext.setQualifiedUser(UserIdentity.ROOT.getQualifiedUser());
         connectContext.setCurrentUserIdentity(UserIdentity.ROOT);
-        UUID uuid = UUID.randomUUID();
-        TUniqueId queryId = new TUniqueId(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
-        connectContext.setQueryId(queryId);
         connectContext.setStartTime();
         connectContext.setCluster(SystemInfoService.DEFAULT_CLUSTER);
         return new AutoCloseConnectContext(connectContext);
diff --git a/regression-test/suites/statistics/analyze_stats.groovy b/regression-test/suites/statistics/analyze_stats.groovy
index bc9b42a1a5515e..4ee9cc2b2f30b8 100644
--- a/regression-test/suites/statistics/analyze_stats.groovy
+++ b/regression-test/suites/statistics/analyze_stats.groovy
@@ -1035,5 +1035,26 @@ PARTITION `p599` VALUES IN (599)
         SELECT * FROM analyze_test_with_schema_update;
     """
 
+    sql """
+        DROP TABLE IF EXISTS two_thousand_partition_table_test
+    """
+
+    sql """
+        CREATE TABLE two_thousand_partition_table_test (col1 int(11451) not null)
+        DUPLICATE KEY(col1)
+          PARTITION BY RANGE(`col1`)
+                  (
+                  from (0) to (1000001) INTERVAL 500
+                  )
+        DISTRIBUTED BY HASH(col1)
+        BUCKETS 3
+        PROPERTIES(
+            "replication_num"="1"
+        );
+    """
+
+    sql """
+        ANALYZE TABLE two_thousand_partition_table_test WITH SYNC;
+    """
 
 }