Mercurial > hg > orthanc
changeset 6895:4372fdde043a streaming
reintroduced StorageAccessor in ServerContext after removing StorageCache
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 01 Jun 2026 21:39:19 +0200 |
| parents | c24787295b61 |
| children | a6f84df80a28 |
| files | OrthancServer/Sources/ServerContext.cpp |
| diffstat | 1 files changed, 33 insertions(+), 112 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerContext.cpp Mon Jun 01 21:23:59 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Mon Jun 01 21:39:19 2026 +0200 @@ -35,6 +35,7 @@ #include "../../OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h" #include "../../OrthancFramework/Sources/DicomParsing/DicomModification.h" #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/FileStorage/StorageAccessor.h" #include "../../OrthancFramework/Sources/HttpServer/FilesystemHttpSender.h" #include "../../OrthancFramework/Sources/HttpServer/HttpStreamTranscoder.h" #include "../../OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h" @@ -70,28 +71,26 @@ // Those metrics correspond to those found in StorageAccessor in Orthanc <= 1.12.11 -static const std::string METRICS_STORAGE_AREA_CREATE_DURATION = "orthanc_storage_create_duration_ms"; -static const std::string METRICS_STORAGE_AREA_READ_BYTES = "orthanc_storage_read_bytes"; -static const std::string METRICS_STORAGE_AREA_READ_DURATION = "orthanc_storage_read_duration_ms"; -static const std::string METRICS_STORAGE_AREA_REMOVE_DURATION = "orthanc_storage_remove_duration_ms"; -static const std::string METRICS_STORAGE_AREA_WRITTEN_BYTES = "orthanc_storage_written_bytes"; +static const char* const METRICS_STORAGE_AREA_READ_BYTES = "orthanc_storage_read_bytes"; +static const char* const METRICS_STORAGE_AREA_READ_DURATION = "orthanc_storage_read_duration_ms"; +static const char* const METRICS_STORAGE_AREA_WRITTEN_BYTES = "orthanc_storage_written_bytes"; -static const std::string METRICS_STORAGE_AREA_CACHE_COUNT = "orthanc_storage_cache_count"; -static const std::string METRICS_STORAGE_AREA_CACHE_HIT_COUNT = "orthanc_storage_cache_hit_count"; -static const std::string METRICS_STORAGE_AREA_CACHE_MISS_COUNT = "orthanc_storage_cache_miss_count"; -static const std::string METRICS_STORAGE_AREA_CACHE_SIZE_MB = "orthanc_storage_cache_size_mb"; +static const char* const METRICS_STORAGE_AREA_CACHE_COUNT = "orthanc_storage_cache_count"; +static const char* const METRICS_STORAGE_AREA_CACHE_HIT_COUNT = "orthanc_storage_cache_hit_count"; +static const char* const METRICS_STORAGE_AREA_CACHE_MISS_COUNT = "orthanc_storage_cache_miss_count"; +static const char* const METRICS_STORAGE_AREA_CACHE_SIZE_MB = "orthanc_storage_cache_size_mb"; -static const std::string METRICS_DICOM_CACHE_COUNT = "orthanc_dicom_cache_count"; -static const std::string METRICS_DICOM_CACHE_HIT_COUNT = "orthanc_dicom_cache_hit_count"; -static const std::string METRICS_DICOM_CACHE_MISS_COUNT = "orthanc_dicom_cache_miss_count"; -static const std::string METRICS_DICOM_CACHE_SIZE_MB = "orthanc_dicom_cache_size_mb"; +static const char* const METRICS_DICOM_CACHE_COUNT = "orthanc_dicom_cache_count"; +static const char* const METRICS_DICOM_CACHE_HIT_COUNT = "orthanc_dicom_cache_hit_count"; +static const char* const METRICS_DICOM_CACHE_MISS_COUNT = "orthanc_dicom_cache_miss_count"; +static const char* const METRICS_DICOM_CACHE_SIZE_MB = "orthanc_dicom_cache_size_mb"; -static const std::string METRICS_TRANSCODER_CACHE_COUNT = "orthanc_transcoder_cache_count"; -static const std::string METRICS_TRANSCODER_CACHE_HIT_COUNT = "orthanc_transcoder_cache_hit_count"; -static const std::string METRICS_TRANSCODER_CACHE_MISS_COUNT = "orthanc_transcoder_cache_miss_count"; -static const std::string METRICS_TRANSCODER_CACHE_SIZE_MB = "orthanc_transcoder_cache_size_mb"; +static const char* const METRICS_TRANSCODER_CACHE_COUNT = "orthanc_transcoder_cache_count"; +static const char* const METRICS_TRANSCODER_CACHE_HIT_COUNT = "orthanc_transcoder_cache_hit_count"; +static const char* const METRICS_TRANSCODER_CACHE_MISS_COUNT = "orthanc_transcoder_cache_miss_count"; +static const char* const METRICS_TRANSCODER_CACHE_SIZE_MB = "orthanc_transcoder_cache_size_mb"; @@ -134,86 +133,6 @@ } - // This corresponds to StorageArea::Create() in Orthanc <= 1.12.11 - static void CreateFile(IPluginStorageArea& area, - MetricsRegistry& metrics, - FileInfo& info, - const void* data, - size_t size, - FileContentType type, - CompressionType compression, - const std::string& precomputedMd5, - bool storeMd5, - const DicomInstanceToStore* instance) - { - const std::string uuid = Toolbox::GenerateUuid(); - - std::string md5 = precomputedMd5; - - if (storeMd5 && md5.empty()) // if it has not been precomputed, compute it now - { - Toolbox::ComputeMD5(md5, data, size); - } - - std::string customData; - - switch (compression) - { - case CompressionType_None: - { - { - MetricsRegistry::Timer timer(metrics, METRICS_STORAGE_AREA_CREATE_DURATION); - area.Create(customData, uuid, data, size, type, compression, instance); - } - - metrics.IncrementIntegerValue(METRICS_STORAGE_AREA_WRITTEN_BYTES, static_cast<int64_t>(size)); - - info = FileInfo(uuid, type, size, md5); - info.SetCustomData(customData); - return; - } - - case CompressionType_ZlibWithSize: - { - ZlibCompressor zlib; - - std::string compressed; - zlib.Compress(compressed, data, size); - - std::string compressedMD5; - - if (storeMd5) - { - Toolbox::ComputeMD5(compressedMD5, compressed); - } - - { - MetricsRegistry::Timer timer(metrics, METRICS_STORAGE_AREA_CREATE_DURATION); - - if (compressed.size() > 0) - { - area.Create(customData, uuid, &compressed[0], compressed.size(), type, compression, instance); - } - else - { - area.Create(customData, uuid, NULL, 0, type, compression, instance); - } - } - - metrics.IncrementIntegerValue(METRICS_STORAGE_AREA_WRITTEN_BYTES, static_cast<int64_t>(compressed.size())); - - info = FileInfo(uuid, type, size, md5, CompressionType_ZlibWithSize, - compressed.size(), compressedMD5); - info.SetCustomData(customData); - return; - } - - default: - throw OrthancException(ErrorCode_NotImplemented); - } - } - - ServerContext::StoreResult::StoreResult() : status_(StoreStatus_Failure), cstoreStatusCode_(0) @@ -832,8 +751,8 @@ FileContentType type, const std::string& customData) { - MetricsRegistry::Timer timer(*metricsRegistry_, METRICS_STORAGE_AREA_REMOVE_DURATION); - area_.Remove(fileUuid, type, customData); + StorageAccessor accessor(area_, *metricsRegistry_); + accessor.Remove(fileUuid, type, customData); } @@ -998,9 +917,10 @@ if (!isAdoption) { - CreateFile(area_, GetMetricsRegistry(), - dicomInfo, dicom.GetBufferData(), dicom.GetBufferSize(), - FileContentType_Dicom, compression, dicomMd5, storeMD5_, &dicom); + StorageAccessor accessor(area_, *metricsRegistry_); + accessor.Write(dicomInfo, dicom.GetBufferData(), dicom.GetBufferSize(), + FileContentType_Dicom, compression, dicomMd5, storeMD5_, &dicom); + attachments.push_back(dicomInfo); } else @@ -1013,10 +933,10 @@ (!area_.HasEfficientReadRange() || compressionEnabled_)) { - CreateFile(area_, GetMetricsRegistry(), - dicomUntilPixelData, dicom.GetBufferData(), pixelDataOffset, - FileContentType_DicomUntilPixelData, compression, - "" /* MD5 will be computed if needed */, storeMD5_, NULL); + StorageAccessor accessor(area_, *metricsRegistry_); + accessor.Write(dicomUntilPixelData, dicom.GetBufferData(), pixelDataOffset, + FileContentType_DicomUntilPixelData, compression, storeMD5_, NULL); + attachments.push_back(dicomUntilPixelData); } @@ -1349,9 +1269,8 @@ { std::unique_ptr<StorageAreaDataSource::Range> range(ReadAttachment(attachment, true /* uncompress */)); - CreateFile(area_, GetMetricsRegistry(), - modified, range->GetData(), range->GetSize(), attachmentType, compression, - "" /* MD5 will be computed if needed */, storeMD5_, NULL); + StorageAccessor accessor(area_, *metricsRegistry_); + accessor.Write(modified, range->GetData(), range->GetSize(), attachmentType, compression, storeMD5_, NULL); } try @@ -1741,9 +1660,11 @@ assert(attachmentType != FileContentType_Dicom && attachmentType != FileContentType_DicomUntilPixelData); // this method can not be used to store instances FileInfo attachment; - CreateFile(area_, GetMetricsRegistry(), - attachment, data, size, attachmentType, compression, - "" /* MD5 will be computed if needed */, storeMD5_, NULL); + + { + StorageAccessor accessor(area_, *metricsRegistry_); + accessor.Write(attachment, data, size, attachmentType, compression, storeMD5_, NULL); + } try {
