From 40e7d157350efdc491485a45283bbb6fa93dac55 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sat, 15 Feb 2020 12:02:26 +0000 Subject: Avoid copying BucketState, when you only need BucketInfo. --- storage/src/vespa/storage/persistence/persistencethread.cpp | 4 ++-- storage/src/vespa/storage/tools/analyzedistribution.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'storage') diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp index 7d0ce26b83d..dd44c96555b 100644 --- a/storage/src/vespa/storage/persistence/persistencethread.cpp +++ b/storage/src/vespa/storage/persistence/persistencethread.cpp @@ -795,8 +795,8 @@ PersistenceThread::handleCommand(api::StorageCommand& msg) { _context = spi::Context(msg.getLoadType(), msg.getPriority(), msg.getTrace().getLevel()); MessageTracker::UP mtracker(handleCommandSplitByType(msg)); - if (mtracker.get() != 0) { - if (mtracker->getReply().get() != 0) { + if (mtracker) { + if (mtracker->getReply()) { mtracker->getReply()->getTrace().getRoot().addChild(_context.getTrace().getRoot()); } else { msg.getTrace().getRoot().addChild(_context.getTrace().getRoot()); diff --git a/storage/src/vespa/storage/tools/analyzedistribution.cpp b/storage/src/vespa/storage/tools/analyzedistribution.cpp index 52c26c4bb17..472aa63fff6 100644 --- a/storage/src/vespa/storage/tools/analyzedistribution.cpp +++ b/storage/src/vespa/storage/tools/analyzedistribution.cpp @@ -132,7 +132,7 @@ Node::Node(const lib::NodeState& dstate, const lib::NodeState& sstate, uint32_t disks.push_back(Disk(storageState.getDiskState(i))); } } -Node::~Node() {} +Node::~Node() = default; struct Distribution { std::vector nodes; -- cgit v1.2.3