Inherit from vespalib::GrowStrategy

2 files changed, 8 insertions, 29 deletions

diff --git a/searchlib/src/vespa/searchcommon/common/growstrategy.cpp b/searchlib/src/vespa/searchcommon/common/growstrategy.cpp
index 36c577b1048..27bd5ea904e 100644
--- a/searchlib/src/vespa/searchcommon/common/growstrategy.cpp
+++ b/searchlib/src/vespa/searchcommon/common/growstrategy.cpp
@@ -8,10 +8,10 @@ namespace search {
 std::ostream&
 operator<<(std::ostream& os, const GrowStrategy& grow_strategy)
 {
-    os << "{docsInitialCapacity=" << grow_strategy.getDocsInitialCapacity() <<
-        ", docsMinimumCapacity=" << grow_strategy.getDocsMinimumCapacity() <<
-        ", docsGrowFactor=" << grow_strategy.getDocsGrowFactor() <<
-        ", docsGrowDelta=" << grow_strategy.getDocsGrowDelta() <<
+    os << "{docsInitialCapacity=" << grow_strategy.getInitialCapacity() <<
+        ", docsMinimumCapacity=" << grow_strategy.getMinimumCapacity() <<
+        ", docsGrowFactor=" << grow_strategy.getGrowFactor() <<
+        ", docsGrowDelta=" << grow_strategy.getGrowDelta() <<
         ", multiValueAllocGrowFactor=" << grow_strategy.getMultiValueAllocGrowFactor() <<
         "}";
     return os;
diff --git a/searchlib/src/vespa/searchcommon/common/growstrategy.h b/searchlib/src/vespa/searchcommon/common/growstrategy.h
index 3320e6ead6e..bc04047aa3c 100644
--- a/searchlib/src/vespa/searchcommon/common/growstrategy.h
+++ b/searchlib/src/vespa/searchcommon/common/growstrategy.h
@@ -8,13 +8,9 @@
 
 namespace search {
 
-class GrowStrategy
+class GrowStrategy : public vespalib::GrowStrategy
 {
 private:
-    uint32_t _docsInitialCapacity;
-    uint32_t _docsMinimumCapacity;
-    float    _docsGrowFactor;
-    uint32_t _docsGrowDelta;
     float    _multiValueAllocGrowFactor;
 public:
     GrowStrategy() noexcept
@@ -22,10 +18,7 @@ public:
     {}
     GrowStrategy(uint32_t docsInitialCapacity, float docsGrowFactor,
                  uint32_t docsGrowDelta, uint32_t docsMinimumCapacity, float multiValueAllocGrowFactor) noexcept
-        : _docsInitialCapacity(docsInitialCapacity),
-          _docsMinimumCapacity(docsMinimumCapacity),
-          _docsGrowFactor(docsGrowFactor),
-          _docsGrowDelta(docsGrowDelta),
+        : vespalib::GrowStrategy(docsInitialCapacity, docsGrowFactor, docsGrowDelta, docsMinimumCapacity),
           _multiValueAllocGrowFactor(multiValueAllocGrowFactor)
     {
     }
@@ -34,25 +27,11 @@ public:
         return GrowStrategy(docsInitialCapacity, docsGrowFactor, docsGrowDelta, 0, 0.2);
     }
 
-    uint32_t    getDocsInitialCapacity() const { return _docsInitialCapacity; }
-    uint32_t    getDocsMinimumCapacity() const { return _docsMinimumCapacity; }
-    uint32_t        getDocsGrowPercent() const { return _docsGrowFactor*100; }
-    float            getDocsGrowFactor() const { return _docsGrowFactor; }
-    uint32_t          getDocsGrowDelta() const { return _docsGrowDelta; }
     float getMultiValueAllocGrowFactor() const { return _multiValueAllocGrowFactor; }
-    void    setDocsInitialCapacity(uint32_t v) { _docsInitialCapacity = v; }
-    void    setDocsMinimumCapacity(uint32_t v) { _docsMinimumCapacity = v; }
-    void          setDocsGrowDelta(uint32_t v) { _docsGrowDelta = v; }
-
-    vespalib::GrowStrategy to_generic_strategy() const {
-        return vespalib::GrowStrategy(_docsInitialCapacity, _docsGrowFactor, _docsGrowDelta, _docsMinimumCapacity);
-    }
 
     bool operator==(const GrowStrategy & rhs) const {
-        return _docsInitialCapacity == rhs._docsInitialCapacity &&
-            _docsGrowFactor == rhs._docsGrowFactor &&
-            _docsGrowDelta == rhs._docsGrowDelta &&
-            _multiValueAllocGrowFactor == rhs._multiValueAllocGrowFactor;
+        return vespalib::GrowStrategy::operator==(rhs) &&
+                (_multiValueAllocGrowFactor == rhs._multiValueAllocGrowFactor);
     }
     bool operator!=(const GrowStrategy & rhs) const {
         return !(operator==(rhs));