Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
94d9e335
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
94d9e335
编写于
6月 21, 2019
作者:
D
Douglas Barbosa Alexandre
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Include the GitLab version in the cache key for Gitlab::JsonCache
上级
d0a921b4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
23 deletion
+49
-23
lib/gitlab/json_cache.rb
lib/gitlab/json_cache.rb
+2
-2
spec/lib/gitlab/json_cache_spec.rb
spec/lib/gitlab/json_cache_spec.rb
+47
-21
未找到文件。
lib/gitlab/json_cache.rb
浏览文件 @
94d9e335
...
...
@@ -22,10 +22,10 @@ module Gitlab
expanded_cache_key
=
[
namespace
,
key
].
compact
if
cache_key_with_version
expanded_cache_key
<<
Rails
.
version
expanded_cache_key
<<
[
Gitlab
::
VERSION
,
Rails
.
version
]
end
expanded_cache_key
.
join
(
':'
)
expanded_cache_key
.
flatten
.
join
(
':'
).
freeze
end
def
expire
(
key
)
...
...
spec/lib/gitlab/json_cache_spec.rb
浏览文件 @
94d9e335
...
...
@@ -6,7 +6,7 @@ describe Gitlab::JsonCache do
let
(
:backend
)
{
double
(
'backend'
).
as_null_object
}
let
(
:namespace
)
{
'geo'
}
let
(
:key
)
{
'foo'
}
let
(
:expanded_key
)
{
"
#{
namespace
}
:
#{
key
}
:
#{
Rails
.
version
}
"
}
let
(
:expanded_key
)
{
"
#{
namespace
}
:
#{
key
}
:
#{
Gitlab
::
VERSION
}
:
#{
Rails
.
version
}
"
}
set
(
:broadcast_message
)
{
create
(
:broadcast_message
)
}
subject
(
:cache
)
{
described_class
.
new
(
namespace:
namespace
,
backend:
backend
)
}
...
...
@@ -35,42 +35,68 @@ describe Gitlab::JsonCache do
describe
'#cache_key'
do
context
'when namespace is not defined'
do
it
'expands out the key with Rails version'
do
cache
=
described_class
.
new
(
cache_key_with_version:
true
)
context
'when cache_key_with_version is true'
do
it
'expands out the key with GitLab, and Rails versions'
do
cache
=
described_class
.
new
(
cache_key_with_version:
true
)
cache_key
=
cache
.
cache_key
(
key
)
cache_key
=
cache
.
cache_key
(
key
)
expect
(
cache_key
).
to
eq
(
"
#{
key
}
:
#{
Rails
.
version
}
"
)
expect
(
cache_key
).
to
eq
(
"
#{
key
}
:
#{
Gitlab
::
VERSION
}
:
#{
Rails
.
version
}
"
)
end
end
end
context
'when cache_key_with_version is tru
e'
do
it
'expands out the key with namespace and Rails version
'
do
cache
=
described_class
.
new
(
namespace:
namespace
,
cache_key_with_version:
tru
e
)
context
'when cache_key_with_version is fals
e'
do
it
'returns the key
'
do
cache
=
described_class
.
new
(
namespace:
nil
,
cache_key_with_version:
fals
e
)
cache_key
=
cache
.
cache_key
(
key
)
cache_key
=
cache
.
cache_key
(
key
)
expect
(
cache_key
).
to
eq
(
"
#{
namespace
}
:
#{
key
}
:
#{
Rails
.
version
}
"
)
expect
(
cache_key
).
to
eq
(
key
)
end
end
end
context
'when cache_key_with_version is false'
do
it
'expands out the key with namespace'
do
cache
=
described_class
.
new
(
namespace:
namespace
,
cache_key_with_version:
false
)
context
'when namespace is nil'
do
context
'when cache_key_with_version is true'
do
it
'expands out the key with GitLab, and Rails versions'
do
cache
=
described_class
.
new
(
cache_key_with_version:
true
)
cache_key
=
cache
.
cache_key
(
key
)
cache_key
=
cache
.
cache_key
(
key
)
expect
(
cache_key
).
to
eq
(
"
#{
namespace
}
:
#{
key
}
"
)
expect
(
cache_key
).
to
eq
(
"
#{
key
}
:
#{
Gitlab
::
VERSION
}
:
#{
Rails
.
version
}
"
)
end
end
context
'when cache_key_with_version is false'
do
it
'returns the key'
do
cache
=
described_class
.
new
(
namespace:
nil
,
cache_key_with_version:
false
)
cache_key
=
cache
.
cache_key
(
key
)
expect
(
cache_key
).
to
eq
(
key
)
end
end
end
context
'when namespace is nil, and cache_key_with_version is false'
do
it
'returns the key'
do
cache
=
described_class
.
new
(
namespace:
nil
,
cache_key_with_version:
false
)
context
'when namespace is set'
do
context
'when cache_key_with_version is true'
do
it
'expands out the key with namespace and Rails version'
do
cache
=
described_class
.
new
(
namespace:
namespace
,
cache_key_with_version:
true
)
cache_key
=
cache
.
cache_key
(
key
)
cache_key
=
cache
.
cache_key
(
key
)
expect
(
cache_key
).
to
eq
(
"
#{
namespace
}
:
#{
key
}
:
#{
Gitlab
::
VERSION
}
:
#{
Rails
.
version
}
"
)
end
end
expect
(
cache_key
).
to
eq
(
key
)
context
'when cache_key_with_version is false'
do
it
'expands out the key with namespace'
do
cache
=
described_class
.
new
(
namespace:
namespace
,
cache_key_with_version:
false
)
cache_key
=
cache
.
cache_key
(
key
)
expect
(
cache_key
).
to
eq
(
"
#{
namespace
}
:
#{
key
}
"
)
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录