diff options
Diffstat (limited to 'persistence')
3 files changed, 9 insertions, 13 deletions
diff --git a/persistence/src/vespa/persistence/spi/attribute_resource_usage.h b/persistence/src/vespa/persistence/spi/attribute_resource_usage.h index 02e0c248e3d..5cd8c93890f 100644 --- a/persistence/src/vespa/persistence/spi/attribute_resource_usage.h +++ b/persistence/src/vespa/persistence/spi/attribute_resource_usage.h @@ -13,7 +13,7 @@ namespace storage::spi { class AttributeResourceUsage { double _usage; - vespalib::string _name; // document_type.subdb.attribute + vespalib::string _name; // document_type.subdb.attribute.component public: AttributeResourceUsage(double usage, const vespalib::string& name) diff --git a/persistence/src/vespa/persistence/spi/resource_usage.cpp b/persistence/src/vespa/persistence/spi/resource_usage.cpp index 517a45a3d41..3dfc026c714 100644 --- a/persistence/src/vespa/persistence/spi/resource_usage.cpp +++ b/persistence/src/vespa/persistence/spi/resource_usage.cpp @@ -21,8 +21,7 @@ std::ostream& operator<<(std::ostream& out, const ResourceUsage& resource_usage) { out << "{disk_usage=" << resource_usage.get_disk_usage() << ", memory_usage=" << resource_usage.get_memory_usage() << - ", attribute_enum_store_usage=" << resource_usage.get_attribute_enum_store_usage() << - ", attribute_multivalue_usage=" << resource_usage.get_attribute_multivalue_usage() << "}"; + ", attribute_address_space_usage=" << resource_usage.get_attribute_address_space_usage() << "}"; return out; } diff --git a/persistence/src/vespa/persistence/spi/resource_usage.h b/persistence/src/vespa/persistence/spi/resource_usage.h index 921da8bbf06..82ff889c03e 100644 --- a/persistence/src/vespa/persistence/spi/resource_usage.h +++ b/persistence/src/vespa/persistence/spi/resource_usage.h @@ -14,21 +14,20 @@ class ResourceUsage { double _disk_usage; double _memory_usage; - AttributeResourceUsage _attribute_enum_store_usage; - AttributeResourceUsage _attribute_multivalue_usage; + AttributeResourceUsage _attribute_address_space_usage; public: - ResourceUsage(double disk_usage, double memory_usage, const AttributeResourceUsage &attribute_enum_store_usage, const AttributeResourceUsage &attribute_multivalue_usage) + ResourceUsage(double disk_usage, double memory_usage, + const AttributeResourceUsage &attribute_address_space_usage) : _disk_usage(disk_usage), _memory_usage(memory_usage), - _attribute_enum_store_usage(attribute_enum_store_usage), - _attribute_multivalue_usage(attribute_multivalue_usage) + _attribute_address_space_usage(attribute_address_space_usage) { } ResourceUsage(double disk_usage, double memory_usage) - : ResourceUsage(disk_usage, memory_usage, AttributeResourceUsage(), AttributeResourceUsage()) + : ResourceUsage(disk_usage, memory_usage, AttributeResourceUsage()) { } @@ -49,14 +48,12 @@ public: double get_disk_usage() const noexcept { return _disk_usage; } double get_memory_usage() const noexcept { return _memory_usage; } - const AttributeResourceUsage& get_attribute_enum_store_usage() const noexcept { return _attribute_enum_store_usage; } - const AttributeResourceUsage& get_attribute_multivalue_usage() const noexcept { return _attribute_multivalue_usage; } + const AttributeResourceUsage& get_attribute_address_space_usage() const noexcept { return _attribute_address_space_usage; } bool operator==(const ResourceUsage &rhs) const noexcept { return ((_disk_usage == rhs._disk_usage) && (_memory_usage == rhs._memory_usage) && - (_attribute_enum_store_usage == rhs._attribute_enum_store_usage) && - (_attribute_multivalue_usage == rhs._attribute_multivalue_usage)); + (_attribute_address_space_usage == rhs._attribute_address_space_usage)); } bool operator!=(const ResourceUsage &rhs) const noexcept { return !operator==(rhs); |