Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
b4aae5a8
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b4aae5a8
编写于
9月 23, 2013
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix variable names and speed up relation ordering
上级
e5299c1e
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
12 addition
and
16 deletion
+12
-16
activerecord/lib/active_record/associations/preloader/association.rb
...d/lib/active_record/associations/preloader/association.rb
+1
-9
activerecord/lib/active_record/associations/preloader/through_association.rb
...tive_record/associations/preloader/through_association.rb
+11
-7
未找到文件。
activerecord/lib/active_record/associations/preloader/association.rb
浏览文件 @
b4aae5a8
...
@@ -72,17 +72,9 @@ def options
...
@@ -72,17 +72,9 @@ def options
reflection
.
options
reflection
.
options
end
end
def
preloaded_records1
associated_records_by_owner
.
values
.
flatten
end
def
preloaded_records
def
preloaded_records
if
owners
.
first
.
association
(
reflection
.
name
).
loaded?
[]
else
associated_records_by_owner
.
values
.
flatten
associated_records_by_owner
.
values
.
flatten
end
end
end
def
loaded?
def
loaded?
@loaded
@loaded
...
...
activerecord/lib/active_record/associations/preloader/through_association.rb
浏览文件 @
b4aae5a8
...
@@ -27,7 +27,7 @@ def associated_records_by_owner
...
@@ -27,7 +27,7 @@ def associated_records_by_owner
through_records
=
owners
.
map
do
|
owner
,
h
|
through_records
=
owners
.
map
do
|
owner
,
h
|
association
=
owner
.
association
through_reflection
.
name
association
=
owner
.
association
through_reflection
.
name
x
=
[
owner
,
Array
(
association
.
reader
)
,
association
]
x
=
[
owner
,
Array
(
association
.
reader
)]
# Dont cache the association - we would only be caching a subset
# Dont cache the association - we would only be caching a subset
association
.
reset
if
should_reset
association
.
reset
if
should_reset
...
@@ -35,7 +35,7 @@ def associated_records_by_owner
...
@@ -35,7 +35,7 @@ def associated_records_by_owner
x
x
end
end
middle_records
=
through_records
.
map
{
|
rec
|
rec
[
1
]
}.
flatten
middle_records
=
through_records
.
map
{
|
(
_
,
rec
)
|
rec
}.
flatten
preloader
=
Preloader
.
new
(
middle_records
,
preloader
=
Preloader
.
new
(
middle_records
,
source_reflection
.
name
,
source_reflection
.
name
,
...
@@ -49,17 +49,21 @@ def associated_records_by_owner
...
@@ -49,17 +49,21 @@ def associated_records_by_owner
}
}
end
end
@associated_records_by_owner
=
through_records
.
each_with_object
({})
{
|
(
lhs
,
middles
,
assoc
),
h
|
@associated_records_by_owner
=
through_records
.
each_with_object
({})
{
|
(
lhs
,
middles
),
h
|
x
=
middle_to_pl
[
middles
.
first
]
preloader
=
middle_to_pl
[
middles
.
first
]
rhs_records
=
middles
.
flat_map
{
|
r
|
rhs_records
=
middles
.
flat_map
{
|
r
|
r
.
send
(
source_reflection
.
name
)
r
.
send
(
source_reflection
.
name
)
}.
compact
}.
compact
if
x
&&
x
.
loaded?
if
preloader
&&
preloader
.
loaded?
rs
=
rhs_records
.
sort_by
{
|
rhs
|
loaded_records
=
preloader
.
preloaded_records
x
.
preloaded_records1
.
index
(
rhs
)
i
=
0
record_index
=
loaded_records
.
each_with_object
({})
{
|
r
,
indexes
|
indexes
[
r
]
=
i
i
+=
1
}
}
rs
=
rhs_records
.
sort_by
{
|
rhs
|
record_index
[
rhs
]
}
else
else
rs
=
rhs_records
rs
=
rhs_records
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录