fix1210

Author: 宋光璠

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

@@ -134,7 +134,6 @@ public class SummaryProfile {
     public static final String RPC_WORK_TIME = "RPC Work Time";
     public static final String LATENCY_FROM_BE_TO_FE = "RPC Latency From BE To FE";
     public static final String SPLITS_ASSIGNMENT_WEIGHT = "Splits Assignment Weight";
-    public static final String ICEBERG_SCAN_METRICS = "Iceberg Scan Metrics";
 
     // These info will display on FE's web ui table, every one will be displayed as
     // a column, so that should not
@@ -148,55 +147,6 @@ public class SummaryProfile {
 
     // The display order of execution summary items.
     public static final ImmutableList<String> EXECUTION_SUMMARY_KEYS = ImmutableList.of(
-        WORKLOAD_GROUP,
-        PARSE_SQL_TIME,
-        PLAN_TIME,
-        NEREIDS_GARBAGE_COLLECT_TIME,
-        NEREIDS_LOCK_TABLE_TIME,
-        NEREIDS_ANALYSIS_TIME,
-        NEREIDS_REWRITE_TIME,
-        NEREIDS_BE_FOLD_CONST_TIME,
-        NEREIDS_COLLECT_TABLE_PARTITION_TIME,
-        NEREIDS_PRE_REWRITE_BY_MV_TIME,
-        NEREIDS_OPTIMIZE_TIME,
-        NEREIDS_TRANSLATE_TIME,
-        INIT_SCAN_NODE_TIME,
-        FINALIZE_SCAN_NODE_TIME,
-        GET_SPLITS_TIME,
-        GET_PARTITIONS_TIME,
-        GET_PARTITION_FILES_TIME,
-        SINK_SET_PARTITION_VALUES_TIME,
-        CREATE_SCAN_RANGE_TIME,
-        ICEBERG_SCAN_METRICS,
-        NEREIDS_DISTRIBUTE_TIME,
-        GET_META_VERSION_TIME,
-        GET_PARTITION_VERSION_TIME,
-        GET_PARTITION_VERSION_BY_HAS_DATA_COUNT,
-        GET_PARTITION_VERSION_COUNT,
-        GET_TABLE_VERSION_TIME,
-        GET_TABLE_VERSION_COUNT,
-        SCHEDULE_TIME,
-        ASSIGN_FRAGMENT_TIME,
-        FRAGMENT_SERIALIZE_TIME,
-        SEND_FRAGMENT_PHASE1_TIME,
-        SEND_FRAGMENT_PHASE2_TIME,
-        FRAGMENT_COMPRESSED_SIZE,
-        FRAGMENT_RPC_COUNT,
-        SCHEDULE_TIME_PER_BE,
-        WAIT_FETCH_RESULT_TIME,
-        FETCH_RESULT_TIME,
-        WRITE_RESULT_TIME,
-        DORIS_VERSION,
-        IS_NEREIDS,
-        IS_CACHED,
-        TOTAL_INSTANCES_NUM,
-        INSTANCES_NUM_PER_BE,
-        PARALLEL_FRAGMENT_EXEC_INSTANCE,
-        TRACE_ID,
-        TRANSACTION_COMMIT_TIME,
-        SYSTEM_MESSAGE,
-        EXECUTED_BY_FRONTEND,
-        SPLITS_ASSIGNMENT_WEIGHT,
         WORKLOAD_GROUP,
         CPU_SHARE,
         MEMORY_LIMIT,
@@ -269,7 +219,6 @@ public class SummaryProfile {
         .put(GET_PARTITION_FILES_TIME, 3)
         .put(SINK_SET_PARTITION_VALUES_TIME, 3)
         .put(CREATE_SCAN_RANGE_TIME, 2)
-        .put(ICEBERG_SCAN_METRICS, 3)
         .put(GET_PARTITION_VERSION_TIME, 1)
         .put(GET_PARTITION_VERSION_COUNT, 1)
         .put(GET_PARTITION_VERSION_BY_HAS_DATA_COUNT, 1)
@@ -291,10 +240,9 @@ public class SummaryProfile {
         .put(HMS_UPDATE_PARTITION_TIME, 1)
         .put(HMS_UPDATE_PARTITION_CNT, 2)
         .put(CPU_SHARE, 1)
+        .put(MEMORY_LIMIT, 1)
         .build();
 
-
-
     @SerializedName(value = "summaryProfile")
     private RuntimeProfile summaryProfile = new RuntimeProfile(SUMMARY_PROFILE_NAME);
     @SerializedName(value = "executionSummaryProfile")
@@ -794,7 +742,6 @@ public void setCpuShare(int cpuShare) {
     public void setMemoryLimit(double memoryLimit) {
         this.memoryLimit = memoryLimit;
     }
-
     public static class SummaryBuilder {
         private Map<String, String> map = Maps.newHashMap();
 

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

@@ -347,11 +347,35 @@ private Map<String, String> getSummaryInfo(boolean isFinished) {
 
             if (!list.isEmpty()) {
                 WorkloadGroup wg = list.get(0);
-                getSummaryProfile().setCpuShare(wg.getMaxCpuPercent());
-                getSummaryProfile().setMemoryLimit(wg.getMaxMemoryPercent());
+                SummaryProfile summary = getSummaryProfile();
+                summary.setCpuShare(wg.getMaxCpuPercent());
+                summary.setMemoryLimit(wg.getMaxMemoryPercent());
+                summary.setEnableMemoryOvercommit(Boolean.parseBoolean(wg.getProperties().getOrDefault(WorkloadGroup.ENABLE_MEMORY_OVERCOMMIT, "")));
+                summary.setCpuHardLimit(Integer.parseInt(wg.getProperties().getOrDefault(WorkloadGroup.CPU_HARD_LIMIT, "")));
+                summary.setMaxConcurrency(Integer.parseInt(wg.getProperties().getOrDefault(WorkloadGroup.MAX_CONCURRENCY, "")));
+                summary.setMaxQueueSize(Integer.parseInt(wg.getProperties().getOrDefault(WorkloadGroup.MAX_QUEUE_SIZE, "")));
+                summary.setQueueTimeout(Integer.parseInt(
+                    wg.getProperties().getOrDefault(WorkloadGroup.QUEUE_TIMEOUT, "")));
+                summary.setScanThreadNum(Integer.parseInt(
+                    wg.getProperties().getOrDefault(WorkloadGroup.SCAN_THREAD_NUM, "")));
+                summary.setMaxRemoteScanThreadNum(Integer.parseInt(
+                    wg.getProperties().getOrDefault(WorkloadGroup.MAX_REMOTE_SCAN_THREAD_NUM, "")));
+                summary.setMinRemoteScanThreadNum(Integer.parseInt(
+                    wg.getProperties().getOrDefault(WorkloadGroup.MIN_REMOTE_SCAN_THREAD_NUM, "")));
+                summary.setMemoryLowWatermark(Integer.parseInt(
+                    wg.getProperties().getOrDefault(WorkloadGroup.MEMORY_LOW_WATERMARK, "")));
+                summary.setMemoryHighWatermark(Integer.parseInt(
+                    wg.getProperties().getOrDefault(WorkloadGroup.MEMORY_HIGH_WATERMARK, "")));
+                summary.setTag(wg.getProperties().getOrDefault(
+                    WorkloadGroup.TAG, ""));
+                summary.setReadBytesPerSecond(Long.parseLong(
+                    wg.getProperties().getOrDefault(WorkloadGroup.READ_BYTES_PER_SECOND, "")));
+                summary.setRemoteReadBytesPerSecond(Long.parseLong(
+                    wg.getProperties().getOrDefault(WorkloadGroup.REMOTE_READ_BYTES_PER_SECOND, "")));
+                
             }
         } catch (UserException e) {
-            throw new RuntimeException(e);
+            LOG.warn(e);
         }
         return builder.build();
     }