tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add human readable memory allocations in show storage info (#1366)

Browse Source
This commit is contained in:
Andi 2023-10-16 11:35:44 +02:00 committed by GitHub
parent de9280b334
commit 7b0bafa21e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/query/interpreter.cpp
View File

@ -2641,14 +2641,14 @@ PreparedQuery PrepareIsolationLevelQuery(ParsedQuery parsed_query, const bool in
} }
} }
return PreparedQuery{ return PreparedQuery{{},
{}, std::move(parsed_query.required_privileges),
std::move(parsed_query.required_privileges), [callback = std::move(callback)](AnyStream * /*stream*/,
[callback = std::move(callback)](AnyStream *stream, std::optional<int> n) -> std::optional<QueryHandlerResult> { std::optional<int> /*n*/) -> std::optional<QueryHandlerResult> {
callback(); callback();
return QueryHandlerResult::COMMIT; return QueryHandlerResult::COMMIT;
}, },
RWType::NONE}; RWType::NONE};
} }
Callback SwitchMemoryDevice(storage::StorageMode current_mode, storage::StorageMode requested_mode, Callback SwitchMemoryDevice(storage::StorageMode current_mode, storage::StorageMode requested_mode,
@ -3083,10 +3083,12 @@ PreparedQuery PrepareSystemInfoQuery(ParsedQuery parsed_query, bool in_explicit_
{TypedValue("vertex_count"), TypedValue(static_cast<int64_t>(info.vertex_count))}, {TypedValue("vertex_count"), TypedValue(static_cast<int64_t>(info.vertex_count))},
{TypedValue("edge_count"), TypedValue(static_cast<int64_t>(info.edge_count))}, {TypedValue("edge_count"), TypedValue(static_cast<int64_t>(info.edge_count))},
{TypedValue("average_degree"), TypedValue(info.average_degree)}, {TypedValue("average_degree"), TypedValue(info.average_degree)},
{TypedValue("memory_usage"), TypedValue(static_cast<int64_t>(info.memory_usage))}, {TypedValue("memory_usage"), TypedValue(utils::GetReadableSize(static_cast<double>(info.memory_usage)))},
{TypedValue("disk_usage"), TypedValue(static_cast<int64_t>(info.disk_usage))}, {TypedValue("disk_usage"), TypedValue(utils::GetReadableSize(static_cast<double>(info.disk_usage)))},
{TypedValue("memory_allocated"), TypedValue(static_cast<int64_t>(utils::total_memory_tracker.Amount()))}, {TypedValue("memory_allocated"),
{TypedValue("allocation_limit"), TypedValue(static_cast<int64_t>(utils::total_memory_tracker.HardLimit()))}, TypedValue(utils::GetReadableSize(static_cast<double>(utils::total_memory_tracker.Amount())))},
{TypedValue("allocation_limit"),
TypedValue(utils::GetReadableSize(static_cast<double>(utils::total_memory_tracker.HardLimit())))},
{TypedValue("global_isolation_level"), TypedValue(IsolationLevelToString(storage->GetIsolationLevel()))}, {TypedValue("global_isolation_level"), TypedValue(IsolationLevelToString(storage->GetIsolationLevel()))},
{TypedValue("session_isolation_level"), TypedValue(IsolationLevelToString(interpreter_isolation_level))}, {TypedValue("session_isolation_level"), TypedValue(IsolationLevelToString(interpreter_isolation_level))},
{TypedValue("next_session_isolation_level"), {TypedValue("next_session_isolation_level"),