Merge pull request ppy#10795 from notbakaneko/feature/score-indexer-u…

…pdates-pr-152 Update score index, queue and tests
nanaya · Dec 25, 2023 · 5c3569f · 5c3569f
2 parents cc1e00a + a583b43
commit 5c3569f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/Libraries/Search/ScoreSearch.php b/app/Libraries/Search/ScoreSearch.php
@@ -21,7 +21,7 @@ class ScoreSearch extends RecordSearch
     public function __construct(?ScoreSearchParams $params = null)
     {
         parent::__construct(
-            $GLOBALS['cfg']['osu']['elasticsearch']['prefix'].'solo_scores',
+            $GLOBALS['cfg']['osu']['elasticsearch']['prefix'].'scores',
             $params ?? new ScoreSearchParams(),
             Score::class
         );
@@ -122,7 +122,7 @@ public function queueForIndex(?array $schemas, array $ids): void
         );
 
         foreach ($schemas as $schema) {
-            LaravelRedis::lpush("osu-queue:score-index-{$schema}", ...$values);
+            LaravelRedis::lpush("osu-queue:{$schema}", ...$values);
         }
     }
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -145,8 +145,8 @@ services:
       - "${NGINX_PORT:-8080}:80"
 
   score-indexer:
-    image: pppy/osu-elastic-indexer
-    command: ["queue", "watch", "--set-current"]
+    image: pppy/osu-elastic-indexer:master
+    command: ["queue", "watch"]
     depends_on:
       redis:
         condition: service_healthy
@@ -159,8 +159,8 @@ services:
       SCHEMA: "${SCHEMA:-1}"
 
   score-indexer-test:
-    image: pppy/osu-elastic-indexer
-    command: ["queue", "watch", "--set-current"]
+    image: pppy/osu-elastic-indexer:master
+    command: ["queue", "watch"]
     depends_on:
       redis:
         condition: service_healthy

diff --git a/tests/Commands/EsIndexScoresQueueTest.php b/tests/Commands/EsIndexScoresQueueTest.php
@@ -22,7 +22,7 @@ private static function clearQueue(): void
 
     private static function queueKey(): string
     {
-        return 'osu-queue:score-index-'.static::SCHEMA;
+        return 'osu-queue:'.static::SCHEMA;
     }
 
     private static function queueSize(): int