#105514 Метод получения информации по индексам

Author: zix2

src/ElasticClient.php

@@ -6,6 +6,7 @@
 use Elastic\Elasticsearch\ClientBuilder;
 use Ensi\LaravelElasticQuery\Debug\QueryLog;
 use Ensi\LaravelElasticQuery\Debug\QueryLogRecord;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 class ElasticClient
@@ -73,15 +74,32 @@ public function documentDelete(string $index, int|string $id): array
 
     public function catIndices(string $indexName, ?array $getFields = null): array
     {
-        $params = ['index' => "$indexName*"];
-        if ($getFields) {
-            $params['h'] = $getFields;
+        $response = $this->client
+            ->indices()
+            ->stats(['index' => "$indexName*"])
+            ->asArray();
+
+        $results = [];
+        foreach ($response['indices'] as $indexName => $stat) {
+            $item = [
+                'index' => $indexName,
+                'health' => $stat['health'],
+                'status' => $stat['status'],
+                'uuid' => $stat['uuid'],
+                'pri' => Arr::get($stat, 'primaries.shard_stats.total_count'),
+                'rep' => Arr::get($stat, 'total.shard_stats.total_count'),
+                'docs.count' => Arr::get($stat, 'total.docs.count'),
+                'docs.deleted' => Arr::get($stat, 'total.docs.deleted'),
+                'store.size' => Arr::get($stat, 'total.store.size_in_bytes'),
+                'pri.store.size' => Arr::get($stat, 'primaries.store.size_in_bytes'),
+            ];
+
+            $results[] = !$getFields
+                ? $item
+                : Arr::only($item, $getFields);
         }
 
-        return $this->client
-            ->cat()
-            ->indices($params)
-            ->asArray();
+        return $results;
     }
 
     public function indicesDelete(string $indexName): array

tests/Functional/ClientTest.php

@@ -3,11 +3,14 @@
 namespace Ensi\LaravelElasticQuery\Tests\Functional;
 
 use Ensi\LaravelElasticQuery\ElasticClient;
+use Ensi\LaravelElasticQuery\Tests\AssertsArray;
 use Ensi\LaravelElasticQuery\Tests\Models\ProductsIndex;
 use Ensi\LaravelElasticQuery\Tests\Seeds\ProductIndexSeeder;
 
 class ClientTest extends ElasticTestCase
 {
+    use AssertsArray;
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -17,8 +20,29 @@ protected function setUp(): void
 
     public function testCatIndices(): void
     {
-        $results = $this->newClient()->catIndices(ProductsIndex::fullName());
+        $response = $this->newClient()->catIndices(ProductsIndex::fullName());
+
+        $this->assertGreaterThanOrEqual(1, count($response));
+        $this->assertArrayStructure([[
+            'index',
+            'status',
+            'health',
+            'uuid',
+            'pri',
+            'rep',
+            'docs.count',
+            'docs.deleted',
+            'store.size',
+            'pri.store.size',
+        ]], $response);
+    }
+
+    public function testCatIndicesOnlySpecifiedFields(): void
+    {
+        $response = $this->newClient()->catIndices(ProductsIndex::fullName(), ['index', 'status']);
 
+        $this->assertArrayStructure([['index', 'status']], $response);
+        $this->assertArrayNotHasKey('health', $response[0]);
     }
 
     private function newClient(): ElasticClient