Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8a1c3b6e
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 搜索 >>
提交
8a1c3b6e
编写于
11月 25, 2019
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
33c89fa9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
1 deletion
+30
-1
app/finders/projects_finder.rb
app/finders/projects_finder.rb
+25
-1
changelogs/unreleased/projects_finder_visibility_optimization.yml
...gs/unreleased/projects_finder_visibility_optimization.yml
+5
-0
未找到文件。
app/finders/projects_finder.rb
浏览文件 @
8a1c3b6e
...
...
@@ -79,7 +79,7 @@ class ProjectsFinder < UnionFinder
elsif
min_access_level?
current_user
.
authorized_projects
(
params
[
:min_access_level
])
else
if
private_only?
if
private_only?
||
impossible_visibility_level?
current_user
.
authorized_projects
else
Project
.
public_or_visible_to_user
(
current_user
)
...
...
@@ -96,6 +96,30 @@ class ProjectsFinder < UnionFinder
end
end
# This is an optimization - surprisingly PostgreSQL does not optimize
# for this.
#
# If the default visiblity level and desired visiblity level filter cancels
# each other out, don't use the SQL clause for visibility level in
# `Project.public_or_visible_to_user`. In fact, this then becames equivalent
# to just authorized projects for the user.
#
# E.g.
# (EXISTS(<authorized_projects>) OR projects.visibility_level IN (10,20))
# AND "projects"."visibility_level" = 0
#
# is essentially
# EXISTS(<authorized_projects>) AND "projects"."visibility_level" = 0
#
# See https://gitlab.com/gitlab-org/gitlab/issues/37007
def
impossible_visibility_level?
return
unless
params
[
:visibility_level
].
present?
public_visibility_levels
=
Gitlab
::
VisibilityLevel
.
levels_for_user
(
current_user
)
!
public_visibility_levels
.
include?
(
params
[
:visibility_level
])
end
def
owned_projects?
params
[
:owned
].
present?
end
...
...
changelogs/unreleased/projects_finder_visibility_optimization.yml
0 → 100644
浏览文件 @
8a1c3b6e
---
title
:
Optimize query when Projects API requests private visibility level
merge_request
:
20594
author
:
type
:
performance
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录