From cba700402bb79598a526f0e6d026060cf0cd3e50 Mon Sep 17 00:00:00 2001
From: fogelito <fogelshmuel@gmail.com>
Date: Fri, 28 Mar 2025 09:04:50 +0300
Subject: [PATCH 1/2] Add order by for cursor

---
 src/Appwrite/Platform/Workers/Deletes.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index 5033822241..5674448c18 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -405,7 +405,7 @@ class Deletes extends Action
         );
 
         $queries = [
-            Query::select($this->selects),
+            Query::select(array_merge($this->selects, ['accessedAt'])),
             Query::lessThan('accessedAt', $datetime),
             Query::orderDesc('accessedAt'),
             Query::orderDesc(),
@@ -439,9 +439,11 @@ class Deletes extends Action
         /** @var Database $dbForProject*/
         $dbForProject = $getProjectDB($project);
 
+        $select = array_merge($this->selects, ['time']);
+
         // Delete Usage stats from projectDB
         $this->deleteByGroup('stats', [
-            Query::select($this->selects),
+            Query::select($select),
             Query::equal('period', ['1h']),
             Query::lessThan('time', $hourlyUsageRetentionDatetime),
             Query::orderDesc('time'),
@@ -454,7 +456,7 @@ class Deletes extends Action
 
             // Delete Usage stats from logsDB
             $this->deleteByGroup('stats', [
-                Query::select($this->selects),
+                Query::select($select),
                 Query::equal('period', ['1h']),
                 Query::lessThan('time', $hourlyUsageRetentionDatetime),
                 Query::orderDesc('time'),
@@ -751,7 +753,7 @@ class Deletes extends Action
 
         // Delete Executions
         $this->deleteByGroup('executions', [
-            Query::select($this->selects),
+            Query::select(array_merge($this->selects, ['$createdAt'])),
             Query::lessThan('$createdAt', $datetime),
             Query::orderDesc('$createdAt'),
             Query::orderDesc(),
@@ -772,7 +774,7 @@ class Deletes extends Action
 
         // Delete Sessions
         $this->deleteByGroup('sessions', [
-            Query::select($this->selects),
+            Query::select(array_merge($this->selects, ['$createdAt'])),
             Query::lessThan('$createdAt', $expired),
             Query::orderDesc('$createdAt'),
             Query::orderDesc(),
@@ -809,7 +811,7 @@ class Deletes extends Action
 
         try {
             $this->deleteByGroup(Audit::COLLECTION, [
-                Query::select($this->selects),
+                Query::select(array_merge($this->selects, ['time'])),
                 Query::lessThan('time', $auditRetention),
                 Query::orderDesc('time'),
                 Query::orderAsc(),

From a4c18c4b774eefa25af547b31929986d953a2552 Mon Sep 17 00:00:00 2001
From: fogelito <fogelshmuel@gmail.com>
Date: Fri, 28 Mar 2025 09:16:25 +0300
Subject: [PATCH 2/2] Remove array merge

---
 src/Appwrite/Platform/Workers/Deletes.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index 5674448c18..a9b83976a4 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -405,7 +405,7 @@ class Deletes extends Action
         );
 
         $queries = [
-            Query::select(array_merge($this->selects, ['accessedAt'])),
+            Query::select([...$this->selects, 'accessedAt']),
             Query::lessThan('accessedAt', $datetime),
             Query::orderDesc('accessedAt'),
             Query::orderDesc(),
@@ -439,11 +439,11 @@ class Deletes extends Action
         /** @var Database $dbForProject*/
         $dbForProject = $getProjectDB($project);
 
-        $select = array_merge($this->selects, ['time']);
+        $selects = [...$this->selects, 'time'];
 
         // Delete Usage stats from projectDB
         $this->deleteByGroup('stats', [
-            Query::select($select),
+            Query::select($selects),
             Query::equal('period', ['1h']),
             Query::lessThan('time', $hourlyUsageRetentionDatetime),
             Query::orderDesc('time'),
@@ -456,7 +456,7 @@ class Deletes extends Action
 
             // Delete Usage stats from logsDB
             $this->deleteByGroup('stats', [
-                Query::select($select),
+                Query::select($selects),
                 Query::equal('period', ['1h']),
                 Query::lessThan('time', $hourlyUsageRetentionDatetime),
                 Query::orderDesc('time'),
@@ -753,7 +753,7 @@ class Deletes extends Action
 
         // Delete Executions
         $this->deleteByGroup('executions', [
-            Query::select(array_merge($this->selects, ['$createdAt'])),
+            Query::select([...$this->selects, '$createdAt']),
             Query::lessThan('$createdAt', $datetime),
             Query::orderDesc('$createdAt'),
             Query::orderDesc(),
@@ -774,7 +774,7 @@ class Deletes extends Action
 
         // Delete Sessions
         $this->deleteByGroup('sessions', [
-            Query::select(array_merge($this->selects, ['$createdAt'])),
+            Query::select([...$this->selects, '$createdAt']),
             Query::lessThan('$createdAt', $expired),
             Query::orderDesc('$createdAt'),
             Query::orderDesc(),
@@ -811,7 +811,7 @@ class Deletes extends Action
 
         try {
             $this->deleteByGroup(Audit::COLLECTION, [
-                Query::select(array_merge($this->selects, ['time'])),
+                Query::select([...$this->selects, 'time']),
                 Query::lessThan('time', $auditRetention),
                 Query::orderDesc('time'),
                 Query::orderAsc(),