#RI-3704-fix overview calculation

Author: AmirAllayarovSofteq

redisinsight/api/src/modules/database-analysis/scanner/keys-scanner.spec.ts

@@ -107,34 +107,10 @@ describe('KeysScanner', () => {
 
   describe('nodeScan', () => {
     it('should scan node keys', async () => {
+      const getTotal = jest.fn().mockResolvedValue(1);
       expect(await service.nodeScan(nodeClient, {
         filter: mockCreateDatabaseAnalysisDto.filter,
       })).toEqual(mockScanResult);
     });
   });
-
-  describe('getNodeTotal', () => {
-    it('get total keys in db', async () => {
-      expect(await service.getNodeTotal(nodeClient)).toEqual(1);
-    });
-    it('get total keys in db (db:3)', async () => {
-      const client = Object.assign(nodeClient);
-      client.options = { db: 3 };
-      expect(await service.getNodeTotal(client)).toEqual(100);
-    });
-    it('get total keys in db (no keyspace data)', async () => {
-      when(nodeClient.sendCommand)
-        .calledWith(jasmine.objectContaining({ name: 'info' }))
-        .mockResolvedValueOnce(mockRedisKeyspaceInfoResponseNoKeyspaceData);
-
-      expect(await service.getNodeTotal(nodeClient)).toEqual(0);
-    });
-    it('get total keys in db (no info data)', async () => {
-      when(nodeClient.sendCommand)
-        .calledWith(jasmine.objectContaining({ name: 'info' }))
-        .mockResolvedValueOnce(mockRedisKeyspaceInfoResponseEmpty);
-
-      expect(await service.getNodeTotal(nodeClient)).toEqual(0);
-    });
-  });
 });

redisinsight/api/src/modules/database/providers/database-overview.provider.ts

@@ -12,6 +12,7 @@ import {
   convertBulkStringsToObject,
   convertRedisInfoReplyToObject,
 } from 'src/utils';
+import { getTotal } from 'src/modules/database/utils/database.total.util';
 import { DatabaseOverview } from 'src/modules/database/models/database-overview';
 
 @Injectable()
@@ -29,16 +30,21 @@ export class DatabaseOverviewProvider {
   ): Promise<DatabaseOverview> {
     let nodesInfo = [];
     let currentDbIndex = 0;
+    let totalKeys;
+    let totalKeysPerDb;
 
-    if (client instanceof IORedis.Cluster) {
+    if (client.isCluster) {
       currentDbIndex = get(client, ['options', 'db'], 0);
-      nodesInfo = await this.getNodesInfo(client);
+      nodesInfo = await this.getNodesInfo(client as IORedis.Cluster);
+      totalKeys = await this.calculateNodesTotalKeys(client);
     } else {
       currentDbIndex = get(client, ['options', 'db'], 0);
-      nodesInfo = [await this.getNodeInfo(client)];
+      nodesInfo = [await this.getNodeInfo(client as IORedis.Redis)];
+      const [calculatedTotalKeys, calculatedTotalKeysPerDb] = this.calculateTotalKeys(nodesInfo, currentDbIndex);
+      totalKeys = calculatedTotalKeys;
+      totalKeysPerDb = calculatedTotalKeysPerDb;
     }
 
-    const [totalKeys, totalKeysPerDb] = this.calculateTotalKeys(nodesInfo, currentDbIndex);
     return {
       version: this.getVersion(nodesInfo),
       totalKeys,
@@ -234,6 +240,19 @@ export class DatabaseOverviewProvider {
     }
   }
 
+  private async calculateNodesTotalKeys(
+    client: IORedis.Cluster,
+  ): Promise<number> {
+    const nodesTotal: number[] = await Promise.all(
+      client
+        .nodes('master')
+        .map(async (node) => getTotal(node)),
+    );
+    return nodesTotal.reduce((prev, cur) => (
+      prev + cur
+    ), 0);
+  }
+
   /**
    * Calculates sum of cpu usage in percentage for all shards
    * CPU% = ((used_cpu_sys_t2+used_cpu_user_t2)-(used_cpu_sys_t1+used_cpu_user_t1)) / (t2-t1)