Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
A
aspnetcore
管理
动态
成员
标记
计划
议题
议题看板
里程碑
Wiki
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
构建
流水线
作业
流水线计划
产物
部署
发布
Package registry
容器镜像库
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
模型实验
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
dotnet
aspnetcore
提交
85a09005
未验证
提交
85a09005
编辑于
3 years ago
作者:
Chris Ross
提交者:
GitHub
3 years ago
浏览文件
操作
下载
补丁
差异文件
Fix RedisCache update that breaks usage against older redis servers (#38927)
上级
e47af40d
No related branches found
No related tags found
无相关合并请求
变更
1
隐藏空白变更内容
行内
左右并排
显示
1 个更改的文件
src/Caching/StackExchangeRedis/src/RedisCache.cs
+43
-5
43 个添加, 5 个删除
src/Caching/StackExchangeRedis/src/RedisCache.cs
有
43 个添加
和
5 个删除
src/Caching/StackExchangeRedis/src/RedisCache.cs
+
43
−
5
浏览文件 @
85a09005
...
...
@@ -16,6 +16,14 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis
/// </summary>
public
class
RedisCache
:
IDistributedCache
,
IDisposable
{
// -- Explanation of why two kinds of SetScript are used --
// * Redis 2.0 had HSET key field value for setting individual hash fields,
// and HMSET key field value [field value ...] for setting multiple hash fields (against the same key).
// * Redis 4.0 added HSET key field value [field value ...] and deprecated HMSET.
//
// On Redis versions that don't have the newer HSET variant, we use SetScriptPreExtendedSetCommand
// which uses the (now deprecated) HMSET.
// KEYS[1] = = key
// ARGV[1] = absolute-expiration - ticks as long (-1 for none)
// ARGV[2] = sliding-expiration - ticks as long (-1 for none)
...
...
@@ -28,14 +36,22 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis
redis.call('EXPIRE', KEYS[1], ARGV[3])
end
return 1"
);
private
const
string
SetScriptPreExtendedSetCommand
=
(
@"
redis.call('HMSET', KEYS[1], 'absexp', ARGV[1], 'sldexp', ARGV[2], 'data', ARGV[4])
if ARGV[3] ~= '-1' then
redis.call('EXPIRE', KEYS[1], ARGV[3])
end
return 1"
);
private
const
string
AbsoluteExpirationKey
=
"absexp"
;
private
const
string
SlidingExpirationKey
=
"sldexp"
;
private
const
string
DataKey
=
"data"
;
private
const
long
NotPresent
=
-
1
;
private
static
readonly
Version
ServerVersionWithExtendedSetCommand
=
new
Version
(
4
,
0
,
0
);
private
volatile
IConnectionMultiplexer
_connection
;
private
IDatabase
_cache
;
private
bool
_disposed
;
private
string
_setScript
=
SetScript
;
private
readonly
RedisCacheOptions
_options
;
private
readonly
string
_instance
;
...
...
@@ -107,7 +123,7 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis
var
absoluteExpiration
=
GetAbsoluteExpiration
(
creationTime
,
options
);
var
result
=
_cache
.
ScriptEvaluate
(
S
etScript
,
new
RedisKey
[]
{
_instance
+
key
},
var
result
=
_cache
.
ScriptEvaluate
(
_s
etScript
,
new
RedisKey
[]
{
_instance
+
key
},
new
RedisValue
[]
{
absoluteExpiration
?.
Ticks
??
NotPresent
,
...
...
@@ -143,7 +159,7 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis
var
absoluteExpiration
=
GetAbsoluteExpiration
(
creationTime
,
options
);
await
_cache
.
ScriptEvaluateAsync
(
S
etScript
,
new
RedisKey
[]
{
_instance
+
key
},
await
_cache
.
ScriptEvaluateAsync
(
_s
etScript
,
new
RedisKey
[]
{
_instance
+
key
},
new
RedisValue
[]
{
absoluteExpiration
?.
Ticks
??
NotPresent
,
...
...
@@ -206,7 +222,7 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis
_connection
=
_options
.
ConnectionMultiplexerFactory
().
GetAwaiter
().
GetResult
();
}
TryRegisterProfiler
();
PrepareConnection
();
_cache
=
_connection
.
GetDatabase
();
}
}
...
...
@@ -247,7 +263,7 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis
_connection
=
await
_options
.
ConnectionMultiplexerFactory
();
}
TryRegisterProfiler
();
PrepareConnection
();
_cache
=
_connection
.
GetDatabase
();
}
}
...
...
@@ -257,9 +273,31 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis
}
}
private
void
PrepareConnection
()
{
ValidateServerFeatures
();
TryRegisterProfiler
();
}
private
void
ValidateServerFeatures
()
{
_
=
_connection
??
throw
new
InvalidOperationException
(
$"
{
nameof
(
_connection
)}
cannot be null."
);
foreach
(
var
endPoint
in
_connection
.
GetEndPoints
())
{
if
(
_connection
.
GetServer
(
endPoint
).
Version
<
ServerVersionWithExtendedSetCommand
)
{
_setScript
=
SetScriptPreExtendedSetCommand
;
return
;
}
}
}
private
void
TryRegisterProfiler
()
{
if
(
_connection
!=
null
&&
_options
.
ProfilingSession
!=
null
)
_
=
_connection
??
throw
new
InvalidOperationException
(
$"
{
nameof
(
_connection
)}
cannot be null."
);
if
(
_options
.
ProfilingSession
!=
null
)
{
_connection
.
RegisterProfiler
(
_options
.
ProfilingSession
);
}
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录