Merge pull request #9561 from vespa-engine/vekterli/move-address-space-to-vespalib

Move `AddressSpace` from searchlib to vespalib

4 files changed, 15 insertions, 15 deletions

diff --git a/searchcore/src/tests/proton/attribute/attribute_usage_filter/attribute_usage_filter_test.cpp b/searchcore/src/tests/proton/attribute/attribute_usage_filter/attribute_usage_filter_test.cpp
index 673d9aca9cd..0fced6e0bff 100644
--- a/searchcore/src/tests/proton/attribute/attribute_usage_filter/attribute_usage_filter_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_usage_filter/attribute_usage_filter_test.cpp
@@ -10,13 +10,13 @@ using proton::AttributeUsageStats;
 namespace
 {
 
-search::AddressSpace enumStoreOverLoad(30 * 1024 * 1024 * UINT64_C(1024),
-                                       0,
-                                       32 * 1024 * 1024 * UINT64_C(1024));
+vespalib::AddressSpace enumStoreOverLoad(30 * 1024 * 1024 * UINT64_C(1024),
+                                         0,
+                                         32 * 1024 * 1024 * UINT64_C(1024));
 
-search::AddressSpace multiValueOverLoad(127 * 1024 * 1024,
-                                        0,
-                                        128 * 1024 * 1024);
+vespalib::AddressSpace multiValueOverLoad(127 * 1024 * 1024,
+                                          0,
+                                          128 * 1024 * 1024);
 
 
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/address_space_usage_stats.cpp b/searchcore/src/vespa/searchcore/proton/attribute/address_space_usage_stats.cpp
index cbb0ea88213..3390447e26a 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/address_space_usage_stats.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/address_space_usage_stats.cpp
@@ -4,17 +4,17 @@
 
 namespace proton {
 
-AddressSpaceUsageStats::AddressSpaceUsageStats(const search::AddressSpace & usage)
+AddressSpaceUsageStats::AddressSpaceUsageStats(const vespalib::AddressSpace & usage)
     : _usage(usage),
       _attributeName(),
       _subDbName()
 {
 }
 
-AddressSpaceUsageStats::~AddressSpaceUsageStats() {}
+AddressSpaceUsageStats::~AddressSpaceUsageStats() = default;
 
 void
-AddressSpaceUsageStats::merge(const search::AddressSpace &usage,
+AddressSpaceUsageStats::merge(const vespalib::AddressSpace &usage,
                               const vespalib::string &attributeName,
                               const vespalib::string &subDbName)
 {
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/address_space_usage_stats.h b/searchcore/src/vespa/searchcore/proton/attribute/address_space_usage_stats.h
index 9edbdce28bf..400c7cde03f 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/address_space_usage_stats.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/address_space_usage_stats.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/searchlib/common/address_space.h>
+#include <vespa/vespalib/util/address_space.h>
 #include <vespa/vespalib/stllike/string.h>
 
 namespace proton {
@@ -14,18 +14,18 @@ namespace proton {
  */
 class AddressSpaceUsageStats
 {
-    search::AddressSpace _usage;
+    vespalib::AddressSpace _usage;
     vespalib::string _attributeName;
     vespalib::string _subDbName;
 
 public:
-    AddressSpaceUsageStats(const search::AddressSpace &usage);
+    explicit AddressSpaceUsageStats(const vespalib::AddressSpace &usage);
     ~AddressSpaceUsageStats();
-    void merge(const search::AddressSpace &usage,
+    void merge(const vespalib::AddressSpace &usage,
                const vespalib::string &attributeName,
                const vespalib::string &subDbName);
 
-    const search::AddressSpace &getUsage() const { return _usage; }
+    const vespalib::AddressSpace &getUsage() const { return _usage; }
     const vespalib::string &getAttributeName() const { return _attributeName; }
     const vespalib::string &getSubDbName() const { return _subDbName; }
 };
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_vector_explorer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_vector_explorer.cpp
index a2ec14c8840..6b1a385a6b0 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_vector_explorer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_vector_explorer.cpp
@@ -8,10 +8,10 @@
 #include <vespa/vespalib/data/slime/cursor.h>
 
 using search::attribute::Status;
-using search::AddressSpace;
 using search::AddressSpaceUsage;
 using search::AttributeVector;
 using search::EnumStoreBase;
+using vespalib::AddressSpace;
 using vespalib::MemoryUsage;
 using search::attribute::MultiValueMappingBase;
 using search::attribute::IPostingListAttributeBase;