Mercurial > hg > orthanc

diff OrthancServer/UnitTestsSources/ServerIndexTests.cpp @ 4508:8f9090b137f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Feb 2021 11:00:05 +0100
parents b4c58795f3a8
children 5b929e6b3c36
line wrap: on
line diff
--- a/OrthancServer/UnitTestsSources/ServerIndexTests.cpp	Thu Feb 11 09:33:48 2021 +0100
+++ b/OrthancServer/UnitTestsSources/ServerIndexTests.cpp	Thu Feb 11 11:00:05 2021 +0100
@@ -727,20 +727,19 @@
 
     ParsedDicomFile dicom(instance, GetDefaultDicomEncoding(), false /* be strict */);
 
-    DicomInstanceToStore toStore;
-    toStore.SetParsedDicomFile(dicom);
+    std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
 
     std::map<MetadataType, std::string> instanceMetadata;
 
     {
       DicomMap summary;
-      OrthancConfiguration::DefaultExtractDicomSummary(summary, toStore.GetParsedDicomFile());
+      OrthancConfiguration::DefaultExtractDicomSummary(summary, toStore->GetParsedDicomFile());
 
       DicomTransferSyntax transferSyntax;
       bool hasTransferSyntax = dicom.LookupTransferSyntax(transferSyntax);
       ASSERT_EQ(StoreStatus_Success, index.Store(
-                  instanceMetadata, summary, attachments, toStore.GetMetadata(),
-                  toStore.GetOrigin(), false /* don't overwrite */,
+                  instanceMetadata, summary, attachments, toStore->GetMetadata(),
+                  toStore->GetOrigin(), false /* don't overwrite */,
                   hasTransferSyntax, transferSyntax, true /* pixel data offset */, 42));
     }
     
@@ -834,13 +833,12 @@
 
       DicomInstanceHasher hasher(instance);
       
-      DicomInstanceToStore toStore;
-      toStore.SetParsedDicomFile(dicom);
-      toStore.SetOrigin(DicomInstanceOrigin::FromPlugins());
+      std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
+      toStore->SetOrigin(DicomInstanceOrigin::FromPlugins());
       ASSERT_EQ(id, hasher.HashInstance());
 
       std::string id2;
-      ASSERT_EQ(StoreStatus_Success, context.Store(id2, toStore, StoreInstanceMode_Default));
+      ASSERT_EQ(StoreStatus_Success, context.Store(id2, *toStore, StoreInstanceMode_Default));
       ASSERT_EQ(id, id2);
     }
 
@@ -872,13 +870,12 @@
 
       ParsedDicomFile dicom(instance2, GetDefaultDicomEncoding(), false /* be strict */);
 
-      DicomInstanceToStore toStore;
-      toStore.SetParsedDicomFile(dicom);
-      toStore.SetOrigin(DicomInstanceOrigin::FromPlugins());
+      std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
+      toStore->SetOrigin(DicomInstanceOrigin::FromPlugins());
 
       std::string id2;
       ASSERT_EQ(overwrite ? StoreStatus_Success : StoreStatus_AlreadyStored,
-                context.Store(id2, toStore, StoreInstanceMode_Default));
+                context.Store(id2, *toStore, StoreInstanceMode_Default));
       ASSERT_EQ(id, id2);
     }