basic info add exp and perm keys related (#49)

* basic info add exp and perm keys related * update cli version to 0.8.1 --------- Signed-off-by: catcherwong <[email protected]>
catcherwong · Nov 17, 2023 · 2cf0957 · 2cf0957
1 parent eeb4fc4
commit 2cf0957
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 9 deletions.
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 
 		<RDBParserVersion>0.6.0</RDBParserVersion>
-		<RDBCliVersion>0.8.0</RDBCliVersion>
+		<RDBCliVersion>0.8.1</RDBCliVersion>
 
 	</PropertyGroup>
 </Project>
diff --git a/src/RDBCli/Commands/MemoryCommand.cs b/src/RDBCli/Commands/MemoryCommand.cs
@@ -4,6 +4,7 @@
 using System.CommandLine.Invocation;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text.Json;
 using CliCB = RDBCli.Callbacks;
 
@@ -88,6 +89,13 @@ private void Do(InvocationContext context, CommandOptions options)
             dict.expiryInfo = expiryInfo;
             dict.largestStreams = streamRecords;
 
+            var exp = expiryInfo.FirstOrDefault(x => x.Expiry.Equals(CommonHelper.AlreadyExpired));
+            var perm = expiryInfo.FirstOrDefault(x => x.Expiry.Equals(CommonHelper.Permanent));
+            dict.expCount = (int)(exp?.Num ?? 0);
+            dict.expMem = (long)(exp?.Bytes ?? 0);
+            dict.permCount = (int)(perm?.Num ?? 0);
+            dict.permMem = (long)(perm?.Bytes ?? 0);
+
             var path = WriteFile(dict, options.Output, options.OutputType);
 
             sw.Stop();
@@ -213,6 +221,10 @@ public class MemoryAnslysisResult
         public int rdbVer { get; set; }
         public string redisVer { get; set; }
         public long redisBits { get; set; }
+        public int expCount { get; set; }
+        public int permCount { get; set; }
+        public long expMem { get; set; }
+        public long permMem { get; set; }
         public List<TypeRecord> typeRecords { get; set; }
         public List<Record> largestRecords { get; set; }
         public List<PrefixRecord> largestKeyPrefix { get; set; }