summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2017-11-16 15:03:21 +0000
committerTor Egge <Tor.Egge@oath.com>2017-11-16 15:03:21 +0000
commit969bccadf390ee415bd1a37a12a9a97e049990b2 (patch)
treef9d463db27733fbb0ba2c6088cfaf0664c3de220 /storage
parent7bd5de519e6ca64cb0ed2c513c2d0f97663582ce (diff)
Remove unused class MaintenanceBucket.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/distributor/distributor.h1
-rw-r--r--storage/src/vespa/storage/distributor/distributorinterface.h1
-rw-r--r--storage/src/vespa/storage/distributor/maintenancebucket.h59
-rw-r--r--storage/src/vespa/storage/distributor/statechecker.h2
4 files changed, 1 insertions, 62 deletions
diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h
index 3cb3408a951..bb50e69c70e 100644
--- a/storage/src/vespa/storage/distributor/distributor.h
+++ b/storage/src/vespa/storage/distributor/distributor.h
@@ -6,7 +6,6 @@
#include "bucketdbupdater.h"
#include "pendingmessagetracker.h"
#include "externaloperationhandler.h"
-#include "maintenancebucket.h"
#include "min_replica_provider.h"
#include "distributorinterface.h"
diff --git a/storage/src/vespa/storage/distributor/distributorinterface.h b/storage/src/vespa/storage/distributor/distributorinterface.h
index cd51387964a..749e8a07651 100644
--- a/storage/src/vespa/storage/distributor/distributorinterface.h
+++ b/storage/src/vespa/storage/distributor/distributorinterface.h
@@ -5,7 +5,6 @@
#include <vespa/storage/common/messagesender.h>
#include <vespa/storage/distributor/pendingmessagetracker.h>
#include <vespa/storageapi/message/state.h>
-#include <vespa/storage/distributor/maintenancebucket.h>
#include <vespa/storage/bucketdb/bucketdatabase.h>
#include <vespa/storage/distributor/bucketgctimecalculator.h>
#include <vespa/storage/distributor/distributormetricsset.h>
diff --git a/storage/src/vespa/storage/distributor/maintenancebucket.h b/storage/src/vespa/storage/distributor/maintenancebucket.h
deleted file mode 100644
index a44381830c5..00000000000
--- a/storage/src/vespa/storage/distributor/maintenancebucket.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include <vespa/document/bucket/bucketid.h>
-#include <vespa/vespalib/util/stringfmt.h>
-#include <vespa/storage/distributor/maintenance/maintenancepriority.h>
-
-namespace storage {
-
-namespace distributor {
-
-/**
- * Simple container to communicate a bucket that needs to be
- * checked for maintenanceoperations.
- */
-class MaintenanceBucket {
-public:
- typedef MaintenancePriority::Priority Priority;
-
- MaintenanceBucket()
- : node(0),
- pri(MaintenancePriority::NO_MAINTENANCE_NEEDED)
- {}
-
- MaintenanceBucket(const document::BucketId& bid_,
- uint16_t node_,
- Priority pri_)
- : bid(bid_),
- node(node_),
- pri(pri_)
- {
-
- }
-
- // The bucket to be checked.
- document::BucketId bid;
-
- // The primary node of the bucket.
- uint16_t node;
-
- // The priority to check the bucket.
- Priority pri;
-
- bool requiresMaintenance() const {
- return pri != MaintenancePriority::NO_MAINTENANCE_NEEDED;
- }
-
- std::string toString() const {
- return vespalib::make_string("MaintenanceBucket(%s: Node %d, Pri %s)",
- bid.toString().c_str(),
- (int)node,
- MaintenancePriority::toString(pri).c_str());
- }
-};
-
-}
-
-}
-
diff --git a/storage/src/vespa/storage/distributor/statechecker.h b/storage/src/vespa/storage/distributor/statechecker.h
index 9f9f57dd3bf..e204cf5325a 100644
--- a/storage/src/vespa/storage/distributor/statechecker.h
+++ b/storage/src/vespa/storage/distributor/statechecker.h
@@ -2,7 +2,7 @@
#pragma once
#include "bucketgctimecalculator.h"
-#include "maintenancebucket.h"
+#include <vespa/storage/distributor/maintenance/maintenancepriority.h>
#include <vespa/storage/distributor/operations/idealstate/idealstateoperation.h>
#include <vespa/storage/common/storagecomponent.h>
#include <vespa/storage/bucketdb/bucketdatabase.h>