summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-01-15 23:14:32 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-01-16 15:41:24 +0000
commitb1bc742e8ac18dd41ea8f19919005257fbfa277b (patch)
treeecfb64cefacd9ec7addb9dff8b42da186a26a0d8 /storage
parentd3cf455cba32ef3f5280634470858e80761d8450 (diff)
Remove complicated option for slicing as it is not used anywhere.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/common/storagelink.cpp1
-rw-r--r--storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.cpp7
-rw-r--r--storage/src/vespa/storage/distributor/throttlingoperationstarter.cpp4
3 files changed, 7 insertions, 5 deletions
diff --git a/storage/src/vespa/storage/common/storagelink.cpp b/storage/src/vespa/storage/common/storagelink.cpp
index f73eb3ea36d..065f0b0b750 100644
--- a/storage/src/vespa/storage/common/storagelink.cpp
+++ b/storage/src/vespa/storage/common/storagelink.cpp
@@ -4,6 +4,7 @@
#include "bucketmessages.h"
#include <vespa/vespalib/util/backtrace.h>
#include <sstream>
+#include <cassert>
#include <vespa/log/bufferedlogger.h>
LOG_SETUP(".application.link");
diff --git a/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.cpp b/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.cpp
index e143f4d8570..15a57c1e7ee 100644
--- a/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.cpp
+++ b/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.cpp
@@ -2,6 +2,7 @@
#include "simplemaintenancescanner.h"
#include <vespa/storage/distributor/distributor_bucket_space.h>
#include <ostream>
+#include <cassert>
namespace storage::distributor {
@@ -16,10 +17,10 @@ SimpleMaintenanceScanner::SimpleMaintenanceScanner(BucketPriorityDatabase& bucke
{
}
-SimpleMaintenanceScanner::~SimpleMaintenanceScanner() {}
+SimpleMaintenanceScanner::~SimpleMaintenanceScanner() = default;
-SimpleMaintenanceScanner::PendingMaintenanceStats::PendingMaintenanceStats() {}
-SimpleMaintenanceScanner::PendingMaintenanceStats::~PendingMaintenanceStats() {}
+SimpleMaintenanceScanner::PendingMaintenanceStats::PendingMaintenanceStats() = default;
+SimpleMaintenanceScanner::PendingMaintenanceStats::~PendingMaintenanceStats() = default;
SimpleMaintenanceScanner::PendingMaintenanceStats::PendingMaintenanceStats(const PendingMaintenanceStats &) = default;
SimpleMaintenanceScanner::PendingMaintenanceStats &
SimpleMaintenanceScanner::PendingMaintenanceStats::operator = (const PendingMaintenanceStats &) = default;
diff --git a/storage/src/vespa/storage/distributor/throttlingoperationstarter.cpp b/storage/src/vespa/storage/distributor/throttlingoperationstarter.cpp
index abd9778d72c..9e3230a0f34 100644
--- a/storage/src/vespa/storage/distributor/throttlingoperationstarter.cpp
+++ b/storage/src/vespa/storage/distributor/throttlingoperationstarter.cpp
@@ -1,6 +1,7 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include "throttlingoperationstarter.h"
+#include <cassert>
namespace storage::distributor {
@@ -10,8 +11,7 @@ ThrottlingOperationStarter::ThrottlingOperation::~ThrottlingOperation()
}
bool
-ThrottlingOperationStarter::canStart(uint32_t currentOperationCount,
- Priority priority) const
+ThrottlingOperationStarter::canStart(uint32_t currentOperationCount, Priority priority) const
{
uint32_t variablePending(_maxPending - _minPending);
uint32_t maxPendingForPri(_minPending + variablePending*((255.0 - priority) / 255.0));