src/Appwrite/Platform/Workers/StatsResources.php (1)

437-451: Tighten comparator: type-safe accessors, null-safe time ordering, and PSR-12 fixes

• Prefer Document::getAttribute over array access for consistency and type-safety.
• Handle null time explicitly (period "inf") to avoid loose comparisons.
• Add parameter/return types to the comparator and fix spacing for PSR-12 (addresses the linter failure).
• Clarify the comment (was incomplete).

Apply:

-        // sort by unique index key to make
-        usort($this->documents, 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
-            if ($a['time'] === $b['time']) return 0;
-            return ($a['time'] < $b['time']) ? -1 : 1;
-        });
+        // Sort by composite unique index: metric DESC, period ASC, time ASC.
+        usort($this->documents, function (Document $a, Document $b): int {
+            // metric DESC
+            $cmp = strcmp((string) $b->getAttribute('metric'), (string) $a->getAttribute('metric'));
+            if ($cmp !== 0) {
+                return $cmp;
+            }
+            // period ASC
+            $cmp = strcmp((string) $a->getAttribute('period'), (string) $b->getAttribute('period'));
+            if ($cmp !== 0) {
+                return $cmp;
+            }
+            // time ASC (null treated as smallest)
+            $ta = $a->getAttribute('time');
+            $tb = $b->getAttribute('time');
+            if ($ta === $tb) {
+                return 0;
+            }
+            if ($ta === null) {
+                return -1;
+            }
+            if ($tb === null) {
+                return 1;
+            }
+            return strcmp((string) $ta, (string) $tb);
+        });

If region can vary within a batch (unlikely here), include it in the sort key for strict index-order writes.

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

src/Appwrite/Platform/Workers/StatsResources.php (3)

437-439: Comment clarity

Nit: “sort by unique index key reduce locks/deadlocks” → “Sort by unique index key to reduce locks/deadlocks.”

---

440-447: Optional: explicit period ordering

If the intended order is 1h < 1d < inf, lexicographic compare won’t guarantee it. Consider a map for deterministic ASC.

-            // Period ASC
-            $cmp = strcmp($a->getAttribute('period'), $b->getAttribute('period'));
+            // Period ASC (explicit order)
+            $order = ['1h' => 0, '1d' => 1, 'inf' => 2];
+            $cmp = ($order[$a->getAttribute('period')] ?? 999)
+                <=> ($order[$b->getAttribute('period')] ?? 999);

---

460-462: Batch size: verify API, avoid magic number

• Ensure Database::createOrUpdateDocuments supports a third param and that 10 is an intended batch size.
• Replace magic number with a named constant/variable.

-                10 // See if this make an effect
+                10 // Batch size

Outside this hunk (suggested):

// At class top
private const LOGS_BATCH_SIZE = 10;

// Here
$dbForLogs->createOrUpdateDocuments('stats', $this->documents, self::LOGS_BATCH_SIZE);

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

src/Appwrite/Platform/Workers/StatsResources.php (1)

440-462: Type the comparator and use Document::getAttribute (optional: make closure static)

Improves type-safety, readability, and avoids array-style access on Document. Also caches attributes locally. Optionally mark the closure static.
[ suggest_optional_refactor ]
Apply:

-        usort($this->documents, function ($a, $b) {
+        usort($this->documents, static function (Document $a, Document $b): int {
             // Metric DESC
-            $cmp = strcmp($b['metric'], $a['metric']);
+            $aMetric = $a->getAttribute('metric');
+            $bMetric = $b->getAttribute('metric');
+            $cmp = strcmp($bMetric, $aMetric);
             if ($cmp !== 0) {
                 return $cmp;
             }

             // Period ASC
-            $cmp = strcmp($a['period'], $b['period']);
+            $aPeriod = $a->getAttribute('period');
+            $bPeriod = $b->getAttribute('period');
+            $cmp = strcmp($aPeriod, $bPeriod);
             if ($cmp !== 0) {
                 return $cmp;
             }

             // Time ASC, NULLs first
-            if ($a['time'] === null) {
-                return ($b['time'] === null) ? 0 : -1;
-            }
-            if ($b['time'] === null) {
+            $aTime = $a->getAttribute('time');
+            $bTime = $b->getAttribute('time');
+            if ($aTime === null) {
+                return ($bTime === null) ? 0 : -1;
+            }
+            if ($bTime === null) {
                 return 1;
             }

-            return strcmp($a['time'], $b['time']);
+            return strcmp($aTime, $bTime);
         });

If the unique index for stats also includes region (or any other field), extend the tie-breakers accordingly to fully match index order to minimize lock contention. To confirm, run:

#!/bin/bash
# Locate stats collection index definitions (PHP/JSON)
rg -nP -C3 '(create|add).*index.*stats|indexes?.*stats' -g '!**/vendor/**'

src/Appwrite/Platform/Workers/StatsResources.php (1)

437-439: Polish the comment for clarity

Suggested wording: “Sort by unique index columns to reduce lock contention and deadlocks.”

Apply:

-        /**
-         * sort by unique index key reduce locks/deadlocks
-         */
+        /**
+         * Sort by unique index columns to reduce lock contention and deadlocks.
+         */

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

src/Appwrite/Platform/Workers/StatsUsage.php (2)

431-454: Type the comparator and simplify comparisons.

Add types to catch misuse and use the spaceship operator for brevity; keep NULLs-first handling for time.

-                usort($projectStats['stats'], function ($a, $b) {
+                usort($projectStats['stats'], static function (Document $a, Document $b): int {
                     // Metric DESC
-                    $cmp = strcmp($b['metric'], $a['metric']);
+                    $cmp = ($b['metric'] ?? '') <=> ($a['metric'] ?? '');
                     if ($cmp !== 0) {
                         return $cmp;
                     }

                     // Period ASC
-                    $cmp = strcmp($a['period'], $b['period']);
+                    $cmp = ($a['period'] ?? '') <=> ($b['period'] ?? '');
                     if ($cmp !== 0) {
                         return $cmp;
                     }

                     // Time ASC, NULLs first
-                    if ($a['time'] === null) {
+                    $at = $a['time'] ?? null;
+                    $bt = $b['time'] ?? null;
+                    if ($at === null) {
-                        return ($b['time'] === null) ? 0 : -1;
+                        return ($bt === null) ? 0 : -1;
                     }
-                    if ($b['time'] === null) {
+                    if ($bt === null) {
                         return 1;
                     }
-
-                    return strcmp($a['time'], $b['time']);
+                    return $at <=> $bt;
                 });

---

429-454: De-duplicate the comparator logic.

Optional: extract private static comparators and reuse to keep behavior consistent and testable.

Example:

private static function compareStatsDocs(Document $a, Document $b): int { /* same logic */ }
private static function compareLogsDocs(Document $a, Document $b): int { /* includes $tenant first */ }

Then:

usort($projectStats['stats'], self::compareStatsDocs(...));
usort($this->statDocuments, self::compareLogsDocs(...));

Also applies to: 505-534

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

src/Appwrite/Platform/Workers/StatsUsage.php (1)

505-533: Bug: comparator reads _tenant but documents store $tenant; also add types.

prepareForLogsDB() sets $tenant, so $a['_tenant'] is always null and tenant ordering is skipped, undermining the lock/deadlock reduction goal. Fix by reading $tenant via getAttribute() and type the comparator.

-            usort($this->statDocuments, function ($a, $b) {
+            usort($this->statDocuments, static function (Document $a, Document $b): int {
                 // Tenant ASC
-                $cmp = $a['_tenant'] <=> $b['_tenant'];
+                $cmp = ((int) $a->getAttribute('$tenant', 0)) <=> ((int) $b->getAttribute('$tenant', 0));
                 if ($cmp !== 0) {
                     return $cmp;
                 }

                 // Metric DESC
-                $cmp = strcmp($b['metric'], $a['metric']);
+                $cmp = ($b->getAttribute('metric', '')) <=> ($a->getAttribute('metric', ''));
                 if ($cmp !== 0) {
                     return $cmp;
                 }

                 // Period ASC
-                $cmp = strcmp($a['period'], $b['period']);
+                $cmp = ($a->getAttribute('period', '')) <=> ($b->getAttribute('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']);
+                $at = $a->getAttribute('time');
+                $bt = $b->getAttribute('time');
+                if ($at === null) {
+                    return ($bt === null) ? 0 : -1;
+                }
+                if ($bt === null) {
+                    return 1;
+                }
+                return $at <=> $bt;
             });

src/Appwrite/Platform/Workers/StatsUsage.php (2)

431-453: Add types + null-safe comparator for deterministic sort (no behavior change).

Use typed comparator with Document::getAttribute() and the spaceship operator for clarity and static analysis friendliness.

-                usort($projectStats['stats'], function ($a, $b) {
+                usort($projectStats['stats'], static function (Document $a, Document $b): int {
                     // Metric DESC
-                    $cmp = strcmp($b['metric'], $a['metric']);
+                    $cmp = ($b->getAttribute('metric', '')) <=> ($a->getAttribute('metric', ''));
                     if ($cmp !== 0) {
                         return $cmp;
                     }

                     // Period ASC
-                    $cmp = strcmp($a['period'], $b['period']);
+                    $cmp = ($a->getAttribute('period', '')) <=> ($b->getAttribute('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']);
+                    $at = $a->getAttribute('time');
+                    $bt = $b->getAttribute('time');
+                    if ($at === null) {
+                        return ($bt === null) ? 0 : -1;
+                    }
+                    if ($bt === null) {
+                        return 1;
+                    }
+                    return $at <=> $bt;
                 });

---

431-453: DRY: extract shared sorters into private static comparators.

Both blocks implement the same metric/period/time ordering (one with an extra tenant step). Consider:

• private static function compareStats(Document $a, Document $b): int
• private static function compareStatsWithTenant(Document $a, Document $b): int

Then call them from both usort sites. Improves consistency and reduces risk of drift.

Also applies to: 505-533

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro