summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2021-04-23 22:19:00 +0200
committerTor Egge <Tor.Egge@online.no>2021-04-23 22:19:35 +0200
commit63be185b6872f0a6db024afbb11955b11cacfe0e (patch)
treeca826bdab645a83e6508780c134ef7516ac37893 /storage
parentbbf989a83f7f9cec05bbc31c8bca1cfcad34f8c7 (diff)
Remove unused variables and arguments.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.cpp5
-rw-r--r--storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h5
-rw-r--r--storage/src/vespa/storage/distributor/pendingclusterstate.cpp2
3 files changed, 3 insertions, 9 deletions
diff --git a/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.cpp b/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.cpp
index 8e54cfcb27d..335d070ad7b 100644
--- a/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.cpp
+++ b/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.cpp
@@ -18,8 +18,7 @@ using lib::Node;
using lib::NodeType;
using lib::NodeState;
-PendingBucketSpaceDbTransition::PendingBucketSpaceDbTransition(const PendingClusterState &pendingClusterState,
- document::BucketSpace bucket_space,
+PendingBucketSpaceDbTransition::PendingBucketSpaceDbTransition(document::BucketSpace bucket_space,
DistributorBucketSpace &distributorBucketSpace,
bool distributionChanged,
const OutdatedNodes &outdatedNodes,
@@ -28,7 +27,6 @@ PendingBucketSpaceDbTransition::PendingBucketSpaceDbTransition(const PendingClus
api::Timestamp creationTimestamp)
: _bucket_space(bucket_space),
_entries(),
- _iter(0),
_removedBuckets(),
_missingEntries(),
_clusterInfo(std::move(clusterInfo)),
@@ -36,7 +34,6 @@ PendingBucketSpaceDbTransition::PendingBucketSpaceDbTransition(const PendingClus
_prevClusterState(distributorBucketSpace.getClusterState()),
_newClusterState(newClusterState),
_creationTimestamp(creationTimestamp),
- _pendingClusterState(pendingClusterState),
_distributorBucketSpace(distributorBucketSpace),
_distributorIndex(_clusterInfo->getDistributorIndex()),
_bucketOwnershipTransfer(distributionChanged),
diff --git a/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h b/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h
index 86d2c89bf23..f7766cb265d 100644
--- a/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h
+++ b/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h
@@ -36,7 +36,6 @@ private:
document::BucketSpace _bucket_space;
EntryList _entries;
- uint32_t _iter;
std::vector<document::BucketId> _removedBuckets;
std::vector<Range> _missingEntries;
std::shared_ptr<const ClusterInformation> _clusterInfo;
@@ -51,7 +50,6 @@ private:
const lib::ClusterState& _prevClusterState;
const lib::ClusterState& _newClusterState;
const api::Timestamp _creationTimestamp;
- const PendingClusterState& _pendingClusterState;
DistributorBucketSpace& _distributorBucketSpace;
uint16_t _distributorIndex;
bool _bucketOwnershipTransfer;
@@ -127,8 +125,7 @@ public:
}
};
- PendingBucketSpaceDbTransition(const PendingClusterState &pendingClusterState,
- document::BucketSpace bucket_space,
+ PendingBucketSpaceDbTransition(document::BucketSpace bucket_space,
DistributorBucketSpace &distributorBucketSpace,
bool distributionChanged,
const OutdatedNodes &outdatedNodes,
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
index 9e811ea9d23..77760174253 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
@@ -85,7 +85,7 @@ PendingClusterState::initializeBucketSpaceTransitions(bool distributionChanged,
const auto &outdatedNodes = (onItr == outdatedNodesMap.end()) ? emptyOutdatedNodes : onItr->second;
auto pendingTransition =
std::make_unique<PendingBucketSpaceDbTransition>(
- *this, elem.first, *elem.second, distributionChanged, outdatedNodes,
+ elem.first, *elem.second, distributionChanged, outdatedNodes,
_clusterInfo, *_newClusterStateBundle.getDerivedClusterState(elem.first), _creationTimestamp);
if (pendingTransition->getBucketOwnershipTransfer()) {
_bucketOwnershipTransfer = true;