Mercurial > hg > orthanc
changeset 6877:9df3a549c2e4
optimized the resources /statistics routes
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Fri, 29 May 2026 14:42:05 +0200 |
| parents | 5c82dafd83c8 |
| children | 4452b5eeada9 |
| files | NEWS OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp OrthancServer/Sources/Database/StatelessDatabaseOperations.h OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp |
| diffstat | 4 files changed, 87 insertions(+), 101 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Tue May 26 15:48:55 2026 +0200 +++ b/NEWS Fri May 29 14:42:05 2026 +0200 @@ -27,6 +27,7 @@ * The "LocalAet" field of the payload to "/modalities/../move", "/modalities/../store", "/modalities/../get", "queries/../answers/../retrieve" now always overwrites the "DicomAet" and the "DicomModalities.LocalAet" configurations. +* Optimized the "/patients|studies|series|instances/../statistics" routes. Maintenance
--- a/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp Tue May 26 15:48:55 2026 +0200 +++ b/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp Fri May 29 14:42:05 2026 +0200 @@ -37,6 +37,7 @@ #include "../Search/DatabaseLookup.h" #include "../ServerIndexChange.h" #include "../ServerToolbox.h" +#include "../ResourceFinder.h" #include "ResourcesContent.h" #include <boost/lexical_cast.hpp> @@ -1086,20 +1087,19 @@ } - void StatelessDatabaseOperations::GetResourceStatistics(/* out */ ResourceType& type, - /* out */ uint64_t& diskSize, + void StatelessDatabaseOperations::GetResourceStatistics(/* out */ uint64_t& diskSize, /* out */ uint64_t& uncompressedSize, /* out */ unsigned int& countStudies, /* out */ unsigned int& countSeries, /* out */ unsigned int& countInstances, /* out */ uint64_t& dicomDiskSize, - /* out */ uint64_t& dicomUncompressedSize, + /* out */ uint64_t& dicomUncompressedSize, + ResourceType type, const std::string& publicId) { class Operations : public IReadOnlyOperations { private: - ResourceType& type_; uint64_t& diskSize_; uint64_t& uncompressedSize_; unsigned int& countStudies_; @@ -1108,18 +1108,20 @@ uint64_t& dicomDiskSize_; uint64_t& dicomUncompressedSize_; const std::string& publicId_; - + ResourceType type_; + const IDatabaseWrapper::Capabilities& dbCapabilities_; + public: - explicit Operations(ResourceType& type, - uint64_t& diskSize, + explicit Operations(uint64_t& diskSize, uint64_t& uncompressedSize, unsigned int& countStudies, unsigned int& countSeries, unsigned int& countInstances, uint64_t& dicomDiskSize, uint64_t& dicomUncompressedSize, - const std::string& publicId) : - type_(type), + ResourceType type, + const std::string& publicId, + const IDatabaseWrapper::Capabilities& dbCapabilities) : diskSize_(diskSize), uncompressedSize_(uncompressedSize), countStudies_(countStudies), @@ -1127,105 +1129,88 @@ countInstances_(countInstances), dicomDiskSize_(dicomDiskSize), dicomUncompressedSize_(dicomUncompressedSize), - publicId_(publicId) + publicId_(publicId), + type_(type), + dbCapabilities_(dbCapabilities) { } - + + void AddAttachmentSizes(const FindResponse::Resource& resource) + { + const std::map<FileContentType, FileInfo>& attachments = resource.GetAttachments(); + + for (std::map<FileContentType, FileInfo>::const_iterator it = attachments.begin(); it != attachments.end(); ++it) + { + if (it->first == FileContentType_Dicom) + { + dicomDiskSize_ += it->second.GetCompressedSize(); + dicomUncompressedSize_ += it->second.GetUncompressedSize(); + } + + diskSize_ += it->second.GetCompressedSize(); + uncompressedSize_ += it->second.GetUncompressedSize(); + } + } + virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE { - int64_t top; - if (!transaction.LookupResource(top, type_, publicId_)) - { - throw OrthancException(ErrorCode_UnknownResource); - } - else + countInstances_ = 0; + countSeries_ = 0; + countStudies_ = 0; + diskSize_ = 0; + uncompressedSize_ = 0; + dicomDiskSize_ = 0; + dicomUncompressedSize_ = 0; + + ResourceType currentLevel = type_; + bool hasProcessedInstanceLevel = false; + while (!hasProcessedInstanceLevel) { - countInstances_ = 0; - countSeries_ = 0; - countStudies_ = 0; - diskSize_ = 0; - uncompressedSize_ = 0; - dicomDiskSize_ = 0; - dicomUncompressedSize_ = 0; - - std::stack<int64_t> toExplore; - toExplore.push(top); - - while (!toExplore.empty()) + // get the attachments at the currentLevel (but the parent remains the same resource) + FindRequest request(currentLevel); + request.SetOrthancId(type_, publicId_); + request.SetRetrieveAttachments(true); + + FindResponse response; + transaction.ExecuteFind(response, request, dbCapabilities_); + + for (size_t i = 0; i < response.GetSize(); i++) { - // Get the internal ID of the current resource - int64_t resource = toExplore.top(); - toExplore.pop(); - - ResourceType thisType = transaction.GetResourceType(resource); - - std::set<FileContentType> f; - transaction.ListAvailableAttachments(f, resource); - - for (std::set<FileContentType>::const_iterator - it = f.begin(); it != f.end(); ++it) + AddAttachmentSizes(response.GetResourceByIndex(i)); + + switch (currentLevel) { - FileInfo attachment; - int64_t revision; // ignored - if (transaction.LookupAttachment(attachment, revision, resource, *it)) - { - if (attachment.GetContentType() == FileContentType_Dicom) - { - dicomDiskSize_ += attachment.GetCompressedSize(); - dicomUncompressedSize_ += attachment.GetUncompressedSize(); - } - - diskSize_ += attachment.GetCompressedSize(); - uncompressedSize_ += attachment.GetUncompressedSize(); - } - } - - if (thisType == ResourceType_Instance) - { - countInstances_++; - } - else - { - switch (thisType) - { - case ResourceType_Study: - countStudies_++; - break; - - case ResourceType_Series: - countSeries_++; - break; - - default: - break; - } - - // Tag all the children of this resource as to be explored - std::list<int64_t> tmp; - transaction.GetChildrenInternalId(tmp, resource); - for (std::list<int64_t>::const_iterator - it = tmp.begin(); it != tmp.end(); ++it) - { - toExplore.push(*it); - } + case ResourceType_Study: + ++countStudies_; + break; + case ResourceType_Series: + ++countSeries_; + break; + case ResourceType_Instance: + ++countInstances_; + break; + case ResourceType_Patient: + // don't count patients + break; + default: + throw OrthancException(ErrorCode_InternalError); } } - if (countStudies_ == 0) + if (currentLevel == ResourceType_Instance) { - countStudies_ = 1; + hasProcessedInstanceLevel = true; } - - if (countSeries_ == 0) + else { - countSeries_ = 1; + currentLevel = GetChildResourceType(currentLevel); } } } }; - Operations operations(type, diskSize, uncompressedSize, countStudies, countSeries, - countInstances, dicomDiskSize, dicomUncompressedSize, publicId); + Operations operations(diskSize, uncompressedSize, countStudies, countSeries, + countInstances, dicomDiskSize, dicomUncompressedSize, type, publicId, db_.GetDatabaseCapabilities()); Apply(operations); }
--- a/OrthancServer/Sources/Database/StatelessDatabaseOperations.h Tue May 26 15:48:55 2026 +0200 +++ b/OrthancServer/Sources/Database/StatelessDatabaseOperations.h Fri May 29 14:42:05 2026 +0200 @@ -683,14 +683,14 @@ bool LookupParent(std::string& target, const std::string& publicId); - void GetResourceStatistics(/* out */ ResourceType& type, - /* out */ uint64_t& diskSize, + void GetResourceStatistics(/* out */ uint64_t& diskSize, /* out */ uint64_t& uncompressedSize, /* out */ unsigned int& countStudies, /* out */ unsigned int& countSeries, /* out */ unsigned int& countInstances, /* out */ uint64_t& dicomDiskSize, /* out */ uint64_t& dicomUncompressedSize, + ResourceType type, const std::string& publicId); void LookupIdentifierExact(std::vector<std::string>& result,
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Tue May 26 15:48:55 2026 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Fri May 29 14:42:05 2026 +0200 @@ -1630,6 +1630,7 @@ } + template <enum ResourceType resourceType> static void GetResourceStatistics(RestApiGetCall& call) { const ResourceType level = GetResourceTypeFromUri(call); @@ -1686,13 +1687,12 @@ std::string publicId = call.GetUriComponent("id", ""); - ResourceType type; uint64_t diskSize, uncompressedSize, dicomDiskSize, dicomUncompressedSize; unsigned int countStudies, countSeries, countInstances; + OrthancRestApi::GetIndex(call).GetResourceStatistics( - type, diskSize, uncompressedSize, countStudies, countSeries, - countInstances, dicomDiskSize, dicomUncompressedSize, publicId); - + diskSize, uncompressedSize, countStudies, countSeries, + countInstances, dicomDiskSize, dicomUncompressedSize, resourceType, publicId); Json::Value result = Json::objectValue; result["DiskSize"] = boost::lexical_cast<std::string>(diskSize); result["DiskSizeMB"] = static_cast<unsigned int>(diskSize / MEGABYTE); @@ -1704,7 +1704,7 @@ result["DicomUncompressedSize"] = boost::lexical_cast<std::string>(dicomUncompressedSize); result["DicomUncompressedSizeMB"] = static_cast<unsigned int>(dicomUncompressedSize / MEGABYTE); - switch (type) + switch (resourceType) { // Do NOT add "break" below this point! case ResourceType_Patient: @@ -4305,13 +4305,13 @@ Register("/series/{id}", GetSingleResource<ResourceType_Series>); Register("/studies/{id}", GetSingleResource<ResourceType_Study>); - Register("/instances/{id}/statistics", GetResourceStatistics); + Register("/instances/{id}/statistics", GetResourceStatistics<ResourceType_Instance>); if (context_.IsPatientLevelEnabled()) { - Register("/patients/{id}/statistics", GetResourceStatistics); + Register("/patients/{id}/statistics", GetResourceStatistics<ResourceType_Patient>); } - Register("/studies/{id}/statistics", GetResourceStatistics); - Register("/series/{id}/statistics", GetResourceStatistics); + Register("/studies/{id}/statistics", GetResourceStatistics<ResourceType_Study>); + Register("/series/{id}/statistics", GetResourceStatistics<ResourceType_Series>); if (context_.IsPatientLevelEnabled()) {
