From 74ad345ba5e15665067dbb9b7bccbe9cc383f8aa Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sat, 5 Mar 2022 21:38:36 +0100
Subject: [PATCH] redis key sizes

---
 .../web/src/widgets/DbKeysTreeNode.svelte     | 10 ++++-
 .../dbgate-plugin-redis/src/backend/driver.js | 38 ++++++++++++++-----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/packages/web/src/widgets/DbKeysTreeNode.svelte b/packages/web/src/widgets/DbKeysTreeNode.svelte
index d339bda8c..07e6b0491 100644
--- a/packages/web/src/widgets/DbKeysTreeNode.svelte
+++ b/packages/web/src/widgets/DbKeysTreeNode.svelte
@@ -48,8 +48,16 @@
   title={item.text}
   expandIcon={item.type == 'dir' ? plusExpandIcon(isExpanded) : 'icon invisible-box'}
   on:expand={() => {
-    isExpanded = !isExpanded;
+    if (item.type == 'dir') {
+      isExpanded = !isExpanded;
+    }
   }}
+  on:click={() => {
+    if (item.type == 'dir') {
+      isExpanded = !isExpanded;
+    }
+  }}
+  extInfo={item.count ? `(${item.count})` : null}
   {indentLevel}
 />
 <!-- <div on:click={() => (isExpanded = !isExpanded)}>
diff --git a/plugins/dbgate-plugin-redis/src/backend/driver.js b/plugins/dbgate-plugin-redis/src/backend/driver.js
index 0ea87eccf..adca9a7a0 100644
--- a/plugins/dbgate-plugin-redis/src/backend/driver.js
+++ b/plugins/dbgate-plugin-redis/src/backend/driver.js
@@ -93,17 +93,24 @@ const driver = {
       if (!key.startsWith(prefix)) continue;
       const keySplit = key.split(':');
       if (keySplit.length > rootSplit.length) {
+        const text = keySplit[rootSplit.length];
         if (keySplit.length == rootSplit.length + 1) {
-          res[keySplit[rootSplit.length]] = {
-            text: keySplit[rootSplit.length],
+          res[text] = {
+            text,
             key,
           };
         } else {
-          res[keySplit[rootSplit.length]] = {
-            text: keySplit[rootSplit.length],
-            type: 'dir',
-            root: keySplit.slice(0, rootSplit.length + 1).join(':'),
-          };
+          const dctKey = '::' + text;
+          if (res[dctKey]) {
+            res[dctKey].count++;
+          } else {
+            res[dctKey] = {
+              text: text + ':*',
+              type: 'dir',
+              root: keySplit.slice(0, rootSplit.length + 1).join(':'),
+              count: 1,
+            };
+          }
         }
       }
     }
@@ -111,8 +118,21 @@ const driver = {
   },
 
   async enrichOneKeyInfo(pool, item) {
-    const type = await pool.type(item.key);
-    item.type = type;
+    item.type = await pool.type(item.key);
+    switch (item.type) {
+      case 'list':
+        item.count = await pool.llen(item.key);
+        break;
+      case 'set':
+        item.count = await pool.scard(item.key);
+        break;
+      case 'zset':
+        item.count = await pool.zcard(item.key);
+        break;
+      case 'stream':
+        item.count = await pool.xlen(item.key);
+        break;
+    }
   },
 
   async enrichKeyInfo(pool, levelInfo) {