Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ea341b8e
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,发现更多精彩内容 >>
提交
ea341b8e
编写于
10月 07, 2011
作者:
S
Santiago Pastorino
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3243 from mjtko/connection-pool-thread-fix
QueryCache/ConnectionPool thread fix (was #1670)
上级
3088d236
f41b58d3
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
13 addition
and
3 deletion
+13
-3
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
...ve_record/connection_adapters/abstract/connection_pool.rb
+1
-1
activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
.../connection_adapters/abstract/connection_specification.rb
+8
-0
activerecord/lib/active_record/query_cache.rb
activerecord/lib/active_record/query_cache.rb
+4
-2
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
浏览文件 @
ea341b8e
...
...
@@ -314,7 +314,7 @@ def new_connection
end
def
current_connection_id
#:nodoc:
Thread
.
current
.
object_id
ActiveRecord
::
Base
.
connection_id
||=
Thread
.
current
.
object_id
end
def
checkout_new_connection
...
...
activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
浏览文件 @
ea341b8e
...
...
@@ -115,6 +115,14 @@ def connection
retrieve_connection
end
def
connection_id
Thread
.
current
[
'ActiveRecord::Base.connection_id'
]
end
def
connection_id
=
(
connection_id
)
Thread
.
current
[
'ActiveRecord::Base.connection_id'
]
=
connection_id
end
# Returns the configuration of the associated connection as a hash:
#
# ActiveRecord::Base.connection_config
...
...
activerecord/lib/active_record/query_cache.rb
浏览文件 @
ea341b8e
...
...
@@ -28,9 +28,10 @@ def initialize(app)
end
class
BodyProxy
# :nodoc:
def
initialize
(
original_cache_value
,
target
)
def
initialize
(
original_cache_value
,
target
,
connection_id
)
@original_cache_value
=
original_cache_value
@target
=
target
@connection_id
=
connection_id
end
def
method_missing
(
method_sym
,
*
arguments
,
&
block
)
...
...
@@ -48,6 +49,7 @@ def each(&block)
def
close
@target
.
close
if
@target
.
respond_to?
(
:close
)
ensure
ActiveRecord
::
Base
.
connection_id
=
@connection_id
ActiveRecord
::
Base
.
connection
.
clear_query_cache
unless
@original_cache_value
ActiveRecord
::
Base
.
connection
.
disable_query_cache!
...
...
@@ -60,7 +62,7 @@ def call(env)
ActiveRecord
::
Base
.
connection
.
enable_query_cache!
status
,
headers
,
body
=
@app
.
call
(
env
)
[
status
,
headers
,
BodyProxy
.
new
(
old
,
body
)]
[
status
,
headers
,
BodyProxy
.
new
(
old
,
body
,
ActiveRecord
::
Base
.
connection_id
)]
rescue
Exception
=>
e
ActiveRecord
::
Base
.
connection
.
clear_query_cache
unless
old
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录