This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch spill_and_reserve
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/spill_and_reserve by this push:
new 3bcdd014bca fix fe code format error
3bcdd014bca is described below
commit 3bcdd014bca3265985e48a1452080c3c8ca8c357
Author: yiguolei <[email protected]>
AuthorDate: Wed Nov 13 18:10:51 2024 +0800
fix fe code format error
---
be/src/runtime/workload_group/workload_group.cpp | 3 ++-
.../src/main/java/org/apache/doris/catalog/SchemaTable.java | 2 +-
fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/be/src/runtime/workload_group/workload_group.cpp
b/be/src/runtime/workload_group/workload_group.cpp
index ca34c6bf1b6..e554c5c2245 100644
--- a/be/src/runtime/workload_group/workload_group.cpp
+++ b/be/src/runtime/workload_group/workload_group.cpp
@@ -96,7 +96,7 @@ std::string WorkloadGroup::debug_string() const {
"WorkloadGroup[id = {}, name = {}, version = {}, cpu_share = {}, "
"total_query_slot_count = {}, "
"memory_limit = {}, slot_memory_policy = {}, write_buffer_ratio=
{}%, "
- "enable_memory_overcommit = {}, total_mem_used = {},"
+ "enable_memory_overcommit = {}, total_mem_used = {}
(write_buffer_size={}),"
"wg_refresh_interval_memory_growth = {}, mem_used_ratio = {},
spill_low_watermark = "
"{}, spill_high_watermark = {},cpu_hard_limit = {},
scan_thread_num = "
"{}, max_remote_scan_thread_num = {}, min_remote_scan_thread_num =
{}, "
@@ -106,6 +106,7 @@ std::string WorkloadGroup::debug_string() const {
PrettyPrinter::print(_memory_limit, TUnit::BYTES),
to_string(_slot_mem_policy),
_load_buffer_ratio, _enable_memory_overcommit ? "true" : "false",
PrettyPrinter::print(_total_mem_used.load(), TUnit::BYTES),
+ PrettyPrinter::print(_write_buffer_size.load(), TUnit::BYTES),
PrettyPrinter::print(_wg_refresh_interval_memory_growth.load(),
TUnit::BYTES),
mem_used_ratio, _spill_low_watermark, _spill_high_watermark,
cpu_hard_limit(),
_scan_thread_num, _max_remote_scan_thread_num,
_min_remote_scan_thread_num,
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
index d312dbc6c82..c74b64f5e95 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
@@ -464,7 +464,7 @@ public class SchemaTable extends Table {
.column("QUERY_TYPE",
ScalarType.createVarchar(256))
.column("SPILL_WRITE_BYTES_TO_LOCAL_STORAGE",
ScalarType.createType(PrimitiveType.BIGINT))
-
.column("SPILL_READ_BYTES_FROM_LOCAL_STORAGE",
+
.column("SPILL_READ_BYTES_FROM_LOCAL_STORAGE",
ScalarType.createType(PrimitiveType.BIGINT))
.build()))
.put("active_queries", new
SchemaTable(SystemIdGenerator.getNextId(), "active_queries", TableType.SCHEMA,
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
index 4801d5e728d..89d7b565392 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
@@ -204,10 +204,10 @@ public class AuditLogHelper {
.setQueryTime(elapseMs)
.setScanBytes(statistics == null ? 0 :
statistics.getScanBytes())
.setScanRows(statistics == null ? 0 : statistics.getScanRows())
- .setSpillWriteBytesToLocalStorage (statistics == null ? 0 :
- statistics.getSpillWriteBytesToLocalStorage ())
- .setSpillReadBytesFromLocalStorage (statistics == null ? 0 :
- statistics.getSpillReadBytesFromLocalStorage ())
+ .setSpillWriteBytesToLocalStorage(statistics == null ? 0 :
+ statistics.getSpillWriteBytesToLocalStorage())
+ .setSpillReadBytesFromLocalStorage(statistics == null ? 0 :
+ statistics.getSpillReadBytesFromLocalStorage())
.setCpuTimeMs(statistics == null ? 0 : statistics.getCpuMs())
.setPeakMemoryBytes(statistics == null ? 0 :
statistics.getMaxPeakMemoryBytes())
.setReturnRows(ctx.getReturnRows())
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
