Also update compaction count for old style compaction.

Test that compaction count is updated when compacting enum store.
Style fixes.

2 files changed, 3 insertions, 2 deletions

diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
index 39c93dd98fe..2f9dc1dc84a 100644
--- a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
+++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
@@ -370,6 +370,7 @@ DataStoreBase::startCompact(uint32_t typeId)
         }
     }
     switchActiveBuffer(typeId, 0u);
+    inc_compaction_count();
     return toHold;
 }
 
@@ -454,7 +455,7 @@ DataStoreBase::markCompacting(uint32_t bufferId)
     state.setCompacting();
     state.disableElemHoldList();
     state.setFreeListList(nullptr);
-    ++_compaction_count;
+    inc_compaction_count();
 }
 
 std::vector<uint32_t>
diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.h b/vespalib/src/vespa/vespalib/datastore/datastorebase.h
index 2c7f3eae920..59e0d76b638 100644
--- a/vespalib/src/vespa/vespalib/datastore/datastorebase.h
+++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.h
@@ -358,7 +358,7 @@ public:
     uint32_t startCompactWorstBuffer(uint32_t typeId);
     std::vector<uint32_t> startCompactWorstBuffers(bool compactMemory, bool compactAddressSpace);
     uint64_t get_compaction_count() const { return _compaction_count.load(std::memory_order_relaxed); }
-    void bump_compaction_count() const { ++_compaction_count; }
+    void inc_compaction_count() const { ++_compaction_count; }
 };
 
 }