summaryrefslogtreecommitdiffstats
path: root/persistence
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2021-01-13 11:01:39 +0100
committerTor Egge <Tor.Egge@broadpark.no>2021-01-13 11:30:47 +0100
commit16b01329d74df3f0fd63ff08156048afb1325dca (patch)
tree0d3b38696070ebef32277f29ad510108f5ba84ad /persistence
parent9c3327f07b0dd785619f0aa36d6a50a9092b298e (diff)
Remove unused revert method.
Diffstat (limited to 'persistence')
-rw-r--r--persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp53
-rw-r--r--persistence/src/vespa/persistence/dummyimpl/dummypersistence.h2
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.