Merge pull request #11748 from vespa-engine/geirst/optimize-matched-elements-only-filter

Optimize handling of "matched-elements-only" when the input field as …

1 files changed, 15 insertions, 1 deletions

diff --git a/document/src/vespa/document/fieldvalue/mapfieldvalue.h b/document/src/vespa/document/fieldvalue/mapfieldvalue.h
index d761a37612e..bed4275d61f 100644
--- a/document/src/vespa/document/fieldvalue/mapfieldvalue.h
+++ b/document/src/vespa/document/fieldvalue/mapfieldvalue.h
@@ -72,8 +72,8 @@ public:
         mutable pair   _current;
     };
     class const_iterator {
-        typedef std::pair<const FieldValue *, const FieldValue *> pair;
     public:
+        typedef std::pair<const FieldValue *, const FieldValue *> pair;
         const_iterator(const MapFieldValue & map, size_t index) : _map(&map), _index(index) { }
         bool operator == (const const_iterator & rhs) const { return _map == rhs._map && _index == rhs._index; }
         bool operator != (const const_iterator & rhs) const { return _map != rhs._map || _index != rhs._index; }
@@ -147,6 +147,20 @@ public:
     const_iterator find(const FieldValue& fv) const;
     iterator find(const FieldValue& fv);
 
+    bool has_no_erased_keys() const {
+        return (_keys->size() == _count) && (_values->size() == _count);
+    }
+
+    /**
+     * Returns the key-value pair at the given position in the underlying arrays.
+     *
+     * Note: Should only be used when has_no_erased_keys() returns true.
+     * Otherwise you might access elements that are conceptually removed.
+     */
+    const_iterator::pair operator[](size_t idx) const {
+        return const_iterator::pair(&(*_keys)[idx], &(*_values)[idx]);
+    }
+
     FieldValue::UP createValue() const;
 
     DECLARE_IDENTIFIABLE_ABSTRACT(MapFieldValue);