summaryrefslogtreecommitdiffstats
path: root/persistence
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@verizonmedia.com>2020-04-30 14:33:38 +0000
committerTor Brede Vekterli <vekterli@verizonmedia.com>2020-04-30 14:33:38 +0000
commit848e237cada565060e010a16fece18471723ecaa (patch)
tree28f0d5062e652b1e50f44f5c15da85b0c16428e4 /persistence
parent48ff6fe2efd6901796a9b8a0ceb8161232bcea15 (diff)
Remove deprecated BucketIntegrityChecker
Not in use after VDS was removed.
Diffstat (limited to 'persistence')
-rw-r--r--persistence/src/vespa/persistence/conformancetest/conformancetest.cpp17
-rw-r--r--persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp24
-rw-r--r--persistence/src/vespa/persistence/dummyimpl/dummypersistence.h7
-rw-r--r--persistence/src/vespa/persistence/spi/abstractpersistenceprovider.h5
-rw-r--r--persistence/src/vespa/persistence/spi/persistenceprovider.h9
5 files changed, 1 insertions, 61 deletions
diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
index 298e29cbecb..b45a4131e7c 100644
--- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
+++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
@@ -2080,23 +2080,6 @@ TEST_F(ConformanceTest, testJoinSameSourceBucketsTargetExists)
}
}
-TEST_F(ConformanceTest, testMaintain)
-{
- document::TestDocMan testDocMan;
- _factory->clear();
- PersistenceProvider::UP spi(getSpi(*_factory, testDocMan));
- Context context(defaultLoadType, Priority(0), Trace::TraceLevel(0));
- Document::SP doc1 = testDocMan.createRandomDocumentAtLocation(0x01, 1);
-
- Bucket bucket(makeSpiBucket(BucketId(8, 0x01)));
- spi->createBucket(bucket, context);
-
- spi->put(bucket, Timestamp(3), doc1, context);
-
- EXPECT_EQ(Result::ErrorType::NONE,
- spi->maintain(bucket, LOW).getErrorCode());
-}
-
TEST_F(ConformanceTest, testGetModifiedBuckets)
{
document::TestDocMan testDocMan;
diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp
index 3f05ed36802..984bbcd845f 100644
--- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp
+++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp
@@ -303,8 +303,7 @@ DummyPersistence::DummyPersistence(
_nextIterator(1),
_iterators(),
_monitor(),
- _clusterState(),
- _simulateMaintainFailure(false)
+ _clusterState()
{}
DummyPersistence::~DummyPersistence() {}
@@ -465,27 +464,6 @@ DummyPersistence::put(const Bucket& b, Timestamp t, Document::SP doc, Context&)
return Result();
}
-Result
-DummyPersistence::maintain(const Bucket& b, MaintenanceLevel)
-{
- assert(b.getBucketSpace() == FixedBucketSpaces::default_space());
- if (_simulateMaintainFailure) {
- BucketContentGuard::UP bc(acquireBucketWithLock(b));
- if (!bc.get()) {
- return BucketInfoResult(Result::ErrorType::TRANSIENT_ERROR, "Bucket not found");
- }
-
- if (!(*bc)->_entries.empty()) {
- // Simulate a corruption in a document, remove it.
- (*bc)->_entries.pop_back();
- }
- (*bc)->setOutdatedInfo(true);
- _simulateMaintainFailure = false;
- }
-
- return Result();
-}
-
RemoveResult
DummyPersistence::remove(const Bucket& b, Timestamp t, const DocumentId& did, Context&)
{
diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h
index 88e17a90a98..27ed95bd6ee 100644
--- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h
+++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h
@@ -174,7 +174,6 @@ public:
Result join(const Bucket& source1, const Bucket& source2, const Bucket& target, Context&) override;
Result revert(const Bucket&, Timestamp, Context&);
- Result maintain(const Bucket& bucket, MaintenanceLevel level) override;
/**
* The following methods are used only for unit testing.
@@ -195,10 +194,6 @@ public:
return *_clusterState;
}
- void simulateMaintenanceFailure() {
- _simulateMaintainFailure = true;
- }
-
private:
friend class BucketContentGuard;
// Const since funcs only alter mutable field in BucketContent
@@ -218,8 +213,6 @@ private:
std::unique_ptr<ClusterState> _clusterState;
- bool _simulateMaintainFailure;
-
std::unique_ptr<document::select::Node> parseDocumentSelection(
const string& documentSelection,
bool allowLeaf);
diff --git a/persistence/src/vespa/persistence/spi/abstractpersistenceprovider.h b/persistence/src/vespa/persistence/spi/abstractpersistenceprovider.h
index cbd76951004..e346fdaa3cb 100644
--- a/persistence/src/vespa/persistence/spi/abstractpersistenceprovider.h
+++ b/persistence/src/vespa/persistence/spi/abstractpersistenceprovider.h
@@ -33,11 +33,6 @@ public:
/**
* Default impl is empty.
*/
- Result maintain(const Bucket&, MaintenanceLevel) override { return Result(); }
-
- /**
- * Default impl is empty.
- */
Result removeEntry(const Bucket&, Timestamp, Context&) override { return Result(); }
/**
diff --git a/persistence/src/vespa/persistence/spi/persistenceprovider.h b/persistence/src/vespa/persistence/spi/persistenceprovider.h
index 70645b31902..338fa6e03b0 100644
--- a/persistence/src/vespa/persistence/spi/persistenceprovider.h
+++ b/persistence/src/vespa/persistence/spi/persistenceprovider.h
@@ -357,15 +357,6 @@ struct PersistenceProvider
virtual BucketIdListResult getModifiedBuckets(BucketSpace bucketSpace) const = 0;
/**
- * Allows the provider to do periodic maintenance and verification.
- *
- * @param level The level of maintenance to do. LOW maintenance is
- * scheduled more often than HIGH maintenance, allowing costly operations
- * to be run less.
- */
- virtual Result maintain(const Bucket&, MaintenanceLevel level) = 0;
-
- /**
* Splits the source bucket into the two target buckets.
* After the split, all documents belonging to target1 should be
* in that bucket, and all documents belonging to target2 should be