wip

laravel · Sep 1, 2023 · b855cb2 · b855cb2
1 parent 10a8869
commit b855cb2
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/config/pulse.php b/config/pulse.php
@@ -25,6 +25,7 @@
 
         'database' => [
             'connection' => env('PULSE_DB_CONNECTION', null),
+            'chunk' => 1000,
         ],
     ],
 
@@ -35,6 +36,7 @@
 
         'redis' => [
             'connection' => env('PULSE_REDIS_CONNECTION'),
+            'chunk' => 1000,
         ],
     ],
 

diff --git a/src/Commands/WorkCommand.php b/src/Commands/WorkCommand.php
@@ -54,8 +54,7 @@ public function handle(
                 $lastTrimmedStorageAt = $now;
             }
 
-            // TODO: chunking?
-            $processed = $ingest->store($storage, 1000);
+            $processed = $ingest->store($storage);
 
             if ($processed === 0) {
                 Sleep::for(1)->second();

diff --git a/src/Contracts/Ingest.php b/src/Contracts/Ingest.php
@@ -21,5 +21,5 @@ public function trim(): void;
     /**
      * Store the ingested entries.
      */
-    public function store(Storage $storage, int $count): int;
+    public function store(Storage $storage): int;
 }
diff --git a/src/Ingests/Redis.php b/src/Ingests/Redis.php
@@ -60,9 +60,9 @@ public function trim(): void
     /**
      * Store the ingested entries.
      */
-    public function store(Storage $storage, int $count): int
+    public function store(Storage $storage): int
     {
-        $entries = collect($this->connection()->xrange($this->stream, '-', '+', $count));
+        $entries = collect($this->connection()->xrange($this->stream, '-', '+', $this->config->get('pulse.ingest.redis.chunk')));
 
         if ($entries->isEmpty()) {
             return 0;
@@ -84,7 +84,7 @@ public function store(Storage $storage, int $count): int
      */
     protected function trimAfter(): Interval
     {
-        return new Interval($this->config->get('pulse.retain') ?? 'P7D');
+        return new Interval($this->config->get('pulse.retain'));
     }
 
     /**

diff --git a/src/Ingests/Storage.php b/src/Ingests/Storage.php
@@ -39,7 +39,7 @@ public function trim(): void
     /**
      * Store the ingested entries.
      */
-    public function store(StorageContract $store, int $count): int
+    public function store(StorageContract $store): int
     {
         throw new RuntimeException('The storage ingest driver does not need to process entries.');
     }

diff --git a/src/Storage/Database.php b/src/Storage/Database.php
@@ -39,7 +39,7 @@ public function store(Collection $items): void
 
         $this->connection()->transaction(function () use ($inserts, $updates) {
             $inserts->groupBy('table')
-                ->each(fn (Collection $rows, string $table) => $rows->chunk(1000)
+                ->each(fn (Collection $rows, string $table) => $rows->chunk($this->config->get('pulse.storage.database.chunk'))
                     ->map(fn (Collection $inserts) => $inserts->pluck('attributes')->all())
                     ->each($this->connection()->table($table)->insert(...)));
 
@@ -63,7 +63,7 @@ public function trim(Collection $tables): void
      */
     protected function trimAfter(): Interval
     {
-        return new Interval($this->config->get('pulse.retain') ?? 'P7D');
+        return new Interval($this->config->get('pulse.retain'));
     }
 
     /**

diff --git a/tests/Feature/HttpRequestsTest.php b/tests/Feature/HttpRequestsTest.php
@@ -14,7 +14,6 @@
 use Illuminate\Support\Facades\Route;
 use Laravel\Pulse\Facades\Pulse;
 use Laravel\Pulse\Pulse as PulseInstance;
-
 use function Pest\Laravel\actingAs;
 use function Pest\Laravel\get;
 use function Pest\Laravel\post;

diff --git a/tests/Feature/RedisTest.php b/tests/Feature/RedisTest.php
@@ -32,6 +32,7 @@
 
 it('runs the same commands while storing', function ($driver) {
     Config::set('database.redis.client', $driver);
+    Config::set('pulse.ingest.redis.chunk', 567);
     Date::setTestNow(Date::parse('2000-01-02 03:04:05')->startOfSecond());
     $ingest = App::make(Redis::class);
     $ingest->ingest(collect([
@@ -44,7 +45,7 @@
         ->output();
     [$firstEntryKey, $lastEntryKey] = collect(explode("\n", $output))->only([17, 21])->values();
 
-    $commands = captureRedisCommands(fn () => $ingest->store(new NullStorage, 567));
+    $commands = captureRedisCommands(fn () => $ingest->store(new NullStorage));
 
     expect($commands)->toContain('"XRANGE" "laravel_database_laravel:pulse:entries" "-" "+" "COUNT" "567"');
     expect($commands)->toContain('"XDEL" "laravel_database_laravel:pulse:entries" "'.$firstEntryKey.'" "'.$lastEntryKey.'"');