From 83ffaea877c5a08b84c80ce2f23f0c41fb02e118 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Sat, 25 Jan 2025 11:14:16 +0100
Subject: [PATCH 1/2] pkp/pkp-lib#9822 Increase timeout and improve DB table
 indexes for usage stats jobs

---
 classes/migration/install/MetricsMigration.php  | 6 +++---
 dbscripts/xml/upgrade.xml                       | 1 +
 jobs/statistics/CompileUniqueInvestigations.php | 2 ++
 jobs/statistics/CompileUniqueRequests.php       | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/classes/migration/install/MetricsMigration.php b/classes/migration/install/MetricsMigration.php
index 035a0b4c4e0..0f0d59cc932 100644
--- a/classes/migration/install/MetricsMigration.php
+++ b/classes/migration/install/MetricsMigration.php
@@ -305,7 +305,7 @@ public function up(): void
             $table->string('city', 255)->default('');
             $table->string('load_id', 50);
 
-            $table->index(['load_id', 'context_id', 'ip'], 'ust_load_id_context_id_ip');
+            $table->index(['load_id', 'context_id', 'ip', 'user_agent', 'canonical_url'], 'ust_load_id_context_id_ip_ua_url');
         });
 
         // Usage stats unique item investigations temporary records
@@ -343,7 +343,7 @@ public function up(): void
             $table->string('city', 255)->default('');
             $table->string('load_id', 50);
 
-            $table->index(['load_id', 'context_id', 'ip'], 'usii_load_id_context_id_ip');
+            $table->index(['load_id', 'context_id', 'ip', 'user_agent'], 'usii_load_id_context_id_ip_ua');
         });
 
         // Usage stats unique item requests temporary records
@@ -380,7 +380,7 @@ public function up(): void
             $table->string('city', 255)->default('');
             $table->string('load_id', 50);
 
-            $table->index(['load_id', 'context_id', 'ip'], 'usir_load_id_context_id_ip');
+            $table->index(['load_id', 'context_id', 'ip', 'user_agent'], 'usir_load_id_context_id_ip_ua');
         });
 
         // Usage stats institution temporary records
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 3560924a0e7..3821a3240da 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -237,6 +237,7 @@
 	<upgrade minversion="3.4.0.0" maxversion="3.4.9.9">
 		<!-- Needs to be re-executed on every minor upgrade, the user might still be using an outdated plugin -->
 		<migration class="APP\migration\upgrade\v3_4_0\I9813_QuickSubmitSubmissionProgressType"/>
+		<migration class="PKP\migration\upgrade\v3_4_0\I9822_ChangeUsageStatsTemporaryTablesIndexes"/>
 	</upgrade>
 
 	<!-- update plugin configuration - should be done as the final upgrade task -->
diff --git a/jobs/statistics/CompileUniqueInvestigations.php b/jobs/statistics/CompileUniqueInvestigations.php
index d44d41127e5..648259adb16 100644
--- a/jobs/statistics/CompileUniqueInvestigations.php
+++ b/jobs/statistics/CompileUniqueInvestigations.php
@@ -22,6 +22,8 @@
 
 class CompileUniqueInvestigations extends BaseJob
 {
+    public int $timeout = 600;
+
     /**
      * Create a new job instance.
      *
diff --git a/jobs/statistics/CompileUniqueRequests.php b/jobs/statistics/CompileUniqueRequests.php
index ddcfea4e00c..7353393f62c 100644
--- a/jobs/statistics/CompileUniqueRequests.php
+++ b/jobs/statistics/CompileUniqueRequests.php
@@ -22,6 +22,8 @@
 
 class CompileUniqueRequests extends BaseJob
 {
+    public int $timeout = 600;
+
     /**
      * Create a new job instance.
      *

From 1d6347c6051401a74629618f68369b5a35ec6b50 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Tue, 4 Feb 2025 13:24:05 +0100
Subject: [PATCH 2/2] pkp/pkp-lib#9822 submodule update ##bozana/9822-3_4_0##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index e31ad65176c..cfe76d099d5 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit e31ad65176c79545f94a81dbb32a1a3beee18316
+Subproject commit cfe76d099d5891ea9f943ea1c2e64308cd6e5c93