Write unit tests for enum store batch updater.

3 files changed, 80 insertions, 2 deletions

diff --git a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
index 7c7c60f9a61..e1078e4f61d 100644
--- a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
+++ b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
@@ -301,6 +301,83 @@ TEST(EnumStoreTest, address_space_usage_is_reported)
     EXPECT_EQ(AddressSpace(3, 3, ADDRESS_LIMIT + 2), store.getAddressSpaceUsage());
 }
 
+class BatchUpdaterTest : public ::testing::Test {
+public:
+    NumericEnumStore store;
+    EnumIndex i3;
+    EnumIndex i5;
+
+    BatchUpdaterTest()
+        : store(false),
+          i3(),
+          i5()
+    {
+        auto updater = store.make_batch_updater();
+        i3 = updater.insert(3);
+        i5 = updater.insert(5);
+        updater.inc_ref_count(i3);
+        updater.inc_ref_count(i5);
+        updater.inc_ref_count(i5);
+        updater.commit();
+        expect_value_in_store(3, 1, i3);
+        expect_value_in_store(5, 2, i5);
+    }
+
+    void expect_value_in_store(int32_t exp_value, uint32_t exp_ref_count, EnumIndex idx) {
+        EnumIndex tmp_idx;
+        EXPECT_TRUE(store.findIndex(exp_value, tmp_idx));
+        EXPECT_EQ(idx, tmp_idx);
+        EXPECT_EQ(exp_value, store.getValue(idx));
+        EXPECT_EQ(exp_ref_count, store.getRefCount(idx));
+    }
+
+    void expect_value_not_in_store(int32_t value, EnumIndex idx) {
+        EnumIndex temp_idx;
+        EXPECT_FALSE(store.findIndex(value, idx));
+        EXPECT_EQ(0, store.getRefCount(idx));
+    }
+};
+
+TEST_F(BatchUpdaterTest, ref_counts_can_be_changed)
+{
+    auto updater = store.make_batch_updater();
+    EXPECT_EQ(i3, updater.insert(3));
+    updater.inc_ref_count(i3);
+    updater.dec_ref_count(i5);
+    updater.commit();
+
+    expect_value_in_store(3, 2, i3);
+    expect_value_in_store(5, 1, i5);
+}
+
+TEST_F(BatchUpdaterTest, new_value_can_be_inserted)
+{
+    auto updater = store.make_batch_updater();
+    EnumIndex i7 = updater.insert(7);
+    updater.inc_ref_count(i7);
+    updater.commit();
+
+    expect_value_in_store(7, 1, i7);
+}
+
+TEST_F(BatchUpdaterTest, value_with_ref_count_zero_is_removed)
+{
+    auto updater = store.make_batch_updater();
+    updater.dec_ref_count(i3);
+    updater.commit();
+
+    expect_value_not_in_store(3, i3);
+}
+
+TEST_F(BatchUpdaterTest, unused_new_value_is_removed)
+{
+    auto updater = store.make_batch_updater();
+    EnumIndex i7 = updater.insert(7);
+    updater.commit();
+
+    expect_value_not_in_store(7, i7);
+}
+
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.h b/searchlib/src/vespa/searchlib/attribute/enumstore.h
index 09c1404a4a7..c41794726ac 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstore.h
+++ b/searchlib/src/vespa/searchlib/attribute/enumstore.h
@@ -159,7 +159,7 @@ public:
             : _store(store),
               _possibly_unused()
         {}
-        void insert(EntryType value);
+        Index insert(EntryType value);
         void inc_ref_count(Index idx) {
             _store.get_entry_base(idx).inc_ref_count();
         }
diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp
index ce6d5b94aa6..908d25b62e2 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp
@@ -136,7 +136,7 @@ template <typename EntryT>
 EnumStoreT<EntryT>::NonEnumeratedLoader::~NonEnumeratedLoader() = default;
 
 template <typename EntryT>
-void
+IEnumStore::Index
 EnumStoreT<EntryT>::BatchUpdater::insert(EntryType value)
 {
     auto cmp = _store.make_comparator(value);
@@ -144,6 +144,7 @@ EnumStoreT<EntryT>::BatchUpdater::insert(EntryType value)
     if (result.inserted()) {
         _possibly_unused.insert(result.ref());
     }
+    return result.ref();
 }
 
 template <class EntryT>