minor changes to support valkey (#68)

catcherwong · Sep 28, 2024 · 7a5d858 · 7a5d858
1 parent 7d41abd
commit 7a5d858
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/src/RDBCli/Callbacks/MemoryCallback.cs b/src/RDBCli/Callbacks/MemoryCallback.cs
@@ -49,11 +49,17 @@ public void AuxField(byte[] key, byte[] value)
             else if (keyStr.Equals("redis-bits"))
             {
                 _rdbDataInfo.RedisBits = RedisRdbObjectHelper.ConvertBytesToInteger(value);
+                _rdbDataInfo.RedisType = "Redis";
             }
             else if (keyStr.Equals("ctime"))
             {
                 _rdbDataInfo.CTime = RedisRdbObjectHelper.ConvertBytesToInteger(value);
             }
+            else if (keyStr.Equals("valkey-ver"))
+            {
+                _rdbDataInfo.RedisVer = System.Text.Encoding.UTF8.GetString(value);
+                _rdbDataInfo.RedisType = "Valkey";
+            }
         }
 
         public void DbSize(uint dbSize, uint expiresSize)

diff --git a/src/RDBCli/Commands/MemoryCommand.cs b/src/RDBCli/Commands/MemoryCommand.cs
@@ -240,6 +240,7 @@ public class MemoryAnslysisResult
         public int count { get; set; }
         public int rdbVer { get; set; }
         public string redisVer { get; set; }
+        public string redisType { get; set; }
         public long redisBits { get; set; }
         public int expCount { get; set; }
         public int permCount { get; set; }
@@ -265,6 +266,7 @@ internal static MemoryAnslysisResult BuildBasicFromRdbDataInfo(RdbDataInfo rdbDa
                 redisVer = string.IsNullOrWhiteSpace(rdbDataInfo.RedisVer) ? CommonHelper.GetFuzzyRedisVersion(rdbDataInfo.RdbVer) : rdbDataInfo.RedisVer,
                 redisBits = rdbDataInfo.RedisBits,
                 functions = rdbDataInfo.Functions,
+                redisType = rdbDataInfo.RedisType,
             };
 
             return result;

diff --git a/src/RDBCli/Helpers/CommonHelper.Const.cs b/src/RDBCli/Helpers/CommonHelper.Const.cs
diff --git a/src/RDBCli/Stats/RdbDataInfo.cs b/src/RDBCli/Stats/RdbDataInfo.cs
@@ -51,5 +51,10 @@ internal class RdbDataInfo
         /// The information about the functions and libraries
         /// </summary>
         public List<FunctionsRecord> Functions { get; set; } = new List<FunctionsRecord>();
+
+        /// <summary>
+        /// The information about the redis type, Redis or Valkey
+        /// </summary>
+        public string RedisType { get; set; } = "Redis";
     }
 }
diff --git a/src/RDBCli/Tpl/tpl.html b/src/RDBCli/Tpl/tpl.html
@@ -37,7 +37,7 @@ <h3>
                             RDB Version: <b id="rdbVer"></b>
                         </div>
                         <div class="lead display-7">
-                            Redis Version: <b id="redisVer"></b>
+                            <label id="redisType">Redis</label> Version: <b id="redisVer"></b>
                         </div>
                     </div>
                 </div>
@@ -168,6 +168,7 @@ <h3>
 
         $('#rdbVer').text(cliData.rdbVer);
         $('#redisVer').text(cliData.redisVer);
+        $('#redisType').text(cliData.redisType);
         $('#totalKeyBytes').text(formatBytes(cliData.usedMem));
         $('#totalKeyNum').text(formatNumber(cliData.count));
         $('#expKeyNum').text(formatNumber(cliData.expCount));

diff --git a/src/RDBParser/Constant.cs b/src/RDBParser/Constant.cs
@@ -10,10 +10,9 @@ public static class RdbVersion
             public const int Min = 1;
 
             // Redis 6.2.14   9
-            // Redis 7.0-rc1  10
-            // Redis 7.0.15   10
-            // Redis 7.2-rc1  11
-            // Redis 7.2.4    11
+            // Redis 7.0-rc1~~7.0.15  10
+            // Redis 7.2-rc1~~7.4.0  11
+            // Valkey 7.2.4-rc1~~8.0.0  11
             public const int Max = 11;
         }