diff options
10 files changed, 0 insertions, 45 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp index 2602ee377b7..f7702708c53 100644 --- a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp @@ -226,13 +226,6 @@ CombiningFeedView::heartBeat(search::SerialNum serialNum) } void -CombiningFeedView::sync() -{ - getReadyFeedView()->sync(); - // Assume this synced all feed views due to sharing of threads. -} - -void CombiningFeedView::forceCommit(const CommitParam & param, DoneCallback onDone) { for (const auto &view : _views) { diff --git a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h index 9df2c4c0c0f..3827b491896 100644 --- a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h +++ b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h @@ -76,7 +76,6 @@ public: void prepareMove(MoveOperation &putOp) override; void handleMove(const MoveOperation &moveOp, std::shared_ptr<vespalib::IDestructorCallback> moveDoneCtx) override; void heartBeat(search::SerialNum serialNum) override; - void sync() override; void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp) override; void handleCompactLidSpace(const CompactLidSpaceOperation &op) override; diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp index b8985a83ef1..ce7f1d70195 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp @@ -87,11 +87,4 @@ FastAccessFeedView::internalForceCommit(const CommitParam & param, OnForceCommit Parent::internalForceCommit(param, onCommitDone); } -void -FastAccessFeedView::sync() -{ - Parent::sync(); - _writeService.attributeFieldWriter().sync_all(); -} - } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.h b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.h index fae9527920a..a27bf04d701 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.h +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.h @@ -63,7 +63,6 @@ public: } void handleCompactLidSpace(const CompactLidSpaceOperation &op) override; - void sync() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/ifeedview.h b/searchcore/src/vespa/searchcore/proton/server/ifeedview.h index 4015589f43a..4feb7d013ea 100644 --- a/searchcore/src/vespa/searchcore/proton/server/ifeedview.h +++ b/searchcore/src/vespa/searchcore/proton/server/ifeedview.h @@ -59,7 +59,6 @@ public: virtual void prepareMove(MoveOperation &putOp) = 0; virtual void handleMove(const MoveOperation &putOp, DoneCallback onDone) = 0; virtual void heartBeat(search::SerialNum serialNum) = 0; - virtual void sync() = 0; virtual void forceCommit(const CommitParam & param, DoneCallback onDone) = 0; void forceCommit(CommitParam param) { forceCommit(param, DoneCallback()); } void forceCommit(search::SerialNum serialNum) { forceCommit(CommitParam(serialNum)); } diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp index 6101e8f0918..ca6551d7453 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp @@ -40,24 +40,6 @@ SearchableFeedView::SearchableFeedView(StoreOnlyFeedView::Context storeOnlyCtx, SearchableFeedView::~SearchableFeedView() = default; void -SearchableFeedView::performSync() -{ - // Called by index write thread, delays when sync() method on it completes. - assert(_writeService.index().isCurrentThread()); - _writeService.indexFieldInverter().sync_all(); - _writeService.indexFieldWriter().sync_all(); -} - -void -SearchableFeedView::sync() -{ - assert(_writeService.master().isCurrentThread()); - Parent::sync(); - _writeService.index().execute(makeLambdaTask([this]() { performSync(); })); - _writeService.index().sync(); -} - -void SearchableFeedView::putIndexedFields(SerialNum serialNum, search::DocumentIdT lid, const DocumentSP &newDoc, OnOperationDoneType onWriteDone) { diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h index 8a4c8d814bf..5ff309446d2 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h +++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h @@ -42,7 +42,6 @@ private: void performIndexHeartBeat(SerialNum serialNum); void internalDeleteBucket(const DeleteBucketOperation &delOp) override; - void performSync(); void heartBeatIndexedFields(SerialNum serialNum) override; void putIndexedFields(SerialNum serialNum, search::DocumentIdT lid, const DocumentSP &newDoc, OnOperationDoneType onWriteDone) override; @@ -60,7 +59,6 @@ public: ~SearchableFeedView() override; const IIndexWriter::SP &getIndexWriter() const { return _indexWriter; } void handleCompactLidSpace(const CompactLidSpaceOperation &op) override; - void sync() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp index 078017ea301..c9af1d86bb4 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp @@ -173,12 +173,6 @@ StoreOnlyFeedView::Context::Context(Context &&) noexcept = default; StoreOnlyFeedView::Context::~Context() = default; void -StoreOnlyFeedView::sync() -{ - _writeService.summary().sync(); -} - -void StoreOnlyFeedView::forceCommit(const CommitParam & param, DoneCallback onDone) { internalForceCommit(param, std::make_shared<ForceCommitContext>(_writeService.master(), _metaStore, diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h index 6b4dada1313..4e7a62548c2 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h @@ -236,7 +236,6 @@ public: void prepareMove(MoveOperation &putOp) override; void handleMove(const MoveOperation &putOp, std::shared_ptr<vespalib::IDestructorCallback> doneCtx) override; void heartBeat(search::SerialNum serialNum) override; - void sync() override; void forceCommit(const CommitParam & param, DoneCallback onDone) override; /** diff --git a/searchcore/src/vespa/searchcore/proton/test/dummy_feed_view.h b/searchcore/src/vespa/searchcore/proton/test/dummy_feed_view.h index e960aa601cb..af88f7fa6b7 100644 --- a/searchcore/src/vespa/searchcore/proton/test/dummy_feed_view.h +++ b/searchcore/src/vespa/searchcore/proton/test/dummy_feed_view.h @@ -29,7 +29,6 @@ struct DummyFeedView : public IFeedView void prepareMove(MoveOperation &) override {} void handleMove(const MoveOperation &, std::shared_ptr<vespalib::IDestructorCallback>) override {} void heartBeat(search::SerialNum) override {} - void sync() override {} void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &) override {} void handleCompactLidSpace(const CompactLidSpaceOperation &) override {} void forceCommit(const CommitParam &, DoneCallback) override { } |