fix slot info

Signed-off-by: catcherwong <[email protected]>

src/RDBCli/Callbacks/KeysOnlyCallback.cs

@@ -183,9 +183,5 @@ public void ZAdd(byte[] key, double score, byte[] member)
         public void SetIdleOrFreq(int val)
         {
         }
-
-        public void SetSlotInfo(ulong slotId, ulong slotSize, ulong expireSlotSize)
-        {
-        }
     }
 }

src/RDBCli/Callbacks/MemoryCallback.cs

@@ -483,9 +483,5 @@ public void SetIdleOrFreq(int val)
         {
             _idleOrFreq = val;
         }
-
-        public void SetSlotInfo(ulong slotId, ulong slotSize, ulong expireSlotSize)
-        {
-        }
     }
 }

src/RDBParser/BinaryReaderRDBParser.cs

@@ -17,6 +17,7 @@ public partial class BinaryReaderRDBParser : IRDBParser
         private int _freq = 0;
         private int _mem_policy = -1; // 1 - lru | 2 - lfu
         private int _version = -1;
+        private ulong _slotId = 0;
         private HashSet<string> _auxKey = new HashSet<string>();
 
         public BinaryReaderRDBParser(IReaderCallback callback, ParserFilter filter = null)
@@ -90,10 +91,14 @@ public void Parse(string path)
 
                         if (opType == Constant.OpCode.SLOTINFO)
                         {
-                            var slotId = br.ReadLength();
-                            var slotSize = br.ReadLength();
-                            var expireSlotSize = br.ReadLength();
-                            _callback.SetSlotInfo(slotId, slotSize, expireSlotSize);
+                            // cluster keyslot yourkey
+                            _slotId = br.ReadLength();
+
+                            // slotSize
+                            _ = br.ReadLength();
+
+                            // expireSlotSize
+                            _ = br.ReadLength();
                             continue;
                         }
 
@@ -183,6 +188,7 @@ public void Parse(string path)
                             {
                                 info.Idle = _idle;
                                 info.Freq = _freq;
+                                info.SlotId = _slotId;
 
                                 ReadObject(br, _key, opType, _expiry, info);
                             }

src/RDBParser/Callbacks/DefaultConsoleReaderCallBack.cs

@@ -91,11 +91,6 @@ public void SetIdleOrFreq(int val)
             Console.WriteLine($"SetIdleOrFreq, val={val}");
         }
 
-        public void SetSlotInfo(ulong slotId, ulong slotSize, ulong expireSlotSize)
-        {
-            Console.WriteLine($"SetSlotInfo, slotId={slotId}, slotSize={slotSize}, expireSlotSize={expireSlotSize}");
-        }
-
         public void StartDatabase(int database)
         {
             Console.WriteLine($"Start database = {database}");

src/RDBParser/Callbacks/IReaderCallback.cs

@@ -223,13 +223,5 @@ public interface IReaderCallback
         /// </summary>
         /// <param name="val"></param>
         void SetIdleOrFreq(int val);
-
-        /// <summary>
-        /// Record Slot Info
-        /// </summary>
-        /// <param name="slotId"></param>
-        /// <param name="slotSize"></param>
-        /// <param name="expireSlotSize"></param>
-        void SetSlotInfo(ulong slotId, ulong slotSize, ulong expireSlotSize);
     }
 }

src/RDBParser/Callbacks/Models/Info.cs

@@ -12,6 +12,8 @@ public class Info
 
         public ulong Zips { get; set; }
 
+        public ulong SlotId { get; set; }
+
         public override string ToString()
         {
             return $"Info{{Encoding={Encoding},Idle={Idle},Freq={Freq},SizeOfValue={SizeOfValue},Zips={Zips}}}";

src/RDBParser/Callbacks/NoOpReaderCallBack.cs

@@ -72,10 +72,6 @@ public void SetIdleOrFreq(int val)
         {
         }
 
-        public void SetSlotInfo(ulong slotId, ulong slotSize, ulong expireSlotSize)
-        {
-        }
-
         public void StartDatabase(int database)
         {
         }

tests/RDBParserTests/ClusterTests.cs

@@ -0,0 +1,34 @@
+using RDBParser;
+using System.Text;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace RDBParserTests
+{
+    public class ClusterTests
+    {
+        private ITestOutputHelper _output;
+
+        public ClusterTests(ITestOutputHelper output)
+        {
+            this._output = output;
+        }
+
+        [Fact]
+        public void TestSoltInfo()
+        {
+            // set mykey v1
+            // bgsave
+            var path = TestHelper.GetRDBPath("redis74_cluster_slotinfo.rdb");
+
+            var callback = new TestReaderCallback(_output);
+            var parser = new BinaryReaderRDBParser(callback);
+            parser.Parse(path);
+
+            var infos = callback.GetInfos();
+
+            Assert.Equal(1165, (int)infos[0][Encoding.UTF8.GetBytes("key{v1}")].SlotId);
+            Assert.Equal(2589, (int)infos[0][Encoding.UTF8.GetBytes("key{v12}")].SlotId);
+        }
+    }
+}

tests/RDBParserTests/TestReaderCallback.cs

@@ -346,10 +346,5 @@ public void SetIdleOrFreq(int val)
         {
             _idleOrFreq = val;
         }
-
-        public void SetSlotInfo(ulong slotId, ulong slotSize, ulong expireSlotSize)
-        {
-            System.Diagnostics.Trace.WriteLine($"{slotId}, {slotSize}, {expireSlotSize}");
-        }
     }
 }