Revert "Use gid to lid change handler interface directly"

1 files changed, 42 insertions, 0 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.cpp b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.cpp
index 036f482b2e8..270f4d51788 100644
--- a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.cpp
@@ -147,5 +147,47 @@ long ImportedAttributeVector::onSerializeForDescendingSort(DocId doc,
             _reference_attribute->getReferencedLid(doc), serTo, available, bc);
 }
 
+namespace {
+
+class ImportedAttributeGuard : public AttributeGuard {
+public:
+    ImportedAttributeGuard(const AttributeVectorSP& target_attr,
+                           const AttributeVectorSP& reference_attr)
+        : AttributeGuard(),
+          _target_attr_guard(target_attr),
+          _reference_attr_guard(reference_attr)
+    {
+    }
+    
+private:
+    AttributeGuard _target_attr_guard;
+    AttributeGuard _reference_attr_guard;
+};
+
+class ImportedAttributeEnumGuard : public AttributeEnumGuard {
+public:
+    ImportedAttributeEnumGuard(const AttributeVectorSP& target_attr,
+                               const AttributeVectorSP& reference_attr)
+        : AttributeEnumGuard(AttributeVectorSP()),
+          _target_attr_enum_guard(target_attr),
+          _reference_attr_guard(reference_attr)
+    {
+    }
+    
+private:
+    AttributeEnumGuard _target_attr_enum_guard;
+    AttributeGuard _reference_attr_guard;
+};
+
+}
+
+std::unique_ptr<AttributeGuard> ImportedAttributeVector::acquireGuard() const {
+    return std::make_unique<ImportedAttributeGuard>(_target_attribute, _reference_attribute);
+}
+
+std::unique_ptr<AttributeEnumGuard> ImportedAttributeVector::acquireEnumGuard() const {
+    return std::make_unique<ImportedAttributeEnumGuard>(_target_attribute, _reference_attribute);
+}
+
 }
 }