Skip to content

fix #156

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
merged 2 commits into from
Mar 18, 2024
Merged

fix #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
688d527
修复 dns cache 并发问题;断点下载路径包含不存在文件夹问题
huberyxxiao Mar 18, 2024
d110b73
Merge branch 'dev/dev_fix(upload)' into 'master' (merge request !32)
huberyxxiao Mar 18, 2024
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
2 changes: 1 addition & 1 deletion include/util/lru_cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class LruCache {
m_entry_map[key] = m_entry_list.begin();
}

const ValueType& Get(const KeyType& key) {
const ValueType Get(const KeyType& key) {
std::lock_guard<std::mutex> lock(m_mutex);
auto it = m_entry_map.find(key);
if (it == m_entry_map.end()) {
Expand Down
4 changes: 1 addition & 3 deletions src/op/object_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2003,9 +2003,7 @@ CosResult ObjectOp::ResumableGetObject(const GetObjectByFileReq& req,
return head_result;
}

std::string dir_name = FileUtil::GetDirectory(req.GetLocalFilePath());
std::string resumable_task_json_file =
dir_name + "/" + req.GetObjectName() + kResumableDownloadTaskFileSuffix;
std::string resumable_task_json_file = req.GetLocalFilePath() + kResumableDownloadTaskFileSuffix;

std::map<std::string, std::string> resume_task_check_element = {
{kResumableDownloadTaskLastModified, head_resp.GetLastModified()},
Expand Down