Skip to content

Commit efb8f25

Browse files
committed
refactor: apply review suggestions to remove percentage
1 parent 4c67569 commit efb8f25

File tree

1 file changed

+0
-35
lines changed

1 file changed

+0
-35
lines changed

src/query/storages/system/src/query_execution_table.rs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use databend_common_catalog::table::DistributionLevel;
2121
use databend_common_catalog::table::Table;
2222
use databend_common_catalog::table_context::TableContext;
2323
use databend_common_exception::Result;
24-
use databend_common_expression::types::Float64Type;
2524
use databend_common_expression::types::NumberDataType;
2625
use databend_common_expression::types::StringType;
2726
use databend_common_expression::types::TimestampType;
@@ -124,18 +123,10 @@ impl QueryExecutionTable {
124123
"process_rows",
125124
TableDataType::Number(NumberDataType::UInt64),
126125
),
127-
TableField::new(
128-
"process_rows_percentage",
129-
TableDataType::Number(NumberDataType::Float64),
130-
),
131126
TableField::new(
132127
"process_time_in_micros",
133128
TableDataType::Number(NumberDataType::UInt64),
134129
),
135-
TableField::new(
136-
"process_time_percentage",
137-
TableDataType::Number(NumberDataType::Float64),
138-
),
139130
]);
140131

141132
let table_info = TableInfo {
@@ -177,18 +168,13 @@ impl QueryExecutionTable {
177168
let mut timestamps = Vec::new();
178169
let mut query_ids = Vec::new();
179170
let mut process_rows = Vec::new();
180-
let mut process_rows_percentage = Vec::new();
181171
let mut process_times = Vec::new();
182-
let mut process_time_percentage = Vec::new();
183172

184173
let empty_map = HashMap::new();
185174
for timestamp in valid_time_range {
186175
let rows_for_timestamp = rows_by_timestamp.get(&timestamp).unwrap_or(&empty_map);
187176
let times_for_timestamp = times_by_timestamp.get(&timestamp).unwrap_or(&empty_map);
188177

189-
let rows_percentage = calculate_percentage(rows_for_timestamp);
190-
let times_percentage = calculate_percentage(times_for_timestamp);
191-
192178
let mut all_query_ids = std::collections::HashSet::new();
193179
all_query_ids.extend(rows_for_timestamp.keys());
194180
all_query_ids.extend(times_for_timestamp.keys());
@@ -198,10 +184,7 @@ impl QueryExecutionTable {
198184
timestamps.push(timestamp as i64 * 1_000_000);
199185
query_ids.push(query_id.clone());
200186
process_rows.push(rows_for_timestamp.get(query_id).copied().unwrap_or(0));
201-
process_rows_percentage.push(rows_percentage.get(query_id).copied().unwrap_or(0.0));
202187
process_times.push(times_for_timestamp.get(query_id).copied().unwrap_or(0));
203-
process_time_percentage
204-
.push(times_percentage.get(query_id).copied().unwrap_or(0.0));
205188
}
206189
}
207190

@@ -210,29 +193,11 @@ impl QueryExecutionTable {
210193
TimestampType::from_data(timestamps),
211194
StringType::from_data(query_ids),
212195
UInt32Type::from_data(process_rows),
213-
Float64Type::from_data(process_rows_percentage),
214196
UInt32Type::from_data(process_times),
215-
Float64Type::from_data(process_time_percentage),
216197
])
217198
}
218199
}
219200

220-
fn calculate_percentage(data: &HashMap<String, u32>) -> HashMap<String, f64> {
221-
let total: u32 = data.values().sum();
222-
if total > 0 {
223-
data.iter()
224-
.map(|(k, v)| {
225-
(
226-
k.clone(),
227-
((*v as f64 / total as f64) * 10000.0).round() / 100.0,
228-
)
229-
})
230-
.collect()
231-
} else {
232-
HashMap::new()
233-
}
234-
}
235-
236201
fn aggregate_stats_by_timestamp(
237202
stats_data: Vec<(u32, u32)>,
238203
query_id: &str,

0 commit comments

Comments
 (0)