Merge pull request #49 from aloware/fix/optimize-queue-partitions

Fix | Optimize Queue Partitions
aloware · Apr 13, 2023 · 5020b68 · 5020b68
2 parents 7291fe7 + b1b2834
commit 5020b68
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 97 deletions.
diff --git a/src/FairSignalJob.php b/src/FairSignalJob.php
@@ -34,7 +34,7 @@ public function handle()
             /** @var RepositoryInterface $repository */
             $repository = app(RepositoryInterface::class);
 
-            list($partition, $jobSerialized) = $this->pop($repository, 'pop', 'partitions');
+            list($partition, $jobSerialized) = $this->pop($repository, 'pop', 'getRandomPartitionName');
 
 //            if (is_null($jobSerialized)) {
 //                list($partition, $jobSerialized) = $this->pop($repository, 'popFailed', 'failedPartitions');
@@ -136,7 +136,7 @@ public function onPartition($partition)
         return $this;
     }
 
-    private function pop($repository, $popMethod = 'pop', $partitionsMethod = 'partitions')
+    private function pop($repository, $popMethod = 'pop', $partitionsMethod = 'getRandomPartitionName')
     {
         $partition = $this->selectPartition($repository, $partitionsMethod);
 
@@ -167,17 +167,9 @@ private function pop($repository, $popMethod = 'pop', $partitionsMethod = 'parti
         return [$partition, $jobSerialized];
     }
 
-    private function selectPartition($repository, $partitionsMethod = 'partitions')
+    private function selectPartition($repository, $partitionsMethod = 'getRandomPartitionName')
     {
-        $partitions = $repository->$partitionsMethod($this->queue);
-
-        if (empty($partitions)) {
-            return null;
-        }
-
-        $partitionIndex = random_int(0, count($partitions) - 1);
-
-        return $partitions[$partitionIndex];
+        return $repository->$partitionsMethod($this->queue);
     }
 
     public function updateStats($uuid)

diff --git a/src/Repositories/RedisKeys.php b/src/Repositories/RedisKeys.php
@@ -156,6 +156,15 @@ private function queueListPattern()
         );
     }
 
+    private function queuePartitionsListKeyName($queue)
+    {
+        return sprintf(
+            '%s-partitions-%s',
+            $this->fairQueueKeyPrefix(),
+            $queue
+        );
+    }
+
     private function queuePartitionListPattern($queue)
     {
         return sprintf(