This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-1.2-lts in repository https://gitbox.apache.org/repos/asf/doris.git
commit 4d65a0723a80a3fee5e46656eff7685239e1a73b Author: Xiangyu Wang <[email protected]> AuthorDate: Mon Jan 30 09:15:02 2023 +0800 [Enhancement](profile) fill user field for profile. (#16212) Co-authored-by: [email protected] <[email protected]> --- fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java | 8 +++++++- .../src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java | 3 ++- .../src/main/java/org/apache/doris/task/ExportExportingTask.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java index 3b79ca70de..36bdaa993c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java @@ -120,6 +120,7 @@ public class ExportJob implements Writable { private long id; private String queryId; private String label; + private String user; private long dbId; private long tableId; private BrokerDesc brokerDesc; @@ -192,6 +193,7 @@ public class ExportJob implements Writable { this.columnSeparator = "\t"; this.lineDelimiter = "\n"; this.columns = ""; + this.user = ""; } public ExportJob(long jobId) { @@ -209,7 +211,7 @@ public class ExportJob implements Writable { this.properties = stmt.getProperties(); this.label = this.properties.get(ExportStmt.LABEL); this.queryId = ConnectContext.get() != null ? DebugUtil.printId(ConnectContext.get().queryId()) : "N/A"; - + this.user = ConnectContext.get() != null ? ConnectContext.get().getQualifiedUser() : "N/A"; String path = stmt.getPath(); Preconditions.checkArgument(!Strings.isNullOrEmpty(path)); this.whereExpr = stmt.getWhereExpr(); @@ -751,6 +753,10 @@ public class ExportJob implements Writable { return queryId; } + public String getUser() { + return user; + } + public boolean getEnableProfile() { return enableProfile; } 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 31c07820cc..01bbd795f4 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 @@ -325,7 +325,8 @@ public class BrokerLoadJob extends BulkLoadJob { summaryProfile.addInfoString(ProfileManager.QUERY_TYPE, "Load"); summaryProfile.addInfoString(ProfileManager.QUERY_STATE, "N/A"); - summaryProfile.addInfoString(ProfileManager.USER, "N/A"); + summaryProfile.addInfoString(ProfileManager.USER, + getUserInfo() != null ? getUserInfo().getQualifiedUser() : "N/A"); summaryProfile.addInfoString(ProfileManager.DEFAULT_DB, getDefaultDb()); summaryProfile.addInfoString(ProfileManager.SQL_STATEMENT, this.getOriginStmt().originStmt); summaryProfile.addInfoString(ProfileManager.IS_CACHED, "N/A"); diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/ExportExportingTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/ExportExportingTask.java index 7d6a3b3c74..2a6bed2d9f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/task/ExportExportingTask.java +++ b/fe/fe-core/src/main/java/org/apache/doris/task/ExportExportingTask.java @@ -264,7 +264,7 @@ public class ExportExportingTask extends MasterTask { summaryProfile.addInfoString(ProfileManager.QUERY_TYPE, "Export"); summaryProfile.addInfoString(ProfileManager.QUERY_STATE, job.getState().toString()); summaryProfile.addInfoString(ProfileManager.DORIS_VERSION, Version.DORIS_BUILD_VERSION); - summaryProfile.addInfoString(ProfileManager.USER, "xxx"); + summaryProfile.addInfoString(ProfileManager.USER, job.getUser()); summaryProfile.addInfoString(ProfileManager.DEFAULT_DB, String.valueOf(job.getDbId())); summaryProfile.addInfoString(ProfileManager.SQL_STATEMENT, job.getSql()); profile.addChild(summaryProfile); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
