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

[cache] fix #38796 - fix inconsistent handling of empty byte[] #47491

Merged
merged 2 commits into from
Mar 30, 2023
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
4 changes: 2 additions & 2 deletions src/Caching/StackExchangeRedis/src/RedisCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ private void TryRegisterProfiler(IConnectionMultiplexer connection)
Refresh(cache, key, absExpr, sldExpr);
}

if (results.Length >= 3 && results[2].HasValue)
if (results.Length >= 3 && !results[2].IsNull)
{
return results[2];
}
Expand Down Expand Up @@ -436,7 +436,7 @@ private void TryRegisterProfiler(IConnectionMultiplexer connection)
await RefreshAsync(cache, key, absExpr, sldExpr, token).ConfigureAwait(false);
}

if (results.Length >= 3 && results[2].HasValue)
if (results.Length >= 3 && !results[2].IsNull)
{
return results[2];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Extensions.Caching.Distributed;
using Xunit;

Expand Down Expand Up @@ -95,4 +98,82 @@ public void SetNullValueThrows()

Assert.Throws<ArgumentNullException>(() => cache.Set(key, value));
}

[Fact(Skip = SkipReason)]
public void SetGetEmptyNonNullBuffer()
{
var cache = RedisTestConfig.CreateCacheInstance(GetType().Name);
var key = Me();
cache.Remove(key); // known state
Assert.Null(cache.Get(key)); // expect null

cache.Set(key, Array.Empty<byte>());
var arr = cache.Get(key);
Assert.NotNull(arr);
Assert.Empty(arr);
}

[Fact(Skip = SkipReason)]
public async Task SetGetEmptyNonNullBufferAsync()
{
var cache = RedisTestConfig.CreateCacheInstance(GetType().Name);
var key = Me();
await cache.RemoveAsync(key); // known state
Assert.Null(await cache.GetAsync(key)); // expect null

await cache.SetAsync(key, Array.Empty<byte>());
var arr = await cache.GetAsync(key);
Assert.NotNull(arr);
Assert.Empty(arr);
}

[Theory(Skip = SkipReason)]
[InlineData("")]
[InlineData(" ")]
[InlineData("abc")]
public void SetGetNonNullString(string payload)
{
var cache = RedisTestConfig.CreateCacheInstance(GetType().Name);
var key = Me();
cache.Remove(key); // known state
Assert.Null(cache.Get(key)); // expect null
cache.SetString(key, payload);

// check raw bytes
var raw = cache.Get(key);
Assert.Equal(Hex(payload), Hex(raw));

// check via string API
var value = cache.GetString(key);
Assert.NotNull(value);
Assert.Equal(payload, value);
}

[Theory(Skip = SkipReason)]
[InlineData("")]
[InlineData(" ")]
[InlineData("abc")]
[InlineData("abc def ghi jkl mno pqr stu vwx yz!")]
public async Task SetGetNonNullStringAsync(string payload)
{
var cache = RedisTestConfig.CreateCacheInstance(GetType().Name);
var key = Me();
await cache.RemoveAsync(key); // known state
Assert.Null(await cache.GetAsync(key)); // expect null
await cache.SetStringAsync(key, payload);

// check raw bytes
var raw = await cache.GetAsync(key);
Assert.Equal(Hex(payload), Hex(raw));

// check via string API
var value = await cache.GetStringAsync(key);
Assert.NotNull(value);
Assert.Equal(payload, value);
}

static string Hex(byte[] value) => BitConverter.ToString(value);
static string Hex(string value) => Hex(Encoding.UTF8.GetBytes(value));

private static string Me([CallerMemberName] string caller = "") => caller;
}