Skip to content

Commit bdbbcb7

Browse files
authored
[Improvement](profile) add catalog info in profile (#38298)
bp #38283
1 parent 71c7c77 commit bdbbcb7

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public class SummaryProfile {
4141
public static final String TOTAL_TIME = "Total";
4242
public static final String TASK_STATE = "Task State";
4343
public static final String USER = "User";
44+
public static final String DEFAULT_CATALOG = "Default Catalog";
4445
public static final String DEFAULT_DB = "Default Db";
4546
public static final String SQL_STATEMENT = "Sql Statement";
4647
public static final String IS_CACHED = "Is Cached";
@@ -78,7 +79,7 @@ public class SummaryProfile {
7879
// a column, so that should not
7980
// add many columns here. Add to ExcecutionSummary list.
8081
public static final ImmutableList<String> SUMMARY_KEYS = ImmutableList.of(PROFILE_ID, TASK_TYPE,
81-
START_TIME, END_TIME, TOTAL_TIME, TASK_STATE, USER, DEFAULT_DB, SQL_STATEMENT);
82+
START_TIME, END_TIME, TOTAL_TIME, TASK_STATE, USER, DEFAULT_CATALOG, DEFAULT_DB, SQL_STATEMENT);
8283

8384
public static final ImmutableList<String> EXECUTION_SUMMARY_KEYS = ImmutableList.of(
8485
WORKLOAD_GROUP,
@@ -345,6 +346,11 @@ public SummaryBuilder user(String val) {
345346
return this;
346347
}
347348

349+
public SummaryBuilder defaultCatalog(String val) {
350+
map.put(DEFAULT_CATALOG, val);
351+
return this;
352+
}
353+
348354
public SummaryBuilder defaultDb(String val) {
349355
map.put(DEFAULT_DB, val);
350356
return this;

fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.apache.doris.common.util.MetaLockUtils;
4242
import org.apache.doris.common.util.ProfileManager.ProfileType;
4343
import org.apache.doris.common.util.TimeUtils;
44+
import org.apache.doris.datasource.InternalCatalog;
4445
import org.apache.doris.datasource.property.constants.S3Properties;
4546
import org.apache.doris.load.BrokerFileGroup;
4647
import org.apache.doris.load.BrokerFileGroupAggInfo.FileGroupAggKey;
@@ -348,6 +349,7 @@ private Map<String, String> getSummaryInfo(boolean isFinished) {
348349
}
349350
builder.taskState("FINISHED");
350351
builder.user(getUserInfo() != null ? getUserInfo().getQualifiedUser() : "N/A");
352+
builder.defaultCatalog(InternalCatalog.INTERNAL_CATALOG_NAME);
351353
builder.defaultDb(getDefaultDb());
352354
builder.sqlStatement(getOriginStmt().originStmt);
353355
return builder.build();

fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java

+1
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ private Map<String, String> getSummaryInfo(boolean isFinished) {
332332
builder.taskState(!isFinished && context.getState().getStateType().equals(MysqlStateType.OK) ? "RUNNING"
333333
: context.getState().toString());
334334
builder.user(context.getQualifiedUser());
335+
builder.defaultCatalog(context.getCurrentCatalog().getName());
335336
builder.defaultDb(context.getDatabase());
336337
builder.workloadGroup(context.getWorkloadGroupName());
337338
builder.sqlStatement(originStmt.originStmt);

regression-test/suites/query_profile/test_profile.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ suite('test_profile') {
138138

139139
assertNotNull(stmt_query_info["Profile ID"])
140140
assertNotEquals(stmt_query_info["Profile ID"].toString(), "N/A".toString())
141-
141+
assertNotNull(stmt_query_info["Default Catalog"])
142142
assertEquals(stmt_query_info['Sql Statement'].toString(),
143143
""" SELECT * FROM ${table} WHERE cost ${ops[insert_order]} ${nums[insert_order]} """.toString())
144144
}

0 commit comments

Comments
 (0)