This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 0f37f1c310 [feature](profile) add DORIS_BUILD_SHORT_HASH in profile
#22588
0f37f1c310 is described below
commit 0f37f1c3107cc1386d1912abb5ec20dc214360ec
Author: Mryange <[email protected]>
AuthorDate: Fri Aug 4 11:51:43 2023 +0800
[feature](profile) add DORIS_BUILD_SHORT_HASH in profile #22588
---
.../src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java | 6 +++++-
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
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 b58af12aab..1f84d96bf3 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
@@ -328,7 +328,11 @@ public class BrokerLoadJob extends BulkLoadJob {
long currentTimestamp = System.currentTimeMillis();
SummaryBuilder builder = new SummaryBuilder();
builder.profileId(String.valueOf(id));
- builder.dorisVersion(Version.DORIS_BUILD_VERSION);
+ if (Version.DORIS_BUILD_VERSION_MAJOR == 0) {
+ builder.dorisVersion(Version.DORIS_BUILD_SHORT_HASH);
+ } else {
+ builder.dorisVersion(Version.DORIS_BUILD_VERSION + "-" +
Version.DORIS_BUILD_SHORT_HASH);
+ }
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 2c7039ac82..21cf629e8f 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
@@ -297,7 +297,11 @@ public class StmtExecutor {
long currentTimestamp = System.currentTimeMillis();
SummaryBuilder builder = new SummaryBuilder();
builder.profileId(DebugUtil.printId(context.queryId()));
- builder.dorisVersion(Version.DORIS_BUILD_VERSION);
+ if (Version.DORIS_BUILD_VERSION_MAJOR == 0) {
+ builder.dorisVersion(Version.DORIS_BUILD_SHORT_HASH);
+ } else {
+ builder.dorisVersion(Version.DORIS_BUILD_VERSION + "-" +
Version.DORIS_BUILD_SHORT_HASH);
+ }
builder.taskType(profileType.name());
builder.startTime(TimeUtils.longToTimeString(context.getStartTime()));
if (isFinished) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
