Merge pull request #1571 from yahoo/balder/add-onAddDocs-interface

Balder/add on add docs interface

2 files changed, 4 insertions, 7 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
index 5abde5ce266..c6c1720c27b 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
@@ -145,10 +145,8 @@ DocumentMetaStore::peekFreeLid()
 void
 DocumentMetaStore::ensureSpace(DocId lid)
 {
-    _metaDataStore.reserve(lid+1);
-    while (lid >= _metaDataStore.size()) {
-        _metaDataStore.push_back(RawDocumentMetaData());
-    }
+    _metaDataStore.ensure_size(lid+1, RawDocumentMetaData());
+
     setNumDocs(_metaDataStore.size());
     unsigned int newSize = _metaDataStore.size();
     unsigned int newCapacity = _metaDataStore.capacity();
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
index 72f79b6c67e..0abec2b44ca 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
@@ -83,9 +83,8 @@ LidAllocator::ensureSpace(DocId lid,
                           uint32_t newCapacity)
 {
     ensureSpace(newSize, newCapacity);
-    while(lid >= _activeLids.getNumDocs()) {
-        DocId activeLid;
-        _activeLids.addDoc(activeLid);
+    if (lid >= _activeLids.getNumDocs()) {
+        _activeLids.addDocs((lid - _activeLids.getNumDocs()) + 1);
     }
     _activeLids.commit();
 }