Skip to content

S3 #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dt3310321 merged 2 commits into from
Jun 20, 2019
Merged

S3 #90

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0aa969
fix copy
dt3310321 Jun 20, 2019
d59f47d
fix copy
dt3310321 Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions qcloud_cos/cos_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2340,7 +2340,10 @@ def _inner_head_object(self, CopySource):
auth=CosS3Auth(self._conf, path, params=params),
headers={},
params=params)
return int(rt.headers['Content-Length'])
storage_class = 'standard'
if 'x-cos-storage-class' in rt.headers:
storage_class = rt.headers['x-cos-storage-class'].lower()
return int(rt.headers['Content-Length']), storage_class

def _upload_part_copy(self, bucket, key, part_number, upload_id, copy_source, copy_source_range, md5_lst):
"""拷贝指定文件至分块上传,记录结果到lst中去
Expand Down Expand Up @@ -2389,13 +2392,18 @@ def copy(self, Bucket, Key, CopySource, CopyStatus='Copy', PartSize=10, MAXThrea
MAXThread=10
)
"""
# 同园区直接走copy_object
if self._check_same_region(self._conf._endpoint, CopySource):
# 先查询下拷贝源object的content-length
file_size, src_storage_class = self._inner_head_object(CopySource)

dst_storage_class = 'standard'
if 'StorageClass' in kwargs:
dst_storage_class = kwargs['StorageClass'].lower()

# 同园区且不改存储类型的情况下直接走copy_object
if self._check_same_region(self._conf._endpoint, CopySource) and src_storage_class == dst_storage_class:
response = self.copy_object(Bucket=Bucket, Key=Key, CopySource=CopySource, CopyStatus=CopyStatus, **kwargs)
return response

# 不同园区查询拷贝源object的content-length
file_size = self._inner_head_object(CopySource)
# 如果源文件大小小于5G，则直接调用copy_object接口
if file_size < SINGLE_UPLOAD_LENGTH:
response = self.copy_object(Bucket=Bucket, Key=Key, CopySource=CopySource, CopyStatus=CopyStatus, **kwargs)
Expand Down