Consider allocatedBytes() instead of bytes() in Storage{Buffer,Memory}.

This commit is contained in:
Maxim Akhmedov 2020-06-25 00:27:53 +03:00
parent 3e6da7d793
commit 29d2928f93
3 changed files with 7 additions and 3 deletions

View File

@ -449,7 +449,7 @@ public:
}
/// If it is possible to quickly determine exact number of bytes for the table on storage:
/// - memory (approximated)
/// - memory (approximated, resident)
/// - disk (compressed)
///
/// Used for:
@ -457,6 +457,10 @@ public:
//
/// Does not takes underlying Storage (if any) into account
/// (since for Buffer we still need to know how much bytes it uses).
///
/// Memory part should be estimated as a resident memory size.
/// In particular, alloctedBytes() is preferable over bytes()
/// when considering in-memory blocks.
virtual std::optional<UInt64> totalBytes() const
{
return {};

View File

@ -797,7 +797,7 @@ std::optional<UInt64> StorageBuffer::totalBytes() const
for (const auto & buffer : buffers)
{
std::lock_guard lock(buffer.mutex);
bytes += buffer.data.bytes();
bytes += buffer.data.allocatedBytes();
}
return bytes;
}

View File

@ -169,7 +169,7 @@ std::optional<UInt64> StorageMemory::totalBytes() const
UInt64 bytes = 0;
std::lock_guard lock(mutex);
for (const auto & buffer : data)
bytes += buffer.bytes();
bytes += buffer.allocatedBytes();
return bytes;
}