aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-10-25 21:13:01 +0200
committerGitHub <noreply@github.com>2023-10-25 21:13:01 +0200
commit48799dd912425671ae06e80d30e00523d5477bbb (patch)
treed8602a7d79af9bd9f2bda1d32828c299aedadb09
parentd5e435d5955e6495330f47ffe1e36525abaca169 (diff)
parent62e2a3fa49be26eeaecf87e65d1c49ffb2984b54 (diff)
Merge pull request #29101 from vespa-engine/balder/no-explicit-commit-on-delete-bucket
Use regular commitIfChangeVectorTooLarge instead of explicit initiate…
-rw-r--r--searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp1
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
index 8e2b097cd35..f81b47583b9 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
@@ -549,6 +549,7 @@ public:
for (auto lidToRemove : _lidsToRemove) {
applyRemoveToAttribute(_serialNum, lidToRemove, attr, _onWriteDone);
}
+ attr.commitIfChangeVectorTooLarge();
}
}
}
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
index 06d201a4bda..f5774734949 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
@@ -288,7 +288,6 @@ FeedHandler::performDeleteBucket(FeedToken token, DeleteBucketOperation &op) {
_activeFeedView->handleDeleteBucket(op, token);
// Delete bucket itself, should no longer have documents.
_bucketDBHandler->handleDeleteBucket(op.getBucketId());
- initiateCommit(vespalib::steady_clock::now());
}
void