diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-14 14:56:03 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-14 14:56:03 +0000 |
commit | 80835efd5c385b6f8e19212a7c032e57af1fd73d (patch) | |
tree | 8dc193f8ef1db5ac6f41d3b3266c8f87dc06cfd7 /storage | |
parent | a772cb05a682fd05fabd0d571417ec7976d0165d (diff) |
Remove virtuality of DocumentId.
Diffstat (limited to 'storage')
3 files changed, 21 insertions, 21 deletions
diff --git a/storage/src/vespa/storage/persistence/processallhandler.cpp b/storage/src/vespa/storage/persistence/processallhandler.cpp index 7cb373279a6..39708f33793 100644 --- a/storage/src/vespa/storage/persistence/processallhandler.cpp +++ b/storage/src/vespa/storage/persistence/processallhandler.cpp @@ -56,12 +56,12 @@ public: void process(spi::DocEntry& e) override { ost << " Timestamp: " << e.getTimestamp() << ", "; - if (e.getDocument() != 0) { - ost << "Doc(" << e.getDocument()->getId() << ")" + if (e.getDocument() != nullptr) { + ost << "Doc(" << e.getDocument()->getId().toString() << ")" << ", " << e.getDocument()->getId().getGlobalId().toString() << ", size: " << e.getPersistedDocumentSize(); - } else if (e.getDocumentId() != 0) { - ost << *e.getDocumentId() + } else if (e.getDocumentId() != nullptr) { + ost << e.getDocumentId()->toString() << ", " << e.getDocumentId()->getGlobalId().toString(); } else { ost << "metadata only"; diff --git a/storage/src/vespa/storage/persistence/splitbitdetector.cpp b/storage/src/vespa/storage/persistence/splitbitdetector.cpp index 1133c470bb0..3b91b5a52ea 100644 --- a/storage/src/vespa/storage/persistence/splitbitdetector.cpp +++ b/storage/src/vespa/storage/persistence/splitbitdetector.cpp @@ -91,7 +91,7 @@ struct BucketVisitor : public BucketProcessor::EntryProcessor { for (uint32_t i=0; i<_firstDocs.size(); ++i) { out << "\n" << _firstDocs[i].timestamp << ' ' << _firstDocs[i].bucketId << ' ' - << _firstDocs[i].docId; + << _firstDocs[i].docId.toString(); } } @@ -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..c67f956904d 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" + << "\tPUT\t" << msg->getDocumentId().toString() << "\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" + << "\tUPDATE\t" << msg->getDocumentId().toString() << "\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" + << "\tREMOVE\t" << msg->getDocumentId().toString() << "\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" + << "\tGET\t" << msg->getDocumentId().toString() << "\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); } |