Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support set listpack redis7.2 #69

Merged
merged 3 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/RDBParser/BinaryReaderRDBParser.Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ public void ReadObject(BinaryReader br, byte[] key, int encType, long expiry, In
ReadModule(br);
}
else if (encType == Constant.DataType.STREAM_LISTPACKS
|| encType == Constant.DataType.STREAM_LISTPACKS_2)
|| encType == Constant.DataType.STREAM_LISTPACKS_2
|| encType == Constant.DataType.STREAM_LISTPACKS_3)
{
ReadStream(br, encType);
}
Expand All @@ -120,6 +121,10 @@ public void ReadObject(BinaryReader br, byte[] key, int encType, long expiry, In
{
ReadZSetFromListPack(br);
}
else if (encType == Constant.DataType.SET_LISTPACK)
{
ReadSetFromListPack(br);
}
else
{
throw new RDBParserException($"Invalid object type {encType} for {key} ");
Expand Down Expand Up @@ -207,6 +212,10 @@ private void SkipObject(BinaryReader br, int encType)
{
skip = 1;
}
else if (encType == Constant.DataType.SET_LISTPACK)
{
skip = 1;
}
else
{
throw new RDBParserException($"Invalid object type {encType} for {_key} ");
Expand Down
34 changes: 34 additions & 0 deletions src/RDBParser/BinaryReaderRDBParser.ListPack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,40 @@ private void ReadZSetFromListPack(BinaryReader br)
_callback.EndSortedSet(_key);
}

private void ReadSetFromListPack(BinaryReader br)
{
// <total_bytes><size><entry><entry>..<entry><end>
var rawString = br.ReadStr();
using MemoryStream stream = new MemoryStream(rawString);
using var rd = new BinaryReader(stream);

// <total_bytes>
var bytes = lpGetTotalBytes(rd);
// <size>
var numEle = lpGetNumElements(rd);

var numEntries = (ushort)numEle;

Info info = new Info();
info.Idle = _idle;
info.Freq = _freq;
info.Encoding = Constant.ObjEncoding.LISTPACK;
info.SizeOfValue = rawString.Length;
_callback.StartSet(_key, numEntries, _expiry, info);

for (int i = 0; i < numEntries; i++)
{
var entry = ReadListPackEntry(rd);

_callback.SAdd(_key, entry.data);
}

var lpEnd = rd.ReadByte();
if (lpEnd != 0xFF) throw new RDBParserException($"Invalid list pack end - {lpEnd} for key {_key}");

_callback.EndSet(_key);
}

private uint lpGetTotalBytes(BinaryReader br)
{
return (uint)br.ReadByte() << 0 |
Expand Down
12 changes: 12 additions & 0 deletions src/RDBParser/Constant.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ public static class DataType
public const int ZSET_LISTPACK = 17;
public const int LIST_QUICKLIST_2 = 18;
public const int STREAM_LISTPACKS_2 = 19;
public const int SET_LISTPACK = 20;
public const int STREAM_LISTPACKS_3 = 21;
public const int HASH_METADATA_PRE_GA = 22;
public const int HASH_LISTPACK_EX_PRE_GA = 23;
public const int HASH_METADATA = 24;
public const int HASH_LISTPACK_EX = 25;

public static readonly System.Collections.Generic.Dictionary<int, string> MAPPING = new System.Collections.Generic.Dictionary<int, string>
{
Expand All @@ -113,6 +119,12 @@ public static class DataType
{ 17, "sortedset" },
{ 18, "list" },
{ 19, "stream" },
{ 20, "set" },
{ 21, "stream" },
{ 22, "hash" },
{ 23, "hash" },
{ 24, "hash" },
{ 25, "hash" },
};
}

Expand Down
22 changes: 21 additions & 1 deletion tests/RDBParserTests/SetTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,26 @@ public void TestRegularSet()
{
Assert.Contains(Encoding.UTF8.GetBytes(item), sets[0][Encoding.UTF8.GetBytes("regular_set")]);
}
}
}

[Fact]
public void TestListPackSet_72()
{
var path = TestHelper.GetRDBPath("redis_72_set_listpack.rdb");

var callback = new TestReaderCallback(_output);
var parser = new BinaryReaderRDBParser(callback);
parser.Parse(path);

var sets = callback.GetSets();
var lengths = callback.GetLengths();

Assert.Equal(7, lengths[0][Encoding.UTF8.GetBytes("testrdb")]);

foreach (var item in new List<string> { "v1", "v2", "100", "-1000", 0x7ffe.ToString(), 0x7ffefffe.ToString(), 0x7ffefffefffefffe .ToString()})
{
Assert.Contains(Encoding.UTF8.GetBytes(item), sets[0][Encoding.UTF8.GetBytes("testrdb")]);
}
}
}
}
Binary file added tests/dumps/redis_72_set_listpack.rdb
Binary file not shown.