Always use array of AtomicEntryRef in unique store remapper.

2 files changed, 13 insertions, 18 deletions

diff --git a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
index aa2d060d20b..17e7a4bb7ea 100644
--- a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
+++ b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
@@ -119,24 +119,27 @@ struct TestBase : public ::testing::Test {
     }
     void compactWorst() {
         CompactionSpec compaction_spec(true, true);
-        CompactionStrategy compaction_strategy;
+        // Use a compaction strategy that will compact all active buffers
+        CompactionStrategy compaction_strategy(0.0, 0.0, EntryRefType::numBuffers(), 1.0);
         auto remapper = store.compact_worst(compaction_spec, compaction_strategy);
-        std::vector<EntryRef> refs;
+        std::vector<AtomicEntryRef> refs;
         for (const auto &elem : refStore) {
-            refs.push_back(elem.first);
+            refs.push_back(AtomicEntryRef(elem.first));
         }
-        refs.push_back(EntryRef());
-        std::vector<EntryRef> compactedRefs = refs;
-        remapper->remap(ArrayRef<EntryRef>(compactedRefs));
+        refs.push_back(AtomicEntryRef());
+        std::vector<AtomicEntryRef> compactedRefs = refs;
+        remapper->remap(ArrayRef<AtomicEntryRef>(compactedRefs));
         remapper->done();
         remapper.reset();
-        ASSERT_FALSE(refs.back().valid());
+        ASSERT_FALSE(refs.back().load_relaxed().valid());
         refs.pop_back();
+        ASSERT_FALSE(compactedRefs.back().load_relaxed().valid());
+        compactedRefs.pop_back();
         ReferenceStore compactedRefStore;
         for (size_t i = 0; i < refs.size(); ++i) {
-            ASSERT_EQ(0u, compactedRefStore.count(compactedRefs[i]));
-            ASSERT_EQ(1u, refStore.count(refs[i]));
-            compactedRefStore.insert(std::make_pair(compactedRefs[i], refStore[refs[i]]));
+            ASSERT_EQ(0u, compactedRefStore.count(compactedRefs[i].load_relaxed()));
+            ASSERT_EQ(1u, refStore.count(refs[i].load_relaxed()));
+            compactedRefStore.insert(std::make_pair(compactedRefs[i].load_relaxed(), refStore[refs[i].load_relaxed()]));
         }
         refStore = compactedRefStore;
     }
diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_remapper.h b/vespalib/src/vespa/vespalib/datastore/unique_store_remapper.h
index 47d52bf8991..80486f55ad8 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store_remapper.h
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store_remapper.h
@@ -38,14 +38,6 @@ public:
         return mapped_ref;
     }
 
-    void remap(vespalib::ArrayRef<EntryRef> refs) const {
-        for (auto &ref : refs) {
-            if (ref.valid() && _compacting_buffer.has(ref)) {
-                ref = remap(ref);
-            }
-        }
-    }
-
     void remap(vespalib::ArrayRef<AtomicEntryRef> refs) const {
         for (auto &atomic_ref : refs) {
             auto ref = atomic_ref.load_relaxed();