summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-10-26 17:02:22 +0200
committerGitHub <noreply@github.com>2021-10-26 17:02:22 +0200
commitbef3d217175256894651359439893fdea6edde63 (patch)
tree76cf4039a8169d0611a448d00dec34b938231aaf
parent2712b0b3f8a240f38c3cfd398c930314b7c81388 (diff)
parent513e9321e46252c8258833f258e3f3c8c9128afd (diff)
Merge pull request #19733 from vespa-engine/balder/gc-unused-using
Perform attribute commit after delete bucket
-rw-r--r--searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp1
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp4
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/searchview.cpp3
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp4
4 files changed, 1 insertions, 11 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
index 26374ba1480..433d2a954a3 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
@@ -513,6 +513,7 @@ public:
for (auto lidToRemove : _lidsToRemove) {
applyRemoveToAttribute(_serialNum, lidToRemove, attr, _onWriteDone);
}
+ attr.commit(false);
}
}
}
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
index ea52cb14d00..3322722a642 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
@@ -21,13 +21,9 @@
using vespa::config::search::RankProfilesConfig;
using proton::matching::MatchingStats;
using proton::matching::SessionManager;
-using search::AttributeGuard;
-using search::AttributeVector;
using search::GrowStrategy;
-using search::TuneFileDocumentDB;
using search::index::Schema;
using search::SerialNum;
-using vespalib::ThreadStackExecutorBase;
using vespalib::eval::FastValueBuilderFactory;
using namespace searchcorespi;
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp
index 896900c3a82..4e051a18de4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp
@@ -10,9 +10,6 @@
LOG_SETUP(".proton.server.searchview");
using proton::matching::MatchContext;
-using search::AttributeGuard;
-using search::AttributeVector;
-using search::attribute::IAttributeContext;
using search::docsummary::IDocsumStore;
using search::docsummary::ResultConfig;
using search::engine::DocsumReply;
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index ca86eaa5a84..7ab60270411 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -31,11 +31,7 @@ LOG_SETUP(".proton.server.storeonlydocsubdb");
using search::CompactionStrategy;
using search::GrowStrategy;
-using search::AttributeGuard;
-using search::AttributeVector;
-using search::IndexMetaInfo;
using vespalib::makeLambdaTask;
-using search::TuneFileDocumentDB;
using search::index::Schema;
using search::SerialNum;
using vespalib::IllegalStateException;