This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new c56791da677 branch-3.1: [feat](warmup) display tables in SHOW WARM UP
JOB results #51594 (#52419)
c56791da677 is described below
commit c56791da67729c8d9cd8d8bb1dcc45e9f0dda7cc
Author: Kaijie Chen <[email protected]>
AuthorDate: Sat Jun 28 22:51:23 2025 +0800
branch-3.1: [feat](warmup) display tables in SHOW WARM UP JOB results
#51594 (#52419)
backport #51594
---
.../main/java/org/apache/doris/common/Triple.java | 109 +++++++++++++++++++++
.../apache/doris/analysis/ShowCloudWarmUpStmt.java | 1 +
.../apache/doris/analysis/WarmUpClusterStmt.java | 6 +-
.../apache/doris/cloud/CacheHotspotManager.java | 10 +-
.../org/apache/doris/cloud/CloudWarmUpJob.java | 22 +++++
.../doris/cloud/cache/CacheHotspotManagerTest.java | 2 +-
.../warm_up/table/test_warm_up_table.groovy | 6 ++
.../warm_up/table/test_warm_up_tables.groovy | 8 ++
8 files changed, 157 insertions(+), 7 deletions(-)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Triple.java
b/fe/fe-common/src/main/java/org/apache/doris/common/Triple.java
new file mode 100644
index 00000000000..6e5291354f0
--- /dev/null
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Triple.java
@@ -0,0 +1,109 @@
+// 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.
+// This file is copied from
+//
https://github.com/apache/impala/blob/branch-2.9.0/fe/src/main/java/org/apache/impala/Pair.java
+// and modified by Doris
+
+package org.apache.doris.common;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Comparator;
+import java.util.Objects;
+
+/**
+ * The equivalent of a {@link Pair} but with three elements: left, middle, and
right.
+ * <p>
+ * Notice: When using Triple for persistence, users need to guarantee that L,
M, and R can be serialized through Gson
+ */
+public class Triple<L, M, R> {
+ public static TripleComparator<Triple<?, ?, Comparable>>
TRIPLE_VALUE_COMPARATOR = new TripleComparator<>();
+
+ @SerializedName(value = "left")
+ public L left;
+ @SerializedName(value = "middle")
+ public M middle;
+ @SerializedName(value = "right")
+ public R right;
+
+ private Triple(L left, M middle, R right) {
+ this.left = left;
+ this.middle = middle;
+ this.right = right;
+ }
+
+ public static <P, K extends P> Triple<K, K, K> ofSame(K same) {
+ return new Triple<>(same, same, same);
+ }
+
+ public static <L, M, R> Triple<L, M, R> of(L left, M middle, R right) {
+ return new Triple<>(left, middle, right);
+ }
+
+ public L getLeft() {
+ return left;
+ }
+
+ public M getMiddle() {
+ return middle;
+ }
+
+ public R getRight() {
+ return right;
+ }
+
+ /**
+ * A triple is equal if all three parts are equal().
+ */
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+
+ if (o instanceof Triple) {
+ Triple<L, M, R> other = (Triple<L, M, R>) o;
+
+ boolean leftEqual = Objects.isNull(left) ? other.left == null :
left.equals(other.left);
+ boolean middleEqual = Objects.isNull(middle) ? other.middle ==
null : middle.equals(other.middle);
+ boolean rightEqual = Objects.isNull(right) ? other.right == null :
right.equals(other.right);
+
+ return leftEqual && middleEqual && rightEqual;
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(left, middle, right);
+ }
+
+ @Override
+ public String toString() {
+ String leftStr = Objects.nonNull(left) ? left.toString() : "";
+ String middleStr = Objects.nonNull(middle) ? middle.toString() : "";
+ String rightStr = Objects.nonNull(right) ? right.toString() : "";
+ return leftStr + ":" + middleStr + ":" + rightStr;
+ }
+
+ public static class TripleComparator<T extends Triple<?, ?, ? extends
Comparable>> implements Comparator<T> {
+ @Override
+ public int compare(T o1, T o2) {
+ return o1.right.compareTo(o2.right);
+ }
+ }
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCloudWarmUpStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCloudWarmUpStmt.java
index f823aeb9c15..9ec063d3f76 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCloudWarmUpStmt.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCloudWarmUpStmt.java
@@ -44,6 +44,7 @@ public class ShowCloudWarmUpStmt extends ShowStmt implements
NotFallbackInParser
.add("AllBatch")
.add("FinishTime")
.add("ErrMsg")
+ .add("Tables")
.build();
public ShowCloudWarmUpStmt(Expr whereClause) {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/WarmUpClusterStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/WarmUpClusterStmt.java
index 9f386a686a2..cca21d5c259 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/WarmUpClusterStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/WarmUpClusterStmt.java
@@ -26,11 +26,10 @@ import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.Triple;
import org.apache.doris.common.UserException;
import com.google.common.base.Strings;
-import org.apache.commons.lang3.tuple.ImmutableTriple;
-import org.apache.commons.lang3.tuple.Triple;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -108,8 +107,7 @@ public class WarmUpClusterStmt extends StatementBase
implements NotFallbackInPar
if (partitionName.length() != 0 &&
!table.containsPartition(partitionName)) {
throw new AnalysisException("The partition " +
partitionName + " doesn't exist");
}
- Triple<String, String, String> part =
- new ImmutableTriple<>(dbName, tableName.getTbl(),
partitionName);
+ Triple<String, String, String> part = Triple.of(dbName,
tableName.getTbl(), partitionName);
tables.add(part);
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/CacheHotspotManager.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/CacheHotspotManager.java
index 1e86fda15db..b73e467836d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cloud/CacheHotspotManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/CacheHotspotManager.java
@@ -38,6 +38,7 @@ import org.apache.doris.common.DdlException;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.Pair;
import org.apache.doris.common.ThreadPoolManager;
+import org.apache.doris.common.Triple;
import org.apache.doris.common.util.MasterDaemon;
import org.apache.doris.common.util.TimeUtils;
import org.apache.doris.rpc.RpcException;
@@ -52,7 +53,6 @@ import org.apache.doris.thrift.TStatusCode;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.commons.lang3.tuple.Triple;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.thrift.TException;
@@ -633,7 +633,13 @@ public class CacheHotspotManager extends MasterDaemon {
Map<Long, List<List<Long>>> beToTabletIdBatches =
splitBatch(beToWarmUpTablets);
CloudWarmUpJob.JobType jobType = stmt.isWarmUpWithTable() ?
JobType.TABLE : JobType.CLUSTER;
- CloudWarmUpJob warmUpJob = new CloudWarmUpJob(jobId,
stmt.getDstClusterName(), beToTabletIdBatches, jobType);
+ CloudWarmUpJob warmUpJob;
+ if (jobType == JobType.TABLE) {
+ warmUpJob = new CloudWarmUpJob(jobId, stmt.getDstClusterName(),
beToTabletIdBatches, jobType,
+ stmt.getTables(), stmt.isForce());
+ } else {
+ warmUpJob = new CloudWarmUpJob(jobId, stmt.getDstClusterName(),
beToTabletIdBatches, jobType);
+ }
addCloudWarmUpJob(warmUpJob);
Env.getCurrentEnv().getEditLog().logModifyCloudWarmUpJob(warmUpJob);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/CloudWarmUpJob.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/CloudWarmUpJob.java
index 79c00e322c2..463a37c4635 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cloud/CloudWarmUpJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/CloudWarmUpJob.java
@@ -24,6 +24,7 @@ import org.apache.doris.common.ClientPool;
import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.FeConstants;
+import org.apache.doris.common.Triple;
import org.apache.doris.common.io.Text;
import org.apache.doris.common.io.Writable;
import org.apache.doris.common.util.TimeUtils;
@@ -42,6 +43,7 @@ import org.apache.doris.thrift.TWarmUpTabletsResponse;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.gson.annotations.SerializedName;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -52,6 +54,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
public class CloudWarmUpJob implements Writable {
private static final Logger LOG =
LogManager.getLogger(CloudWarmUpJob.class);
@@ -99,6 +102,12 @@ public class CloudWarmUpJob implements Writable {
@SerializedName(value = "JobType")
protected JobType jobType;
+ @SerializedName(value = "tables")
+ protected List<Triple<String, String, String>> tables = new ArrayList<>();
+
+ @SerializedName(value = "force")
+ protected boolean force = false;
+
private Map<Long, Client> beToClient;
private Map<Long, TNetworkAddress> beToAddr;
@@ -128,6 +137,14 @@ public class CloudWarmUpJob implements Writable {
}
}
+ public CloudWarmUpJob(long jobId, String cloudClusterName,
+ Map<Long, List<List<Long>>> beToTabletIdBatches,
JobType jobType,
+ List<Triple<String, String, String>> tables, boolean
force) {
+ this(jobId, cloudClusterName, beToTabletIdBatches, jobType);
+ this.tables = tables;
+ this.force = force;
+ }
+
public long getJobId() {
return jobId;
}
@@ -182,6 +199,11 @@ public class CloudWarmUpJob implements Writable {
info.add(Long.toString(maxBatchSize));
info.add(TimeUtils.longToTimeStringWithms(finishedTimeMs));
info.add(errMsg);
+ info.add(tables.stream()
+ .map(t -> StringUtils.isEmpty(t.getRight())
+ ? t.getLeft() + "." + t.getMiddle()
+ : t.getLeft() + "." + t.getMiddle() + "." +
t.getRight())
+ .collect(Collectors.joining(", ")));
return info;
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/cloud/cache/CacheHotspotManagerTest.java
b/fe/fe-core/src/test/java/org/apache/doris/cloud/cache/CacheHotspotManagerTest.java
index ff42ea31bcb..04155b25099 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/cloud/cache/CacheHotspotManagerTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/cloud/cache/CacheHotspotManagerTest.java
@@ -23,11 +23,11 @@ import org.apache.doris.catalog.Partition;
import org.apache.doris.catalog.Tablet;
import org.apache.doris.cloud.CacheHotspotManager;
import org.apache.doris.cloud.system.CloudSystemInfoService;
+import org.apache.doris.common.Triple;
import org.apache.doris.system.Backend;
import mockit.Mock;
import mockit.MockUp;
-import org.apache.commons.lang3.tuple.Triple;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/table/test_warm_up_table.groovy
b/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/table/test_warm_up_table.groovy
index 3f9dc93d550..b7eb8761951 100644
---
a/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/table/test_warm_up_table.groovy
+++
b/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/table/test_warm_up_table.groovy
@@ -23,6 +23,10 @@ suite("test_warm_up_table") {
def jobStateResult = sql """ SHOW WARM UP JOB WHERE ID = ${jobId} """
return jobStateResult[0][2]
}
+ def getTablesFromShowCommand = { jobId ->
+ def jobStateResult = sql """ SHOW WARM UP JOB WHERE ID = ${jobId} """
+ return jobStateResult[0][9]
+ }
List<String> ipList = new ArrayList<>();
List<String> hbPortList = new ArrayList<>()
@@ -154,6 +158,8 @@ suite("test_warm_up_table") {
sql "cancel warm up job where id = ${jobId[0][0]}"
assertTrue(false);
}
+ def tablesString = getTablesFromShowCommand(jobId[0][0])
+ assertTrue(tablesString.contains("customer"), tablesString)
sleep(30000)
long ttl_cache_size = 0
getMetricsMethod.call(ipList[0], brpcPortList[0]) {
diff --git
a/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/table/test_warm_up_tables.groovy
b/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/table/test_warm_up_tables.groovy
index bf39e922802..77286717117 100644
---
a/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/table/test_warm_up_tables.groovy
+++
b/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/table/test_warm_up_tables.groovy
@@ -23,6 +23,10 @@ suite("test_warm_up_tables") {
def jobStateResult = sql """ SHOW WARM UP JOB WHERE ID = ${jobId} """
return jobStateResult[0][2]
}
+ def getTablesFromShowCommand = { jobId ->
+ def jobStateResult = sql """ SHOW WARM UP JOB WHERE ID = ${jobId} """
+ return jobStateResult[0][9]
+ }
List<String> ipList = new ArrayList<>();
List<String> hbPortList = new ArrayList<>()
@@ -164,6 +168,10 @@ suite("test_warm_up_tables") {
jobId_ = sql "warm up cluster regression_cluster_name1 with table customer
partition p3 and table supplier;"
waitJobDone(jobId_);
+ def tablesString = getTablesFromShowCommand(jobId_[0][0])
+ assertTrue(tablesString.contains("customer.p3"), tablesString)
+ assertTrue(tablesString.contains("supplier"), tablesString)
+
sleep(30000)
long ttl_cache_size = 0
getMetricsMethod.call(ipList[0], brpcPortList[0]) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
