diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-16 11:45:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-16 11:45:12 +0100 |
commit | b324c19e007a7a57ba731ed72a01d35cd6937ed7 (patch) | |
tree | fd27f6cd58d35168a17c0ed4b7e9765457b19e10 /storage | |
parent | 99eb3b5fe51397ec2fb29e2388e97c24a28ffb69 (diff) | |
parent | 6b816198bd0d8a518465c8015e6dc9ee40399cd2 (diff) |
Merge pull request #11782 from vespa-engine/balder/bring-you-backing-buffer-along
Balder/bring your backing buffer along
Diffstat (limited to 'storage')
4 files changed, 16 insertions, 16 deletions
diff --git a/storage/src/tests/persistence/testandsettest.cpp b/storage/src/tests/persistence/testandsettest.cpp index fe10d346ba7..1507f0e8f0d 100644 --- a/storage/src/tests/persistence/testandsettest.cpp +++ b/storage/src/tests/persistence/testandsettest.cpp @@ -294,9 +294,9 @@ std::string TestAndSetTest::expectedDocEntryString( ss << "DocEntry(" << timestamp << ", " << removeFlag << ", "; if (removeFlag == spi::REMOVE_ENTRY) { - ss << docId.toString() << ")\n"; + ss << docId << ")\n"; } else { - ss << "Doc(" << docId.toString() << "))\n"; + ss << "Doc(" << docId << "))\n"; } return ss.str(); diff --git a/storage/src/vespa/storage/persistence/processallhandler.cpp b/storage/src/vespa/storage/persistence/processallhandler.cpp index 7cb373279a6..8c951a9f50d 100644 --- a/storage/src/vespa/storage/persistence/processallhandler.cpp +++ b/storage/src/vespa/storage/persistence/processallhandler.cpp @@ -56,11 +56,11 @@ public: void process(spi::DocEntry& e) override { ost << " Timestamp: " << e.getTimestamp() << ", "; - if (e.getDocument() != 0) { + if (e.getDocument() != nullptr) { ost << "Doc(" << e.getDocument()->getId() << ")" << ", " << e.getDocument()->getId().getGlobalId().toString() << ", size: " << e.getPersistedDocumentSize(); - } else if (e.getDocumentId() != 0) { + } else if (e.getDocumentId() != nullptr) { ost << *e.getDocumentId() << ", " << e.getDocumentId()->getGlobalId().toString(); } else { diff --git a/storage/src/vespa/storage/persistence/splitbitdetector.cpp b/storage/src/vespa/storage/persistence/splitbitdetector.cpp index 1133c470bb0..0208b220b79 100644 --- a/storage/src/vespa/storage/persistence/splitbitdetector.cpp +++ b/storage/src/vespa/storage/persistence/splitbitdetector.cpp @@ -109,7 +109,7 @@ BucketVisitor::BucketVisitor(const document::BucketIdFactory& factory) _splitMask = (_splitMask << 1) | 1; } } -BucketVisitor::~BucketVisitor() { } +BucketVisitor::~BucketVisitor() = default; bool smallerThanSizeLimit(uint32_t minCount, diff --git a/storage/src/vespa/storage/storageserver/opslogger.cpp b/storage/src/vespa/storage/storageserver/opslogger.cpp index feb48b97b5b..6fc9795993e 100644 --- a/storage/src/vespa/storage/storageserver/opslogger.cpp +++ b/storage/src/vespa/storage/storageserver/opslogger.cpp @@ -14,7 +14,7 @@ OpsLogger::OpsLogger(StorageComponentRegister& compReg, : StorageLink("Operations logger"), _lock(), _fileName(), - _targetFile(0), + _targetFile(nullptr), _component(compReg, "opslogger"), _configFetcher(configUri.getContext()) { @@ -46,9 +46,9 @@ OpsLogger::configure(std::unique_ptr<vespa::config::content::core::StorOpslogger // If no change in state, ignore if (config->targetfile == _fileName) return; // If a change we need to close old handle if open - if (_targetFile != 0) { + if (_targetFile != nullptr) { fclose(_targetFile); - _targetFile = 0; + _targetFile = nullptr; } // Set up the new operations log file _fileName = config->targetfile; @@ -73,14 +73,14 @@ OpsLogger::print(std::ostream& out, bool verbose, bool OpsLogger::onPutReply(const std::shared_ptr<api::PutReply>& msg) { - if (_targetFile == 0) return false; + if (_targetFile == nullptr) return false; std::ostringstream ost; ost << _component.getClock().getTimeInSeconds().getTime() << "\tPUT\t" << msg->getDocumentId() << "\t" << msg->getResult().toString() << "\n"; { vespalib::LockGuard lock(_lock); - if (_targetFile == 0) return false; + if (_targetFile == nullptr) return false; fwrite(ost.str().c_str(), ost.str().length(), 1, _targetFile); fflush(_targetFile); } @@ -90,14 +90,14 @@ OpsLogger::onPutReply(const std::shared_ptr<api::PutReply>& msg) bool OpsLogger::onUpdateReply(const std::shared_ptr<api::UpdateReply>& msg) { - if (_targetFile == 0) return false; + if (_targetFile == nullptr) return false; std::ostringstream ost; ost << _component.getClock().getTimeInSeconds().getTime() << "\tUPDATE\t" << msg->getDocumentId() << "\t" << msg->getResult().toString() << "\n"; { vespalib::LockGuard lock(_lock); - if (_targetFile == 0) return false; + if (_targetFile == nullptr) return false; fwrite(ost.str().c_str(), ost.str().length(), 1, _targetFile); fflush(_targetFile); } @@ -107,14 +107,14 @@ OpsLogger::onUpdateReply(const std::shared_ptr<api::UpdateReply>& msg) bool OpsLogger::onRemoveReply(const std::shared_ptr<api::RemoveReply>& msg) { - if (_targetFile == 0) return false; + if (_targetFile == nullptr) return false; std::ostringstream ost; ost << _component.getClock().getTimeInSeconds().getTime() << "\tREMOVE\t" << msg->getDocumentId() << "\t" << msg->getResult().toString() << "\n"; { vespalib::LockGuard lock(_lock); - if (_targetFile == 0) return false; + if (_targetFile == nullptr) return false; fwrite(ost.str().c_str(), ost.str().length(), 1, _targetFile); fflush(_targetFile); } @@ -124,14 +124,14 @@ OpsLogger::onRemoveReply(const std::shared_ptr<api::RemoveReply>& msg) bool OpsLogger::onGetReply(const std::shared_ptr<api::GetReply>& msg) { - if (_targetFile == 0) return false; + if (_targetFile == nullptr) return false; std::ostringstream ost; ost << _component.getClock().getTimeInSeconds().getTime() << "\tGET\t" << msg->getDocumentId() << "\t" << msg->getResult().toString() << "\n"; { vespalib::LockGuard lock(_lock); - if (_targetFile == 0) return false; + if (_targetFile == nullptr) return false; fwrite(ost.str().c_str(), ost.str().length(), 1, _targetFile); fflush(_targetFile); } |