From 5740eb89012d474142c25646eed696ba3f55441a Mon Sep 17 00:00:00 2001
From: fogelito <fogelshmuel@gmail.com>
Date: Thu, 11 Sep 2025 10:04:42 +0300
Subject: [PATCH] Add sorting

---
 src/Appwrite/Platform/Workers/StatsUsage.php | 64 ++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/src/Appwrite/Platform/Workers/StatsUsage.php b/src/Appwrite/Platform/Workers/StatsUsage.php
index 3610381d5a..991fed633a 100644
--- a/src/Appwrite/Platform/Workers/StatsUsage.php
+++ b/src/Appwrite/Platform/Workers/StatsUsage.php
@@ -424,6 +424,34 @@ class StatsUsage extends Action
             try {
                 $dbForProject = $getProjectDB($projectStats['project']);
                 Console::log('Processing batch with ' . count($projectStats['stats']) . ' stats');
+
+                /**
+                 * Sort by unique index key reduce locks/deadlocks
+                 */
+                usort($projectStats['stats'], function ($a, $b) {
+                    // Metric DESC
+                    $cmp = strcmp($b['metric'], $a['metric']);
+                    if ($cmp !== 0) {
+                        return $cmp;
+                    }
+
+                    // Period ASC
+                    $cmp = strcmp($a['period'], $b['period']);
+                    if ($cmp !== 0) {
+                        return $cmp;
+                    }
+
+                    // Time ASC, NULLs first
+                    if ($a['time'] === null) {
+                        return ($b['time'] === null) ? 0 : -1;
+                    }
+                    if ($b['time'] === null) {
+                        return 1;
+                    }
+
+                    return strcmp($a['time'], $b['time']);
+                });
+
                 $dbForProject->createOrUpdateDocumentsWithIncrease('stats', 'value', $projectStats['stats']);
                 Console::success('Batch successfully written to DB');
 
@@ -468,6 +496,42 @@ class StatsUsage extends Action
 
         try {
             Console::log('Processing batch with ' . count($this->statDocuments) . ' stats');
+
+            /**
+             * Sort by UNIQUE KEY "_key_metric_period_time" ("_tenant","metric" DESC,"period","time")
+             * Here we sort by _tenant as well because of setTenantPerDocument
+             */
+
+            usort($this->statDocuments, function ($a, $b) {
+                // Tenant ASC
+                $cmp = $a['_tenant'] <=> $b['_tenant'];
+                if ($cmp !== 0) {
+                    return $cmp;
+                }
+
+                // Metric DESC
+                $cmp = strcmp($b['metric'], $a['metric']);
+                if ($cmp !== 0) {
+                    return $cmp;
+                }
+
+                // Period ASC
+                $cmp = strcmp($a['period'], $b['period']);
+                if ($cmp !== 0) {
+                    return $cmp;
+                }
+
+                // Time ASC, NULLs first
+                if ($a['time'] === null) {
+                    return ($b['time'] === null) ? 0 : -1;
+                }
+                if ($b['time'] === null) {
+                    return 1;
+                }
+
+                return strcmp($a['time'], $b['time']);
+            });
+
             $dbForLogs->createOrUpdateDocumentsWithIncrease(
                 'stats',
                 'value',