Skip to content

Support OBJECT ENCODING #2088

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

Merged
merged 10 commits into from
Apr 14, 2022
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
1 change: 1 addition & 0 deletions docs/ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- Adds: Support for `LPOS` with `.ListPosition()`/`.ListPositionAsync()` and `.ListPositions()`/`.ListPositionsAsync()` ([#2080 by slorello89](https://github.com/StackExchange/StackExchange.Redis/pull/2080))
- Fix: For streams, properly hash `XACK`, `XCLAIM`, and `XPENDING` in cluster scenarios to eliminate `MOVED` retries ([#2085 by nielsderdaele](https://github.com/StackExchange/StackExchange.Redis/pull/2085))
- Adds: Support for `OBJECT REFCOUNT` with `.KeyRefCount()`/`.KeyRefCountAsync()` ([#2087 by Avital-Fine](https://github.com/StackExchange/StackExchange.Redis/pull/2087))
- Adds: Support for `OBJECT ENCODIND` with `.KeyEncoding()`/`.KeyEncodingAsync()` ([#2088 by Avital-Fine](https://github.com/StackExchange/StackExchange.Redis/pull/2088))

## 2.5.61

Expand Down
9 changes: 9 additions & 0 deletions src/StackExchange.Redis/Interfaces/IDatabase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,15 @@ public interface IDatabase : IRedis, IDatabaseAsync
/// <remarks>https://redis.io/commands/dump</remarks>
byte[]? KeyDump(RedisKey key, CommandFlags flags = CommandFlags.None);

/// <summary>
/// Returns the internal encoding for the Redis object stored at <paramref name="key"/>.
/// </summary>
/// <param name="key">The key to dump.</param>
/// <param name="flags">The flags to use for this operation.</param>
/// <returns>The Redis encoding for the value or <see langword="null"/> is the key does not exist.</returns>
/// <remarks>https://redis.io/commands/object-encoding</remarks>
string? KeyEncoding(RedisKey key, CommandFlags flags = CommandFlags.None);

/// <summary>
/// Returns if key exists.
/// </summary>
Expand Down
9 changes: 9 additions & 0 deletions src/StackExchange.Redis/Interfaces/IDatabaseAsync.cs
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,15 @@ public interface IDatabaseAsync : IRedisAsync
/// <remarks>https://redis.io/commands/dump</remarks>
Task<byte[]?> KeyDumpAsync(RedisKey key, CommandFlags flags = CommandFlags.None);

/// <summary>
/// Returns the internal encoding for the Redis object stored at <paramref name="key"/>.
/// </summary>
/// <param name="key">The key to dump.</param>
/// <param name="flags">The flags to use for this operation.</param>
/// <returns>The Redis encoding for the value or <see langword="null"/> is the key does not exist.</returns>
/// <remarks>https://redis.io/commands/object-encoding</remarks>
Task<string?> KeyEncodingAsync(RedisKey key, CommandFlags flags = CommandFlags.None);

/// <summary>
/// Returns if key exists.
/// </summary>
Expand Down
3 changes: 3 additions & 0 deletions src/StackExchange.Redis/KeyspaceIsolation/DatabaseWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ public bool KeyDelete(RedisKey key, CommandFlags flags = CommandFlags.None) =>
public byte[]? KeyDump(RedisKey key, CommandFlags flags = CommandFlags.None) =>
Inner.KeyDump(ToInner(key), flags);

public string? KeyEncoding(RedisKey key, CommandFlags flags = CommandFlags.None) =>
Inner.KeyEncoding(ToInner(key), flags);

public bool KeyExists(RedisKey key, CommandFlags flags = CommandFlags.None) =>
Inner.KeyExists(ToInner(key), flags);
public long KeyExists(RedisKey[] keys, CommandFlags flags = CommandFlags.None) =>
Expand Down
3 changes: 3 additions & 0 deletions src/StackExchange.Redis/KeyspaceIsolation/WrapperBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ public Task<bool> KeyDeleteAsync(RedisKey key, CommandFlags flags = CommandFlags
public Task<byte[]?> KeyDumpAsync(RedisKey key, CommandFlags flags = CommandFlags.None) =>
Inner.KeyDumpAsync(ToInner(key), flags);

public Task<string?> KeyEncodingAsync(RedisKey key, CommandFlags flags = CommandFlags.None) =>
Inner.KeyEncodingAsync(ToInner(key), flags);

public Task<bool> KeyExistsAsync(RedisKey key, CommandFlags flags = CommandFlags.None) =>
Inner.KeyExistsAsync(ToInner(key), flags);

Expand Down
2 changes: 2 additions & 0 deletions src/StackExchange.Redis/PublicAPI.Shipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ StackExchange.Redis.IDatabase.KeyCopy(StackExchange.Redis.RedisKey sourceKey, St
StackExchange.Redis.IDatabase.KeyDelete(StackExchange.Redis.RedisKey key, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> bool
StackExchange.Redis.IDatabase.KeyDelete(StackExchange.Redis.RedisKey[]! keys, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> long
StackExchange.Redis.IDatabase.KeyDump(StackExchange.Redis.RedisKey key, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> byte[]?
StackExchange.Redis.IDatabase.KeyEncoding(StackExchange.Redis.RedisKey key, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> string?
StackExchange.Redis.IDatabase.KeyExists(StackExchange.Redis.RedisKey key, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> bool
StackExchange.Redis.IDatabase.KeyExists(StackExchange.Redis.RedisKey[]! keys, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> long
StackExchange.Redis.IDatabase.KeyExpire(StackExchange.Redis.RedisKey key, System.DateTime? expiry, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> bool
Expand Down Expand Up @@ -723,6 +724,7 @@ StackExchange.Redis.IDatabaseAsync.KeyCopyAsync(StackExchange.Redis.RedisKey sou
StackExchange.Redis.IDatabaseAsync.KeyDeleteAsync(StackExchange.Redis.RedisKey key, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> System.Threading.Tasks.Task<bool>!
StackExchange.Redis.IDatabaseAsync.KeyDeleteAsync(StackExchange.Redis.RedisKey[]! keys, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> System.Threading.Tasks.Task<long>!
StackExchange.Redis.IDatabaseAsync.KeyDumpAsync(StackExchange.Redis.RedisKey key, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> System.Threading.Tasks.Task<byte[]?>!
StackExchange.Redis.IDatabaseAsync.KeyEncodingAsync(StackExchange.Redis.RedisKey key, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> System.Threading.Tasks.Task<string?>!
StackExchange.Redis.IDatabaseAsync.KeyExistsAsync(StackExchange.Redis.RedisKey key, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> System.Threading.Tasks.Task<bool>!
StackExchange.Redis.IDatabaseAsync.KeyExistsAsync(StackExchange.Redis.RedisKey[]! keys, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> System.Threading.Tasks.Task<long>!
StackExchange.Redis.IDatabaseAsync.KeyExpireAsync(StackExchange.Redis.RedisKey key, System.DateTime? expiry, StackExchange.Redis.CommandFlags flags = StackExchange.Redis.CommandFlags.None) -> System.Threading.Tasks.Task<bool>!
Expand Down
14 changes: 13 additions & 1 deletion src/StackExchange.Redis/RedisDatabase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,18 @@ private RedisCommand GetDeleteCommand(RedisKey key, CommandFlags flags, out Serv
return ExecuteAsync(msg, ResultProcessor.ByteArray);
}

public string? KeyEncoding(RedisKey key, CommandFlags flags = CommandFlags.None)
{
var msg = Message.Create(Database, flags, RedisCommand.OBJECT, RedisLiterals.ENCODING, key);
return ExecuteSync(msg, ResultProcessor.String);
}

public Task<string?> KeyEncodingAsync(RedisKey key, CommandFlags flags = CommandFlags.None)
{
var msg = Message.Create(Database, flags, RedisCommand.OBJECT, RedisLiterals.ENCODING, key);
return ExecuteAsync(msg, ResultProcessor.String);
}

public bool KeyExists(RedisKey key, CommandFlags flags = CommandFlags.None)
{
var msg = Message.Create(Database, flags, RedisCommand.EXISTS, key);
Expand Down Expand Up @@ -3620,7 +3632,7 @@ private Message GetStreamPendingMessagesMessage(RedisKey key, RedisValue groupNa

if (consumerName != RedisValue.Null)
{
values[4] = consumerName;
values[4] = consumerName;
}

return Message.Create(Database,
Expand Down
1 change: 1 addition & 0 deletions src/StackExchange.Redis/RedisLiterals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public static readonly RedisValue
DB = "DB",
DESC = "DESC",
DOCTOR = "DOCTOR",
ENCODING = "ENCODING",
EX = "EX",
EXAT = "EXAT",
EXISTS = "EXISTS",
Expand Down
7 changes: 7 additions & 0 deletions tests/StackExchange.Redis.Tests/DatabaseWrapperTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,13 @@ public void KeyDump()
mock.Verify(_ => _.KeyDump("prefix:key", CommandFlags.None));
}

[Fact]
public void KeyEncoding()
{
wrapper.KeyEncoding("key", CommandFlags.None);
mock.Verify(_ => _.KeyEncoding("prefix:key", CommandFlags.None));
}

[Fact]
public void KeyExists()
{
Expand Down
26 changes: 26 additions & 0 deletions tests/StackExchange.Redis.Tests/Keys.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,32 @@ public async Task TouchIdleTimeAsync()
}
}

[Fact]
public async Task KeyEncoding()
{
using var muxer = Create();
var key = Me();
var db = muxer.GetDatabase();

db.KeyDelete(key, CommandFlags.FireAndForget);
db.StringSet(key, "new value", flags: CommandFlags.FireAndForget);

Assert.Equal("embstr", db.KeyEncoding(key));
Assert.Equal("embstr", await db.KeyEncodingAsync(key));

db.KeyDelete(key, CommandFlags.FireAndForget);
db.ListLeftPush(key, "new value", flags: CommandFlags.FireAndForget);

// Depending on server version, this is going to vary - we're sanity checking here.
var listTypes = new [] { "ziplist", "quicklist" };
Assert.Contains(db.KeyEncoding(key), listTypes);
Assert.Contains(await db.KeyEncodingAsync(key), listTypes);

var keyNotExists = key + "no-exist";
Assert.Null(db.KeyEncoding(keyNotExists));
Assert.Null(await db.KeyEncodingAsync(keyNotExists));
}

[Fact]
public async Task KeyRefCount()
{
Expand Down
8 changes: 8 additions & 0 deletions tests/StackExchange.Redis.Tests/WrapperBaseTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,14 @@ public void KeyDumpAsync()
mock.Verify(_ => _.KeyDumpAsync("prefix:key", CommandFlags.None));
}

[Fact]
public void KeyEncodingAsync()
{
wrapper.KeyEncodingAsync("key", CommandFlags.None);
mock.Verify(_ => _.KeyEncodingAsync("prefix:key", CommandFlags.None));
}


[Fact]
public void KeyExistsAsync()
{
Expand Down