Merge branch 'feature-DEPTRACKER-25_performance_improvements' into re…

…lease-0.8.0
pixl8 · Oct 28, 2024 · bf37e83 · bf37e83
2 parents dcfdd6d + 45f8ac3
commit bf37e83
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/preside-objects/tracked_content_record.cfc b/preside-objects/tracked_content_record.cfc
@@ -10,12 +10,12 @@
 component {
 	property name="label"                type="string"  dbtype="varchar" maxlength=500   required=true renderer="trackedContentRecordLabelRenderer";
 	property name="id"                   type="numeric" dbtype="bigint"                  required=true generator="increment";
-	property name="object_name"          type="string"  dbtype="varchar" maxlength=50    required=true renderer="objectName" uniqueIndexes="objectNameAndRecordId|1" enum="dependencyTrackerObjectNames";
+	property name="object_name"          type="string"  dbtype="varchar" maxlength=50    required=true renderer="objectName" uniqueIndexes="objectNameAndRecordId|1" indexes="lastScannedObjectNamesHidden|1" enum="dependencyTrackerObjectNames";
 	property name="record_id"            type="string"  dbtype="varchar" maxlength=35    required=true                       uniqueIndexes="objectNameAndRecordId|2" indexes="recordId";
-	property name="orphaned"             type="boolean" dbtype="bit"     default="false" required=true                       indexes="orphaned";
-	property name="hidden"               type="boolean" dbtype="bit"     default="false" required=true                       indexes="hidden";
-	property name="requires_scanning"    type="boolean" dbtype="bit"     default="false" required=true                       indexes="requires_scanning";
-	property name="last_scan_process_id" type="string"  dbtype="varchar" maxlength=35    required=false autofilter=false     indexes="lastScanProcessId";
+	property name="orphaned"             type="boolean" dbtype="bit"     default="false" required=true                                                               indexes="requiresScanningOrphaned|2,orphanedLastScannedProcessId|1";
+	property name="hidden"               type="boolean" dbtype="bit"     default="false" required=true                                                               indexes="hidden,lastScannedObjectNamesHidden|3";
+	property name="requires_scanning"    type="boolean" dbtype="bit"     default="false" required=true                                                               indexes="requiresScanningOrphaned|1";
+	property name="last_scan_process_id" type="string"  dbtype="varchar" maxlength=35    required=false autofilter=false                                             indexes="lastScanProcessId,lastScannedObjectNamesHidden|2,orphanedLastScannedProcessId|2";
 	property name="last_scanned"         type="date"    dbtype="datetime"                required=false;
 
 	property name="depends_on"   relationship="one-to-many" relatedTo="tracked_content_record_dependency" relationshipKey="content_record";

diff --git a/preside-objects/tracked_content_record_dependency.cfc b/preside-objects/tracked_content_record_dependency.cfc
@@ -9,9 +9,9 @@ component {
 	property name="id" type="numeric" dbtype="bigint" required=true generator="increment";
 
 	property name="content_record"           relationship="many-to-one" relatedTo="tracked_content_record" required=true indexes="dependentRecordsAndField|1";
-	property name="dependent_content_record" relationship="many-to-one" relatedTo="tracked_content_record" required=true indexes="dependentRecordsAndField|2";
+	property name="dependent_content_record" relationship="many-to-one" relatedTo="tracked_content_record" required=true indexes="dependentRecordsAndField|3";
 
-	property name="content_record_field" type="string"  dbtype="varchar" maxlength=100 required=true indexes="dependentRecordsAndField|3";
+	property name="content_record_field" type="string"  dbtype="varchar" maxlength=100 required=true indexes="dependentRecordsAndField|2";
 	property name="is_soft_reference"    type="boolean" dbtype="bit"                   required=true;
 	property name="last_scan_process_id" type="string"  dbtype="varchar" maxlength=35  required=false autofilter=false indexes="lastScanProcessId";
 

diff --git a/services/ContentDependencyTrackerService.cfc b/services/ContentDependencyTrackerService.cfc
@@ -159,7 +159,7 @@ component {
 
 			// remove scan flag from records that have been processed in this run
 			updated = _getContentRecordDao().updateData(
-				  filter          = { requires_scanning=true, last_scan_process_id=_getProcessId() }
+				  filter          = { last_scan_process_id=_getProcessId() }
 				, data            = { requires_scanning=false }
 				, setDateModified = false
 			);
@@ -170,7 +170,7 @@ component {
 
 			// deal with orphaned content records
 			updated = _getContentRecordDao().updateData(
-				  filter          = { requires_scanning=true, orphaned=true }
+				  filter          = { orphaned=true, requires_scanning=true }
 				, data            = { requires_scanning=false, last_scan_process_id=_getProcessId(), last_scanned=_getProcessTimestamp() }
 				, setDateModified = false
 			);