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 44373179080 [spill](monitor) improve spill audit log and add spill
statistics to schema tables (#43801)
44373179080 is described below
commit 44373179080ebec805214e592535b25b64468f52
Author: TengJianPing <[email protected]>
AuthorDate: Wed Nov 13 11:48:32 2024 +0800
[spill](monitor) improve spill audit log and add spill statistics to schema
tables (#43801)
---
.../schema_scanner/schema_backend_active_tasks.cpp | 3 +++
...chema_workload_group_resource_usage_scanner.cpp | 1 +
be/src/pipeline/exec/operator.h | 8 ------
be/src/runtime/query_statistics.cpp | 24 ++++++-----------
be/src/runtime/query_statistics.h | 22 ++++++----------
be/src/runtime/runtime_query_statistics_mgr.cpp | 24 +++++++++--------
.../workload_group/workload_group_manager.cpp | 1 +
.../java/org/apache/doris/catalog/SchemaTable.java | 4 +++
.../java/org/apache/doris/plugin/AuditEvent.java | 30 ++++++----------------
.../java/org/apache/doris/qe/AuditLogHelper.java | 6 ++---
.../WorkloadRuntimeStatusMgr.java | 12 +++------
gensrc/proto/data.proto | 6 ++---
gensrc/thrift/FrontendService.thrift | 6 ++---
13 files changed, 57 insertions(+), 90 deletions(-)
diff --git a/be/src/exec/schema_scanner/schema_backend_active_tasks.cpp
b/be/src/exec/schema_scanner/schema_backend_active_tasks.cpp
index 74e95f42032..2147f788739 100644
--- a/be/src/exec/schema_scanner/schema_backend_active_tasks.cpp
+++ b/be/src/exec/schema_scanner/schema_backend_active_tasks.cpp
@@ -29,6 +29,7 @@ std::vector<SchemaScanner::ColumnDesc>
SchemaBackendActiveTasksScanner::_s_tbls_
// name, type, size
{"BE_ID", TYPE_BIGINT, sizeof(int64_t), false},
{"FE_HOST", TYPE_VARCHAR, sizeof(StringRef), false},
+ {"WORKLOAD_GROUP_ID", TYPE_BIGINT, sizeof(int64_t), false},
{"QUERY_ID", TYPE_VARCHAR, sizeof(StringRef), false},
{"TASK_TIME_MS", TYPE_BIGINT, sizeof(int64_t), false},
{"TASK_CPU_TIME_MS", TYPE_BIGINT, sizeof(int64_t), false},
@@ -39,6 +40,8 @@ std::vector<SchemaScanner::ColumnDesc>
SchemaBackendActiveTasksScanner::_s_tbls_
{"SHUFFLE_SEND_BYTES", TYPE_BIGINT, sizeof(int64_t), false},
{"SHUFFLE_SEND_ROWS", TYPE_BIGINT, sizeof(int64_t), false},
{"QUERY_TYPE", TYPE_VARCHAR, sizeof(StringRef), false},
+ {"SPILL_WRITE_BYTES_TO_LOCAL_STORAGE", TYPE_BIGINT, sizeof(int64_t),
false},
+ {"SPILL_READ_BYTES_FROM_LOCAL_STORAGE", TYPE_BIGINT, sizeof(int64_t),
false},
};
SchemaBackendActiveTasksScanner::SchemaBackendActiveTasksScanner()
diff --git
a/be/src/exec/schema_scanner/schema_workload_group_resource_usage_scanner.cpp
b/be/src/exec/schema_scanner/schema_workload_group_resource_usage_scanner.cpp
index ca339044e98..f9e96943426 100644
---
a/be/src/exec/schema_scanner/schema_workload_group_resource_usage_scanner.cpp
+++
b/be/src/exec/schema_scanner/schema_workload_group_resource_usage_scanner.cpp
@@ -36,6 +36,7 @@ std::vector<SchemaScanner::ColumnDesc>
SchemaBackendWorkloadGroupResourceUsage::
{"CPU_USAGE_PERCENT", TYPE_DOUBLE, sizeof(double), false},
{"LOCAL_SCAN_BYTES_PER_SECOND", TYPE_BIGINT, sizeof(int64_t), false},
{"REMOTE_SCAN_BYTES_PER_SECOND", TYPE_BIGINT, sizeof(int64_t), false},
+ {"WRITE_BUFFER_USAGE_BYTES", TYPE_BIGINT, sizeof(int64_t), false},
};
SchemaBackendWorkloadGroupResourceUsage::SchemaBackendWorkloadGroupResourceUsage()
diff --git a/be/src/pipeline/exec/operator.h b/be/src/pipeline/exec/operator.h
index 76a53d9741d..c0ef6d27af0 100644
--- a/be/src/pipeline/exec/operator.h
+++ b/be/src/pipeline/exec/operator.h
@@ -303,14 +303,10 @@ public:
Status close(RuntimeState* state) override {
if (Base::_query_statistics) {
- auto* write_block_bytes =
Base::profile()->get_counter("SpillWriteBlockBytes");
auto* write_file_bytes =
Base::profile()->get_counter("SpillWriteFileBytes");
- auto* read_block_bytes =
Base::profile()->get_counter("SpillReadBlockBytes");
auto* read_file_bytes =
Base::profile()->get_counter("SpillReadFileBytes");
Base::_query_statistics->add_spill_bytes(
- write_block_bytes ? write_block_bytes->value() : 0,
write_file_bytes ? write_file_bytes->value() : 0,
- read_block_bytes ? read_block_bytes->value() : 0,
read_file_bytes ? read_file_bytes->value() : 0);
}
return Base::close(state);
@@ -747,14 +743,10 @@ public:
Status close(RuntimeState* state, Status exec_status) override {
if (Base::_query_statistics) {
- auto* write_block_bytes =
Base::profile()->get_counter("SpillWriteBlockBytes");
auto* write_file_bytes =
Base::profile()->get_counter("SpillWriteFileBytes");
- auto* read_block_bytes =
Base::profile()->get_counter("SpillReadBlockBytes");
auto* read_file_bytes =
Base::profile()->get_counter("SpillReadFileBytes");
Base::_query_statistics->add_spill_bytes(
- write_block_bytes ? write_block_bytes->value() : 0,
write_file_bytes ? write_file_bytes->value() : 0,
- read_block_bytes ? read_block_bytes->value() : 0,
read_file_bytes ? read_file_bytes->value() : 0);
}
return Base::close(state, exec_status);
diff --git a/be/src/runtime/query_statistics.cpp
b/be/src/runtime/query_statistics.cpp
index 0ff3800aa16..80d9b2cdf2a 100644
--- a/be/src/runtime/query_statistics.cpp
+++ b/be/src/runtime/query_statistics.cpp
@@ -45,10 +45,8 @@ void QueryStatistics::merge(const QueryStatistics& other) {
this->current_used_memory_bytes = other_memory_used;
}
- _spill_write_block_bytes += other._spill_write_block_bytes;
- _spill_write_file_bytes += other._spill_write_file_bytes;
- _spill_read_block_bytes += other._spill_read_block_bytes;
- _spill_read_file_bytes += other._spill_read_file_bytes;
+ _spill_write_bytes_to_local_storage +=
other._spill_write_bytes_to_local_storage;
+ _spill_read_bytes_from_local_storage +=
other._spill_read_bytes_from_local_storage;
}
void QueryStatistics::to_pb(PQueryStatistics* statistics) {
@@ -60,10 +58,8 @@ void QueryStatistics::to_pb(PQueryStatistics* statistics) {
statistics->set_max_peak_memory_bytes(max_peak_memory_bytes);
statistics->set_scan_bytes_from_remote_storage(_scan_bytes_from_remote_storage);
statistics->set_scan_bytes_from_local_storage(_scan_bytes_from_local_storage);
- statistics->set_spill_write_block_bytes(_spill_write_block_bytes);
- statistics->set_spill_write_file_bytes(_spill_write_file_bytes);
- statistics->set_spill_read_block_bytes(_spill_read_block_bytes);
- statistics->set_spill_read_file_bytes(_spill_read_file_bytes);
+
statistics->set_spill_write_bytes_to_local_storage(_spill_write_bytes_to_local_storage);
+
statistics->set_spill_read_bytes_from_local_storage(_spill_read_bytes_from_local_storage);
}
void QueryStatistics::to_thrift(TQueryStatistics* statistics) const {
@@ -78,10 +74,8 @@ void QueryStatistics::to_thrift(TQueryStatistics*
statistics) const {
statistics->__set_shuffle_send_rows(shuffle_send_rows);
statistics->__set_scan_bytes_from_remote_storage(_scan_bytes_from_remote_storage);
statistics->__set_scan_bytes_from_local_storage(_scan_bytes_from_local_storage);
- statistics->__set_spill_write_block_bytes(_spill_write_block_bytes);
- statistics->__set_spill_write_file_bytes(_spill_write_file_bytes);
- statistics->__set_spill_read_block_bytes(_spill_read_block_bytes);
- statistics->__set_spill_read_file_bytes(_spill_read_file_bytes);
+
statistics->__set_spill_write_bytes_to_local_storage(_spill_write_bytes_to_local_storage);
+
statistics->__set_spill_read_bytes_from_local_storage(_spill_read_bytes_from_local_storage);
}
void QueryStatistics::from_pb(const PQueryStatistics& statistics) {
@@ -90,10 +84,8 @@ void QueryStatistics::from_pb(const PQueryStatistics&
statistics) {
cpu_nanos = statistics.cpu_ms() * NANOS_PER_MILLIS;
_scan_bytes_from_local_storage =
statistics.scan_bytes_from_local_storage();
_scan_bytes_from_remote_storage =
statistics.scan_bytes_from_remote_storage();
- _spill_write_block_bytes = statistics.spill_write_block_bytes();
- _spill_write_file_bytes = statistics.spill_write_file_bytes();
- _spill_read_block_bytes = statistics.spill_read_block_bytes();
- _spill_read_file_bytes = statistics.spill_read_file_bytes();
+ _spill_write_bytes_to_local_storage =
statistics.spill_write_bytes_to_local_storage();
+ _spill_read_bytes_from_local_storage =
statistics.spill_read_bytes_from_local_storage();
}
QueryStatistics::~QueryStatistics() {}
diff --git a/be/src/runtime/query_statistics.h
b/be/src/runtime/query_statistics.h
index affb006fa66..bffea2b1d2a 100644
--- a/be/src/runtime/query_statistics.h
+++ b/be/src/runtime/query_statistics.h
@@ -48,10 +48,8 @@ public:
current_used_memory_bytes(0),
shuffle_send_bytes(0),
shuffle_send_rows(0),
- _spill_write_block_bytes(0),
- _spill_write_file_bytes(0),
- _spill_read_block_bytes(0),
- _spill_read_file_bytes(0) {}
+ _spill_write_bytes_to_local_storage(0),
+ _spill_read_bytes_from_local_storage(0) {}
virtual ~QueryStatistics();
void merge(const QueryStatistics& other);
@@ -84,12 +82,10 @@ public:
current_used_memory_bytes = current_used_memory;
}
- void add_spill_bytes(int64_t spill_write_block_bytes, int64_t
spill_write_file_bytes,
- int64_t spill_read_block_bytes, int64_t
spill_read_file_bytes) {
- _spill_write_block_bytes += spill_write_block_bytes;
- _spill_write_file_bytes += spill_write_file_bytes;
- _spill_read_block_bytes += spill_read_block_bytes;
- _spill_read_file_bytes += spill_read_file_bytes;
+ void add_spill_bytes(int64_t spill_write_bytes_to_local_storage,
+ int64_t spill_read_bytes_from_local_storage) {
+ _spill_write_bytes_to_local_storage +=
spill_write_bytes_to_local_storage;
+ _spill_read_bytes_from_local_storage +=
spill_read_bytes_from_local_storage;
}
void to_pb(PQueryStatistics* statistics);
@@ -119,10 +115,8 @@ private:
std::atomic<int64_t> shuffle_send_bytes;
std::atomic<int64_t> shuffle_send_rows;
- std::atomic<int64_t> _spill_write_block_bytes;
- std::atomic<int64_t> _spill_write_file_bytes;
- std::atomic<int64_t> _spill_read_block_bytes;
- std::atomic<int64_t> _spill_read_file_bytes;
+ std::atomic<int64_t> _spill_write_bytes_to_local_storage;
+ std::atomic<int64_t> _spill_read_bytes_from_local_storage;
};
using QueryStatisticsPtr = std::shared_ptr<QueryStatistics>;
// It is used for collecting sub plan query statistics in DataStreamRecvr.
diff --git a/be/src/runtime/runtime_query_statistics_mgr.cpp
b/be/src/runtime/runtime_query_statistics_mgr.cpp
index 75dd4ed0321..a4ab58692bf 100644
--- a/be/src/runtime/runtime_query_statistics_mgr.cpp
+++ b/be/src/runtime/runtime_query_statistics_mgr.cpp
@@ -526,23 +526,27 @@ void
RuntimeQueryStatisticsMgr::get_active_be_tasks_block(vectorized::Block* blo
qs_ctx_ptr->collect_query_statistics(&tqs);
SchemaScannerHelper::insert_int64_value(0, be_id, block);
SchemaScannerHelper::insert_string_value(1,
qs_ctx_ptr->_fe_addr.hostname, block);
- SchemaScannerHelper::insert_string_value(2, query_id, block);
+ SchemaScannerHelper::insert_int64_value(2, qs_ctx_ptr->_wg_id, block);
+ SchemaScannerHelper::insert_string_value(3, query_id, block);
int64_t task_time = qs_ctx_ptr->_is_query_finished
? qs_ctx_ptr->_query_finish_time -
qs_ctx_ptr->_query_start_time
: MonotonicMillis() -
qs_ctx_ptr->_query_start_time;
- SchemaScannerHelper::insert_int64_value(3, task_time, block);
- SchemaScannerHelper::insert_int64_value(4, tqs.cpu_ms, block);
- SchemaScannerHelper::insert_int64_value(5, tqs.scan_rows, block);
- SchemaScannerHelper::insert_int64_value(6, tqs.scan_bytes, block);
- SchemaScannerHelper::insert_int64_value(7, tqs.max_peak_memory_bytes,
block);
- SchemaScannerHelper::insert_int64_value(8,
tqs.current_used_memory_bytes, block);
- SchemaScannerHelper::insert_int64_value(9, tqs.shuffle_send_bytes,
block);
- SchemaScannerHelper::insert_int64_value(10, tqs.shuffle_send_rows,
block);
+ SchemaScannerHelper::insert_int64_value(4, task_time, block);
+ SchemaScannerHelper::insert_int64_value(5, tqs.cpu_ms, block);
+ SchemaScannerHelper::insert_int64_value(6, tqs.scan_rows, block);
+ SchemaScannerHelper::insert_int64_value(7, tqs.scan_bytes, block);
+ SchemaScannerHelper::insert_int64_value(8, tqs.max_peak_memory_bytes,
block);
+ SchemaScannerHelper::insert_int64_value(9,
tqs.current_used_memory_bytes, block);
+ SchemaScannerHelper::insert_int64_value(10, tqs.shuffle_send_bytes,
block);
+ SchemaScannerHelper::insert_int64_value(11, tqs.shuffle_send_rows,
block);
std::stringstream ss;
ss << qs_ctx_ptr->_query_type;
- SchemaScannerHelper::insert_string_value(11, ss.str(), block);
+ SchemaScannerHelper::insert_string_value(12, ss.str(), block);
+
+ SchemaScannerHelper::insert_int64_value(13,
tqs.spill_write_bytes_to_local_storage, block);
+ SchemaScannerHelper::insert_int64_value(14,
tqs.spill_read_bytes_from_local_storage, block);
}
}
diff --git a/be/src/runtime/workload_group/workload_group_manager.cpp
b/be/src/runtime/workload_group/workload_group_manager.cpp
index b2c33f2d378..1b44ec976ba 100644
--- a/be/src/runtime/workload_group/workload_group_manager.cpp
+++ b/be/src/runtime/workload_group/workload_group_manager.cpp
@@ -243,6 +243,7 @@ void
WorkloadGroupMgr::get_wg_resource_usage(vectorized::Block* block) {
SchemaScannerHelper::insert_int64_value(4,
wg->get_local_scan_bytes_per_second(), block);
SchemaScannerHelper::insert_int64_value(5,
wg->get_remote_scan_bytes_per_second(), block);
+ SchemaScannerHelper::insert_int64_value(6, wg->write_buffer_size(),
block);
}
}
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 e022cb85296..cc5b0b19465 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
@@ -451,6 +451,7 @@ public class SchemaTable extends Table {
new SchemaTable(SystemIdGenerator.getNextId(),
"backend_active_tasks", TableType.SCHEMA,
builder().column("BE_ID",
ScalarType.createType(PrimitiveType.BIGINT))
.column("FE_HOST",
ScalarType.createVarchar(256))
+ .column("WORKLOAD_GROUP_ID",
ScalarType.createType(PrimitiveType.BIGINT))
.column("QUERY_ID",
ScalarType.createVarchar(256))
.column("TASK_TIME_MS",
ScalarType.createType(PrimitiveType.BIGINT))
.column("TASK_CPU_TIME_MS",
ScalarType.createType(PrimitiveType.BIGINT))
@@ -461,6 +462,8 @@ public class SchemaTable extends Table {
.column("SHUFFLE_SEND_BYTES",
ScalarType.createType(PrimitiveType.BIGINT))
.column("SHUFFLE_SEND_ROWS",
ScalarType.createType(PrimitiveType.BIGINT))
.column("QUERY_TYPE",
ScalarType.createVarchar(256))
+
.column("SPILL_WRITE_BYTES_TO_LOCAL_STORAGE",
ScalarType.createType(PrimitiveType.BIGINT))
+
.column("SPILL_READ_BYTES_FROM_LOCAL_STORAGE",
ScalarType.createType(PrimitiveType.BIGINT))
.build()))
.put("active_queries", new
SchemaTable(SystemIdGenerator.getNextId(), "active_queries", TableType.SCHEMA,
builder().column("QUERY_ID", ScalarType.createVarchar(256))
@@ -556,6 +559,7 @@ public class SchemaTable extends Table {
.column("CPU_USAGE_PERCENT",
ScalarType.createType(PrimitiveType.DOUBLE))
.column("LOCAL_SCAN_BYTES_PER_SECOND",
ScalarType.createType(PrimitiveType.BIGINT))
.column("REMOTE_SCAN_BYTES_PER_SECOND",
ScalarType.createType(PrimitiveType.BIGINT))
+ .column("WRITE_BUFFER_USAGE_BYTES",
ScalarType.createType(PrimitiveType.BIGINT))
.build())
)
.put("file_cache_statistics",
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
index 90ac664a4df..4e2911eb0ac 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
@@ -111,14 +111,10 @@ public class AuditEvent {
public long scanBytesFromLocalStorage = -1;
@AuditField(value = "ScanBytesFromRemoteStorage")
public long scanBytesFromRemoteStorage = -1;
- @AuditField(value = "SpillWriteBlockBytes")
- public long spillWriteBlockBytes = -1;
- @AuditField(value = "SpillWriteFileBytes")
- public long spillWriteFileBytes = -1;
- @AuditField(value = "SpillReadBlockBytes")
- public long spillReadBlockBytes = -1;
- @AuditField(value = "SpillReadFileBytes")
- public long spillReadFileBytes = -1;
+ @AuditField(value = "SpillWriteBytesToLocalStorage")
+ public long spillWriteBytesToLocalStorage = -1;
+ @AuditField(value = "SpillReadBytesFromLocalStorage")
+ public long spillReadBytesFromLocalStorage = -1;
public long pushToAuditLogQueueTime;
@@ -278,23 +274,13 @@ public class AuditEvent {
return this;
}
- public AuditEventBuilder setSpillWriteBlockBytes(long
spillWriteBlockBytes) {
- auditEvent.spillWriteBlockBytes = spillWriteBlockBytes;
+ public AuditEventBuilder setSpillWriteBytesToLocalStorage(long bytes) {
+ auditEvent.spillWriteBytesToLocalStorage = bytes;
return this;
}
- public AuditEventBuilder setSpillWriteFileBytes(long
spillWriteFileBytes) {
- auditEvent.spillWriteFileBytes = spillWriteFileBytes;
- return this;
- }
-
- public AuditEventBuilder setSpillReadBlockBytes(long
spillReadBlockBytes) {
- auditEvent.spillReadBlockBytes = spillReadBlockBytes;
- return this;
- }
-
- public AuditEventBuilder setSpillReadFileBytes(long
spillReadFileBytes) {
- auditEvent.spillReadFileBytes = spillReadFileBytes;
+ public AuditEventBuilder setSpillReadBytesFromLocalStorage(long bytes)
{
+ auditEvent.spillReadBytesFromLocalStorage = bytes;
return this;
}
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 80fdf1fdd31..cbc410edc19 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,8 @@ public class AuditLogHelper {
.setQueryTime(elapseMs)
.setScanBytes(statistics == null ? 0 :
statistics.getScanBytes())
.setScanRows(statistics == null ? 0 : statistics.getScanRows())
- .setSpillWriteBlockBytes(statistics == null ? 0 :
statistics.getSpillWriteBlockBytes())
- .setSpillWriteFileBytes(statistics == null ? 0 :
statistics.getSpillWriteFileBytes())
- .setSpillReadBlockBytes(statistics == null ? 0 :
statistics.getSpillReadBlockBytes())
- .setSpillReadFileBytes(statistics == null ? 0 :
statistics.getSpillReadFileBytes())
+ .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())
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadRuntimeStatusMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadRuntimeStatusMgr.java
index 796a268706d..32b49346a90 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadRuntimeStatusMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadRuntimeStatusMgr.java
@@ -86,10 +86,8 @@ public class WorkloadRuntimeStatusMgr extends MasterDaemon {
auditEvent.cpuTimeMs = queryStats.cpu_ms;
auditEvent.shuffleSendBytes =
queryStats.shuffle_send_bytes;
auditEvent.shuffleSendRows = queryStats.shuffle_send_rows;
- auditEvent.spillWriteBlockBytes =
queryStats.spill_write_block_bytes;
- auditEvent.spillWriteFileBytes =
queryStats.spill_write_file_bytes;
- auditEvent.spillReadBlockBytes =
queryStats.spill_read_block_bytes;
- auditEvent.spillReadFileBytes =
queryStats.spill_read_file_bytes;
+ auditEvent.spillWriteBytesToLocalStorage =
queryStats.spill_write_bytes_to_local_storage;
+ auditEvent.spillReadBytesFromLocalStorage =
queryStats.spill_read_bytes_from_local_storage;
}
boolean ret =
Env.getCurrentAuditEventProcessor().handleAuditEvent(auditEvent, true);
if (!ret) {
@@ -230,10 +228,8 @@ public class WorkloadRuntimeStatusMgr extends MasterDaemon
{
if (dst.max_peak_memory_bytes < src.max_peak_memory_bytes) {
dst.max_peak_memory_bytes = src.max_peak_memory_bytes;
}
- dst.spill_write_block_bytes += src.spill_write_block_bytes;
- dst.spill_write_file_bytes += src.spill_write_file_bytes;
- dst.spill_read_block_bytes += src.spill_read_block_bytes;
- dst.spill_read_file_bytes += src.spill_read_file_bytes;
+ dst.spill_write_bytes_to_local_storage +=
src.spill_write_bytes_to_local_storage ;
+ dst.spill_read_bytes_from_local_storage +=
src.spill_read_bytes_from_local_storage ;
}
private void queryAuditEventLogWriteLock() {
diff --git a/gensrc/proto/data.proto b/gensrc/proto/data.proto
index 0372634499c..95fb522289e 100644
--- a/gensrc/proto/data.proto
+++ b/gensrc/proto/data.proto
@@ -37,10 +37,8 @@ message PQueryStatistics {
repeated PNodeStatistics nodes_statistics = 6;
optional int64 scan_bytes_from_local_storage = 7;
optional int64 scan_bytes_from_remote_storage = 8;
- optional int64 spill_write_block_bytes = 9;
- optional int64 spill_write_file_bytes = 10;
- optional int64 spill_read_block_bytes = 11;
- optional int64 spill_read_file_bytes = 12;
+ optional int64 spill_write_bytes_to_local_storage = 9;
+ optional int64 spill_read_bytes_from_local_storage = 10;
}
message PRowBatch {
diff --git a/gensrc/thrift/FrontendService.thrift
b/gensrc/thrift/FrontendService.thrift
index 3e7a13266e7..a5d11ca6621 100644
--- a/gensrc/thrift/FrontendService.thrift
+++ b/gensrc/thrift/FrontendService.thrift
@@ -413,10 +413,8 @@ struct TQueryStatistics {
9: optional i64 shuffle_send_rows
10: optional i64 scan_bytes_from_local_storage
11: optional i64 scan_bytes_from_remote_storage
- 12: optional i64 spill_write_block_bytes
- 13: optional i64 spill_write_file_bytes
- 14: optional i64 spill_read_block_bytes
- 15: optional i64 spill_read_file_bytes
+ 12: optional i64 spill_write_bytes_to_local_storage
+ 13: optional i64 spill_read_bytes_from_local_storage
}
struct TReportWorkloadRuntimeStatusParams {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
