Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
86938c49
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,发现更多精彩内容 >>
未验证
提交
86938c49
编写于
11月 06, 2017
作者:
G
George Claghorn
提交者:
GitHub
11月 06, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix streaming downloads from S3/Azure Storage
Closes #31073.
上级
3f1695bb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
7 deletion
+17
-7
activestorage/lib/active_storage/service/azure_storage_service.rb
...orage/lib/active_storage/service/azure_storage_service.rb
+4
-4
activestorage/lib/active_storage/service/s3_service.rb
activestorage/lib/active_storage/service/s3_service.rb
+3
-3
activestorage/test/service/shared_service_tests.rb
activestorage/test/service/shared_service_tests.rb
+10
-0
未找到文件。
activestorage/lib/active_storage/service/azure_storage_service.rb
浏览文件 @
86938c49
...
...
@@ -28,7 +28,7 @@ def upload(key, io, checksum: nil)
end
end
def
download
(
key
)
def
download
(
key
,
&
block
)
if
block_given?
instrument
:streaming_download
,
key
do
stream
(
key
,
&
block
)
...
...
@@ -108,15 +108,15 @@ def format_expiry(expires_in)
end
# Reads the object for the given key in chunks, yielding each to the block.
def
stream
(
key
,
options
=
{},
&
block
)
def
stream
(
key
)
blob
=
blob_for
(
key
)
chunk_size
=
5
.
megabytes
offset
=
0
while
offset
<
blob
.
properties
[
:content_length
]
_
,
io
=
blobs
.
get_blob
(
container
,
key
,
start_range:
offset
,
end_range:
offset
+
chunk_size
-
1
)
yield
io
_
,
chunk
=
blobs
.
get_blob
(
container
,
key
,
start_range:
offset
,
end_range:
offset
+
chunk_size
-
1
)
yield
chunk
.
force_encoding
(
Encoding
::
BINARY
)
offset
+=
chunk_size
end
end
...
...
activestorage/lib/active_storage/service/s3_service.rb
浏览文件 @
86938c49
...
...
@@ -26,7 +26,7 @@ def upload(key, io, checksum: nil)
end
end
def
download
(
key
)
def
download
(
key
,
&
block
)
if
block_given?
instrument
:streaming_download
,
key
do
stream
(
key
,
&
block
)
...
...
@@ -85,14 +85,14 @@ def object_for(key)
end
# Reads the object for the given key in chunks, yielding each to the block.
def
stream
(
key
,
options
=
{},
&
block
)
def
stream
(
key
,
&
block
)
object
=
object_for
(
key
)
chunk_size
=
5
.
megabytes
offset
=
0
while
offset
<
object
.
content_length
yield
object
.
read
(
options
.
merge
(
range:
"bytes=
#{
offset
}
-
#{
offset
+
chunk_size
-
1
}
"
)
)
yield
object
.
get
(
range:
"bytes=
#{
offset
}
-
#{
offset
+
chunk_size
-
1
}
"
).
body
.
read
.
force_encoding
(
Encoding
::
BINARY
)
offset
+=
chunk_size
end
end
...
...
activestorage/test/service/shared_service_tests.rb
浏览文件 @
86938c49
...
...
@@ -50,6 +50,16 @@ module ActiveStorage::Service::SharedServiceTests
assert_equal
FIXTURE_DATA
,
@service
.
download
(
FIXTURE_KEY
)
end
test
"downloading in chunks"
do
chunks
=
[]
@service
.
download
(
FIXTURE_KEY
)
do
|
chunk
|
chunks
<<
chunk
end
assert_equal
[
FIXTURE_DATA
],
chunks
end
test
"existing"
do
assert
@service
.
exist?
(
FIXTURE_KEY
)
assert_not
@service
.
exist?
(
FIXTURE_KEY
+
"nonsense"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录