Replace UPS Processors for eager calculation of study size and study/…

…series query attributes by scheduler #2824

dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif

@@ -1,4 +1,4 @@
-# Generated by Apache Directory Studio on September 25, 2020, 9:18:20 AM
+# Generated by Apache Directory Studio on October 14, 2020, 10:25:23 AM
 
 # SCHEMA "DCM4CHEE-ARCHIVE"
 dn: cn=dcm4chee-archive, ou=schema
@@ -5117,6 +5117,61 @@ m-substr: caseExactSubstringsMatch
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
 m-singleValue: TRUE
 
+dn: m-oid=1.2.40.0.13.1.15.110.3.387, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.387
+m-name: dcmCalculateStudySizeDelay
+m-description: Delay in ISO-8601 duration format PnDTnHnMnS for eager calculatio
+ n of Study Size and Query Attributes. If absent, no (minimal) delay for eager c
+ alculation of the Study Size and Query Attributes is applied.
+m-equality: caseExactIA5Match
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-singleValue: TRUE
+
+dn: m-oid=1.2.40.0.13.1.15.110.3.388, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.388
+m-name: dcmCalculateStudySizePollingInterval
+m-description: Polling Interval for Studies with unknown size in ISO-8601 durati
+ on format PnDTnHnMnS. If absent, there is no eager calculation of the Study Siz
+ e and Query Attributes.
+m-equality: caseExactIA5Match
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-singleValue: TRUE
+
+dn: m-oid=1.2.40.0.13.1.15.110.3.389, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.389
+m-name: dcmCalculateStudySizeFetchSize
+m-description: Limit result set of DB query for Studies with unknown size; 100 i
+ f absent
+m-equality: integerMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+m-singleValue: TRUE
+
+dn: m-oid=1.2.40.0.13.1.15.110.3.390, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.390
+m-name: dcmCalculateQueryAttributesViewID
+m-description: Indicates to eager calculate Query Attributes for specified Query
+ /Retrieve Views according configured Calculate Study Size Delay and Calculate S
+ tudy Size Polling Interval.
+m-equality: caseExactMatch
+m-substr: caseExactSubstringsMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
+
 dn: ou=comparators, cn=dcm4chee-archive, ou=schema
 objectclass: organizationalUnit
 objectclass: top
@@ -5765,6 +5820,10 @@ m-typeObjectClass: AUXILIARY
 m-must: dcmFuzzyAlgorithmClass
 m-may: dcmRecordAttributeModification
 m-may: dcmBulkDataDescriptorID
+m-may: dcmCalculateStudySizeDelay
+m-may: dcmCalculateStudySizePollingInterval
+m-may: dcmCalculateStudySizeFetchSize
+m-may: dcmCalculateQueryAttributesViewID
 m-may: dcmQueryRetrieveViewID
 m-may: dcmRetrieveAET
 m-may: dcmReturnRetrieveAET

dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif

@@ -1884,6 +1884,26 @@ attributeTypes: ( 1.2.40.0.13.1.15.110.3.386 NAME 'dcmStudyInstanceUID'
   SUBSTR caseExactSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.387 NAME 'dcmCalculateStudySizeDelay'
+  DESC 'Delay in ISO-8601 duration format PnDTnHnMnS for eager calculation of Study Size and Query Attributes. If absent, no (minimal) delay for eager calculation of the Study Size and Query Attributes is applied.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.388 NAME 'dcmCalculateStudySizePollingInterval'
+  DESC 'Polling Interval for Studies with unknown size in ISO-8601 duration format PnDTnHnMnS. If absent, there is no eager calculation of the Study Size and Query Attributes.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.389 NAME 'dcmCalculateStudySizeFetchSize'
+  DESC 'Limit result set of DB query for Studies with unknown size; 100 if absent'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.390 NAME 'dcmCalculateQueryAttributesViewID'
+  DESC 'Indicates to eager calculate Query Attributes for specified Query/Retrieve Views according configured Calculate Study Size Delay and Calculate Study Size Polling Interval.'
+  EQUALITY caseExactMatch
+  SUBSTR caseExactSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
@@ -1892,6 +1912,10 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   MAY (
     dcmRecordAttributeModification $
     dcmBulkDataDescriptorID $
+    dcmCalculateStudySizeDelay $
+    dcmCalculateStudySizePollingInterval $
+    dcmCalculateStudySizeFetchSize $
+    dcmCalculateQueryAttributesViewID $
     dcmQueryRetrieveViewID $
     dcmRetrieveAET $
     dcmReturnRetrieveAET $

dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive.schema

@@ -2260,6 +2260,30 @@ attributetype ( 1.2.40.0.13.1.15.110.3.386 NAME 'dcmStudyInstanceUID'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
 
+attributetype ( 1.2.40.0.13.1.15.110.3.387 NAME 'dcmCalculateStudySizeDelay'
+  DESC 'Delay in ISO-8601 duration format PnDTnHnMnS for eager calculation of Study Size and Query Attributes. If absent, no (minimal) delay for eager calculation of the Study Size and Query Attributes is applied.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+
+attributetype ( 1.2.40.0.13.1.15.110.3.388 NAME 'dcmCalculateStudySizePollingInterval'
+  DESC 'Polling Interval for Studies with unknown size in ISO-8601 duration format PnDTnHnMnS. If absent, there is no eager calculation of the Study Size and Query Attributes.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+
+attributetype ( 1.2.40.0.13.1.15.110.3.389 NAME 'dcmCalculateStudySizeFetchSize'
+  DESC 'Limit result set of DB query for Studies with unknown size; 100 if absent'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
+
+attributetype ( 1.2.40.0.13.1.15.110.3.390 NAME 'dcmCalculateQueryAttributesViewID'
+  DESC 'Indicates to eager calculate Query Attributes for specified Query/Retrieve Views according configured Calculate Study Size Delay and Calculate Study Size Polling Interval.'
+  EQUALITY caseExactMatch
+  SUBSTR caseExactSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+
 objectclass ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
@@ -2268,6 +2292,10 @@ objectclass ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   MAY (
     dcmRecordAttributeModification $
     dcmBulkDataDescriptorID $
+    dcmCalculateStudySizeDelay $
+    dcmCalculateStudySizePollingInterval $
+    dcmCalculateStudySizeFetchSize $
+    dcmCalculateQueryAttributesViewID $
     dcmQueryRetrieveViewID $
     dcmRetrieveAET $
     dcmReturnRetrieveAET $

dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-modify.ldif

@@ -1884,6 +1884,26 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.386 NAME 'dcmStudyInstanceUID'
   SUBSTR caseExactSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.387 NAME 'dcmCalculateStudySizeDelay'
+  DESC 'Delay in ISO-8601 duration format PnDTnHnMnS for eager calculation of Study Size and Query Attributes. If absent, no (minimal) delay for eager calculation of the Study Size and Query Attributes is applied.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.388 NAME 'dcmCalculateStudySizePollingInterval'
+  DESC 'Polling Interval for Studies with unknown size in ISO-8601 duration format PnDTnHnMnS. If absent, there is no eager calculation of the Study Size and Query Attributes.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.389 NAME 'dcmCalculateStudySizeFetchSize'
+  DESC 'Limit result set of DB query for Studies with unknown size; 100 if absent'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.390 NAME 'dcmCalculateQueryAttributesViewID'
+  DESC 'Indicates to eager calculate Query Attributes for specified Query/Retrieve Views according configured Calculate Study Size Delay and Calculate Study Size Polling Interval.'
+  EQUALITY caseExactMatch
+  SUBSTR caseExactSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 -
 replace: olcObjectClasses
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
@@ -1894,6 +1914,10 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   MAY (
     dcmRecordAttributeModification $
     dcmBulkDataDescriptorID $
+    dcmCalculateStudySizeDelay $
+    dcmCalculateStudySizePollingInterval $
+    dcmCalculateStudySizeFetchSize $
+    dcmCalculateQueryAttributesViewID $
     dcmQueryRetrieveViewID $
     dcmRetrieveAET $
     dcmReturnRetrieveAET $

dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive.ldif

@@ -1883,6 +1883,26 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.386 NAME 'dcmStudyInstanceUID'
   SUBSTR caseExactSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.387 NAME 'dcmCalculateStudySizeDelay'
+  DESC 'Delay in ISO-8601 duration format PnDTnHnMnS for eager calculation of Study Size and Query Attributes. If absent, no (minimal) delay for eager calculation of the Study Size and Query Attributes is applied.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.388 NAME 'dcmCalculateStudySizePollingInterval'
+  DESC 'Polling Interval for Studies with unknown size in ISO-8601 duration format PnDTnHnMnS. If absent, there is no eager calculation of the Study Size and Query Attributes.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.389 NAME 'dcmCalculateStudySizeFetchSize'
+  DESC 'Limit result set of DB query for Studies with unknown size; 100 if absent'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.390 NAME 'dcmCalculateQueryAttributesViewID'
+  DESC 'Indicates to eager calculate Query Attributes for specified Query/Retrieve Views according configured Calculate Study Size Delay and Calculate Study Size Polling Interval.'
+  EQUALITY caseExactMatch
+  SUBSTR caseExactSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
@@ -1891,6 +1911,10 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   MAY (
     dcmRecordAttributeModification $
     dcmBulkDataDescriptorID $
+    dcmCalculateStudySizeDelay $
+    dcmCalculateStudySizePollingInterval $
+    dcmCalculateStudySizeFetchSize $
+    dcmCalculateQueryAttributesViewID $
     dcmQueryRetrieveViewID $
     dcmRetrieveAET $
     dcmReturnRetrieveAET $