diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2017-05-15 17:09:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-15 17:09:18 +0000 |
commit | bed2084b5d15892e9834fd269d70475faf5b70d1 (patch) | |
tree | 63a00a9ced817d8a3dbed0f6c0279a27fdc972b7 /searchlib | |
parent | 4e493944efc4989519b54d349aeb77780d68b01c (diff) |
Revert "Toregge/add shrink lid space flush target"
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/attributevector.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp index e3fb780bb16..cea30a8359c 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp @@ -707,7 +707,7 @@ uint32_t AttributeVector::getVersion() const { return 0; } void AttributeVector::compactLidSpace(uint32_t wantedLidLimit) { commit(); - assert(_committedDocIdLimit >= wantedLidLimit); + assert(_uncommittedDocIdLimit <= wantedLidLimit); if (wantedLidLimit < _committedDocIdLimit) { clearDocs(wantedLidLimit, _committedDocIdLimit); } @@ -729,10 +729,7 @@ void AttributeVector::shrinkLidSpace(void) { commit(); - removeAllOldGenerations(); - if (!canShrinkLidSpace()) { - return; - } + assert(canShrinkLidSpace()); uint32_t committedDocIdLimit = _committedDocIdLimit; clearDocs(committedDocIdLimit, getNumDocs()); commit(); |