This is an automated email from the ASF dual-hosted git repository.
lihaopeng pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new a8e409f0e4 [Profile] add doris-version to profile (#21499)
a8e409f0e4 is described below
commit a8e409f0e420eac0af1138ae1698f5e798c8c168
Author: zclllyybb <zhaochan...@selectdb.com>
AuthorDate: Wed Jul 5 14:45:28 2023 +0800
[Profile] add doris-version to profile (#21499)
---
.../java/org/apache/doris/common/profile/SummaryProfile.java | 12 +++++++++---
.../java/org/apache/doris/load/loadv2/BrokerLoadJob.java | 2 ++
.../src/main/java/org/apache/doris/qe/StmtExecutor.java | 2 ++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java
b/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java
index d395af2190..58788500ae 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java
@@ -32,6 +32,7 @@ import java.util.Map;
*/
public class SummaryProfile {
// Summary
+ public static final String DORIS_VERSION = "Doris Version";
public static final String PROFILE_ID = "Profile ID";
public static final String TASK_TYPE = "Task Type";
public static final String START_TIME = "Start Time";
@@ -57,9 +58,9 @@ public class SummaryProfile {
public static final String WRITE_RESULT_TIME = "Write Result Time";
public static final String WAIT_FETCH_RESULT_TIME = "Wait and Fetch Result
Time";
- public static final ImmutableList<String> SUMMARY_KEYS =
ImmutableList.of(PROFILE_ID, TASK_TYPE,
- START_TIME, END_TIME, TOTAL_TIME, TASK_STATE, USER, DEFAULT_DB,
SQL_STATEMENT, IS_NEREIDS, IS_PIPELINE,
- IS_CACHED, TOTAL_INSTANCES_NUM, INSTANCES_NUM_PER_BE,
PARALLEL_FRAGMENT_EXEC_INSTANCE, TRACE_ID);
+ public static final ImmutableList<String> SUMMARY_KEYS =
ImmutableList.of(PROFILE_ID, DORIS_VERSION, TASK_TYPE,
+ START_TIME, END_TIME, TOTAL_TIME, TASK_STATE, USER, DEFAULT_DB,
SQL_STATEMENT, IS_CACHED,
+ TOTAL_INSTANCES_NUM, INSTANCES_NUM_PER_BE,
PARALLEL_FRAGMENT_EXEC_INSTANCE, TRACE_ID);
public static final ImmutableList<String> EXECUTION_SUMMARY_KEYS =
ImmutableList.of(ANALYSIS_TIME, PLAN_TIME,
SCHEDULE_TIME, FETCH_RESULT_TIME, WRITE_RESULT_TIME,
WAIT_FETCH_RESULT_TIME);
@@ -166,6 +167,11 @@ public class SummaryProfile {
return this;
}
+ public SummaryBuilder dorisVersion(String val) {
+ map.put(DORIS_VERSION, val);
+ return this;
+ }
+
public SummaryBuilder taskType(String val) {
map.put(TASK_TYPE, val);
return this;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java
b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java
index c0bc098e46..b58af12aab 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java
@@ -32,6 +32,7 @@ import org.apache.doris.common.LabelAlreadyUsedException;
import org.apache.doris.common.MetaNotFoundException;
import org.apache.doris.common.QuotaExceedException;
import org.apache.doris.common.UserException;
+import org.apache.doris.common.Version;
import org.apache.doris.common.profile.Profile;
import org.apache.doris.common.profile.SummaryProfile.SummaryBuilder;
import org.apache.doris.common.util.DebugUtil;
@@ -327,6 +328,7 @@ public class BrokerLoadJob extends BulkLoadJob {
long currentTimestamp = System.currentTimeMillis();
SummaryBuilder builder = new SummaryBuilder();
builder.profileId(String.valueOf(id));
+ builder.dorisVersion(Version.DORIS_BUILD_VERSION);
builder.taskType(ProfileType.LOAD.name());
builder.startTime(TimeUtils.longToTimeString(createTimestamp));
if (isFinished) {
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 9cb5a7fe2a..c9f7bc66e0 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
@@ -96,6 +96,7 @@ import org.apache.doris.common.FeConstants;
import org.apache.doris.common.MetaNotFoundException;
import org.apache.doris.common.NereidsException;
import org.apache.doris.common.UserException;
+import org.apache.doris.common.Version;
import org.apache.doris.common.profile.Profile;
import org.apache.doris.common.profile.SummaryProfile;
import org.apache.doris.common.profile.SummaryProfile.SummaryBuilder;
@@ -295,6 +296,7 @@ public class StmtExecutor {
long currentTimestamp = System.currentTimeMillis();
SummaryBuilder builder = new SummaryBuilder();
builder.profileId(DebugUtil.printId(context.queryId()));
+ builder.dorisVersion(Version.DORIS_BUILD_VERSION);
builder.taskType(profileType.name());
builder.startTime(TimeUtils.longToTimeString(context.getStartTime()));
if (isFinished) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
