diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2021-01-13 13:56:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-13 13:56:19 +0100 |
commit | 5ebae0d19ce3f6e74aa7cf148dba68b9d8aaea4a (patch) | |
tree | 75267e2217d33bc214e6fd0096dbdb6d8183f43f | |
parent | 722b8c62cc8a1477fb1570aa65034f3d519f6421 (diff) | |
parent | 16b01329d74df3f0fd63ff08156048afb1325dca (diff) |
Merge pull request #16027 from vespa-engine/toregge/remove-unused-revert-method
Remove unused revert method.
-rw-r--r-- | persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp | 53 | ||||
-rw-r--r-- | persistence/src/vespa/persistence/dummyimpl/dummypersistence.h | 2 |
2 files changed, 0 insertions, 55 deletions
diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp index a58adec5011..bc7310f4806 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp @@ -852,59 +852,6 @@ DummyPersistence::join(const Bucket& source1, const Bucket& source2, return Result(); } -Result -DummyPersistence::revert(const Bucket& b, Timestamp t, Context&) -{ - DUMMYPERSISTENCE_VERIFY_INITIALIZED; - LOG(debug, "revert(%s, %" PRIu64 ")", - b.toString().c_str(), - uint64_t(t)); - assert(b.getBucketSpace() == FixedBucketSpaces::default_space()); - - BucketContentGuard::UP bc(acquireBucketWithLock(b)); - if (!bc.get()) { - return BucketInfoResult(Result::ErrorType::TRANSIENT_ERROR, "Bucket not found"); - } - - BucketContent& content(**bc); - DocEntry::SP docEntry(content.getEntry(t)); - if (!docEntry.get()) { - return Result(); - } - - GlobalId gid(docEntry->getDocumentId()->getGlobalId()); - BucketContent::GidMapType::iterator gidIt(content._gidMap.find(gid)); - assert(gidIt != content._gidMap.end()); - - std::vector<BucketEntry> newEntries; - newEntries.reserve(content._entries.size() - 1); - Timestamp timestampToRestore(0); - for (uint32_t i=0; i<content._entries.size(); ++i) { - BucketEntry e(content._entries[i]); - if (e.entry->getTimestamp() == t) continue; - if (e.gid == gid - && e.entry->getTimestamp() > timestampToRestore) - { - // Set GID map entry to newest non-reverted doc entry - assert(e.entry.get() != gidIt->second.get()); - LOG(spam, "Remapping GID to point to %s", - e.entry->toString().c_str()); - gidIt->second = e.entry; - timestampToRestore = e.entry->getTimestamp(); - } - newEntries.push_back(e); - } - if (timestampToRestore == 0) { - LOG(spam, "Found no entry to revert to for %s; erasing from GID map", - docEntry->toString().c_str()); - content._gidMap.erase(gidIt); - } - newEntries.swap(content._entries); - content.setOutdatedInfo(true); - - return Result(); -} - std::string DummyPersistence::dumpBucket(const Bucket& b) const { diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h index a7827b2c218..6b80d6bab0f 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h @@ -175,8 +175,6 @@ public: Result join(const Bucket& source1, const Bucket& source2, const Bucket& target, Context&) override; - Result revert(const Bucket&, Timestamp, Context&); - /** * The following methods are used only for unit testing. * DummyPersistence is used many places to test the framework around it. |