Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b6a530c9
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,发现更多精彩内容 >>
未验证
提交
b6a530c9
编写于
10月 28, 2018
作者:
A
Andreas Brandl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify to use models instead of tables.
上级
f2ec9d2d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
25 deletion
+25
-25
lib/gitlab/database/count.rb
lib/gitlab/database/count.rb
+23
-23
spec/lib/gitlab/database/count_spec.rb
spec/lib/gitlab/database/count_spec.rb
+2
-2
未找到文件。
lib/gitlab/database/count.rb
浏览文件 @
b6a530c9
...
...
@@ -26,24 +26,17 @@ module Gitlab
# @param [Array]
# @return [Hash] of Model -> count mapping
def
self
.
approximate_counts
(
models
)
table_to_model_map
=
models
.
each_with_object
({})
do
|
model
,
hash
|
hash
[
model
.
table_name
]
=
model
end
table_names
=
table_to_model_map
.
keys
counts_by_table_name
=
Gitlab
::
Database
.
postgresql?
?
reltuples_from_recently_updated
(
table_names
)
:
{}
counts_by_model
=
{}
# Convert table -> count to Model -> count
counts_by_model
=
counts_by_table_name
.
each_with_object
({})
do
|
pair
,
hash
|
model
=
table_to_model_map
[
pair
.
first
]
hash
[
model
]
=
pair
.
second
if
Gitlab
::
Database
.
postgresql?
#counts_by_model = ReltuplesCountStrategy.new(models).count
counts_by_model
=
reltuples_from_recently_updated
(
models
)
end
missing_
tables
=
table_names
-
counts_by_table_name
.
keys
missing_
models
=
models
-
counts_by_model
.
keys
missing_tables
.
each
do
|
table
|
model
=
table_to_model_map
[
table
]
counts_by_model
[
model
]
=
model
.
count
ExactCountStrategy
.
new
(
missing_models
).
count
.
each
do
|
model
,
count
|
counts_by_model
[
model
]
=
count
end
counts_by_model
...
...
@@ -51,10 +44,10 @@ module Gitlab
# Returns a hash of the table names that have recently updated tuples.
#
# @param [Array]
table names
# @param [Array]
models to count
# @returns [Hash] Table name to count mapping (e.g. { 'projects' => 5, 'users' => 100 })
def
self
.
reltuples_from_recently_updated
(
table_name
s
)
ReltuplesCountStrategy
.
new
(
table_name
s
).
count
def
self
.
reltuples_from_recently_updated
(
model
s
)
ReltuplesCountStrategy
.
new
(
model
s
).
count
end
class
ExactCountStrategy
...
...
@@ -71,11 +64,9 @@ module Gitlab
end
class
ReltuplesCountStrategy
attr_reader
:table_names
# @param [Array] table names
def
initialize
(
table_names
)
@table_names
=
table_names
attr_reader
:models
def
initialize
(
models
)
@models
=
models
end
# Returns a hash of the table names that have recently updated tuples.
...
...
@@ -91,13 +82,22 @@ module Gitlab
rows
=
ActiveRecord
::
Base
.
connection
.
select_all
(
query
)
end
rows
.
each_with_object
({})
{
|
row
,
data
|
data
[
row
[
'table_name'
]]
=
row
[
'estimate'
].
to_i
}
table_to_model
=
models
.
each_with_object
({})
{
|
model
,
h
|
h
[
model
.
table_name
]
=
model
}
rows
.
each_with_object
({})
do
|
row
,
data
|
model
=
table_to_model
[
row
[
'table_name'
]]
data
[
model
]
=
row
[
'estimate'
].
to_i
end
rescue
*
CONNECTION_ERRORS
=>
e
{}
end
private
def
table_names
models
.
map
(
&
:table_name
)
end
# Generates the PostgreSQL query to return the tuples for tables
# that have been vacuumed or analyzed in the last hour.
#
...
...
spec/lib/gitlab/database/count_spec.rb
浏览文件 @
b6a530c9
...
...
@@ -25,7 +25,7 @@ describe Gitlab::Database::Count do
context
'with PostgreSQL'
,
:postgresql
do
describe
'when reltuples have not been updated'
do
it
'counts all models the normal way'
do
expect
(
described_class
).
to
receive
(
:reltuples_from_recently_updated
).
with
(
%w(projects identities)
).
and_return
({})
expect
(
described_class
).
to
receive
(
:reltuples_from_recently_updated
).
with
(
models
).
and_return
({})
expect
(
Project
).
to
receive
(
:count
).
and_call_original
expect
(
Identity
).
to
receive
(
:count
).
and_call_original
...
...
@@ -45,7 +45,7 @@ describe Gitlab::Database::Count do
describe
'when some reltuples have been updated'
do
it
'counts projects in the fast way'
do
expect
(
described_class
).
to
receive
(
:reltuples_from_recently_updated
).
with
(
%w(projects identities)
).
and_return
({
'projects'
=>
3
})
expect
(
described_class
).
to
receive
(
:reltuples_from_recently_updated
).
with
(
models
).
and_return
({
Project
=>
3
})
expect
(
Project
).
not_to
receive
(
:count
).
and_call_original
expect
(
Identity
).
to
receive
(
:count
).
and_call_original
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录