Revert "Add imported attribute vector"

1 files changed, 29 insertions, 3 deletions

diff --git a/searchlib/src/tests/attribute/reference_attribute/reference_attribute_test.cpp b/searchlib/src/tests/attribute/reference_attribute/reference_attribute_test.cpp
index 8b305e6c39e..eb035189b31 100644
--- a/searchlib/src/tests/attribute/reference_attribute/reference_attribute_test.cpp
+++ b/searchlib/src/tests/attribute/reference_attribute/reference_attribute_test.cpp
@@ -10,7 +10,6 @@ LOG_SETUP("reference_attribute_test");
 #include <vespa/searchlib/attribute/reference_attribute.h>
 #include <vespa/searchlib/common/i_gid_to_lid_mapper_factory.h>
 #include <vespa/searchlib/common/i_gid_to_lid_mapper.h>
-#include <vespa/searchlib/test/mock_gid_to_lid_mapping.h>
 #include <vespa/document/base/documentid.h>
 
 using search::MemoryUsage;
@@ -36,12 +35,39 @@ vespalib::string doc3("id:test:music::3");
 
 }
 
-struct MyGidToLidMapperFactory : public search::attribute::test::MockGidToLidMapperFactory
+using MockGidToLidMap = std::map<GlobalId, uint32_t>;
+
+struct MyGidToLidMapper : public search::IGidToLidMapper
 {
-    MyGidToLidMapperFactory() {
+    const MockGidToLidMap &_map;
+    MyGidToLidMapper(const MockGidToLidMap &map)
+        : _map(map)
+    {
+    }
+    virtual uint32_t mapGidToLid(const document::GlobalId &gid) const override {
+        auto itr = _map.find(gid);
+        if (itr != _map.end()) {
+            return itr->second;
+        } else {
+            return 0u;
+        }
+    }
+};
+
+struct MyGidToLidMapperFactory : public search::IGidToLidMapperFactory
+{
+    MockGidToLidMap _map;
+
+    MyGidToLidMapperFactory()
+        : _map()
+    {
         _map.insert({toGid(doc1), 10});
         _map.insert({toGid(doc2), 17});
     }
+
+    virtual std::unique_ptr<search::IGidToLidMapper> getMapper() const {
+        return std::make_unique<MyGidToLidMapper>(_map);
+    }
 };
 
 struct Fixture