diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-16 22:55:04 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-16 22:55:04 -0600 |
commit | 06eae17d656fd281e05ca28d4e38696fc05d2dbf (patch) | |
tree | 3cd1f386e75cfdefaedb1ba19f8fbdc5533fc5b7 /searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp | |
parent | 72e3bfb3c55653e57991ba3aff1f58f25f20dd8b (diff) |
Revert "Revert "Balder/remove steadytimestamp 2""
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp index 2d5f86fbc58..7c9df8d3e47 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp @@ -94,8 +94,7 @@ struct MyMinimalFeedView : public MyMinimalFeedViewBase, public StoreOnlyFeedVie MyMinimalFeedViewBase(), StoreOnlyFeedView(StoreOnlyFeedView::Context(summaryAdapter, search::index::Schema::SP(), - DocumentMetaStoreContext::SP( - new DocumentMetaStoreContext(metaStore)), + std::make_shared<DocumentMetaStoreContext>(metaStore), *gidToLidChangeHandler, myGetDocumentTypeRepo(), writeService, @@ -109,23 +108,19 @@ struct MyMinimalFeedView : public MyMinimalFeedViewBase, public StoreOnlyFeedVie outstandingMoveOps(outstandingMoveOps_) { } - virtual void removeAttributes(SerialNum s, const LidVector &l, - bool immediateCommit, OnWriteDoneType onWriteDone) override { + void removeAttributes(SerialNum s, const LidVector &l, bool immediateCommit, OnWriteDoneType onWriteDone) override { StoreOnlyFeedView::removeAttributes(s, l, immediateCommit, onWriteDone); ++removeMultiAttributesCount; } - virtual void removeIndexedFields(SerialNum s, const LidVector &l, - bool immediateCommit, - OnWriteDoneType onWriteDone) override { - StoreOnlyFeedView::removeIndexedFields(s, l, - immediateCommit, onWriteDone); + void removeIndexedFields(SerialNum s, const LidVector &l, bool immediateCommit, OnWriteDoneType onWriteDone) override { + StoreOnlyFeedView::removeIndexedFields(s, l, immediateCommit, onWriteDone); ++removeMultiIndexFieldsCount; } - virtual void heartBeatIndexedFields(SerialNum s) override { + void heartBeatIndexedFields(SerialNum s) override { StoreOnlyFeedView::heartBeatIndexedFields(s); ++heartBeatIndexedFieldsCount; } - virtual void heartBeatAttributes(SerialNum s) override { + void heartBeatAttributes(SerialNum s) override { StoreOnlyFeedView::heartBeatAttributes(s); ++heartBeatAttributesCount; } @@ -154,26 +149,23 @@ struct MoveOperationFeedView : public MyMinimalFeedView { removeIndexFieldsCount(0), onWriteDoneContexts() {} - virtual void putAttributes(SerialNum, search::DocumentIdT, const document::Document &, - bool, OnPutDoneType onWriteDone) override { + void putAttributes(SerialNum, search::DocumentIdT, const document::Document &, bool, OnPutDoneType onWriteDone) override { ++putAttributesCount; EXPECT_EQUAL(1, outstandingMoveOps); onWriteDoneContexts.push_back(onWriteDone); } - virtual void putIndexedFields(SerialNum, search::DocumentIdT, const document::Document::SP &, - bool, OnOperationDoneType onWriteDone) override { + void putIndexedFields(SerialNum, search::DocumentIdT, const document::Document::SP &, + bool, OnOperationDoneType onWriteDone) override { ++putIndexFieldsCount; EXPECT_EQUAL(1, outstandingMoveOps); onWriteDoneContexts.push_back(onWriteDone); } - virtual void removeAttributes(SerialNum, search::DocumentIdT, - bool, OnRemoveDoneType onWriteDone) override { + void removeAttributes(SerialNum, search::DocumentIdT, bool, OnRemoveDoneType onWriteDone) override { ++removeAttributesCount; EXPECT_EQUAL(1, outstandingMoveOps); onWriteDoneContexts.push_back(onWriteDone); } - virtual void removeIndexedFields(SerialNum, search::DocumentIdT, - bool, OnRemoveDoneType onWriteDone) override { + void removeIndexedFields(SerialNum, search::DocumentIdT, bool, OnRemoveDoneType onWriteDone) override { ++removeIndexFieldsCount; EXPECT_EQUAL(1, outstandingMoveOps); onWriteDoneContexts.push_back(onWriteDone); @@ -186,7 +178,7 @@ struct MoveOperationCallback : public IDestructorCallback { MoveOperationCallback(int &outstandingMoveOps_) : outstandingMoveOps(outstandingMoveOps_) { ++outstandingMoveOps; } - virtual ~MoveOperationCallback() { + ~MoveOperationCallback() override { ASSERT_GREATER(outstandingMoveOps, 0); --outstandingMoveOps; } @@ -220,7 +212,7 @@ struct FixtureBase { sharedExecutor(1, 0x10000), writeService(sharedExecutor), lidReuseDelayer(writeService, *metaStore), - commitTimeTracker(fastos::TimeStamp()), + commitTimeTracker(vespalib::duration::zero()), feedview() { StoreOnlyFeedView::PersistentParams params(0, 0, DocTypeName("foo"), subdb_id, subDbType); |