Merge branch 'dev/dev_fix(upload)' into 'master' (merge request !32)

huberyxxiao · huberyxxiao · commit d110b733e075 · 2024-03-18T09:11:45.000Z
修复 dns cache 并发问题;断点下载路径包含不存在文件夹问题
diff --git a/include/util/lru_cache.h b/include/util/lru_cache.h
@@ -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()) {
diff --git a/src/op/object_op.cpp b/src/op/object_op.cpp
@@ -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()},

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class LruCache {`
`33`	`33`	`m_entry_map[key] = m_entry_list.begin();`
`34`	`34`	`}`
`35`	`35`
`36`		`- const ValueType& Get(const KeyType& key) {`
	`36`	`+ const ValueType Get(const KeyType& key) {`
`37`	`37`	`std::lock_guard<std::mutex> lock(m_mutex);`
`38`	`38`	`auto it = m_entry_map.find(key);`
`39`	`39`	`if (it == m_entry_map.end()) {`
Original file line number	Diff line number	Diff line change
`@@ -2003,9 +2003,7 @@ CosResult ObjectOp::ResumableGetObject(const GetObjectByFileReq& req,`
`2003`	`2003`	`return head_result;`
`2004`	`2004`	`}`
`2005`	`2005`
`2006`		`- std::string dir_name = FileUtil::GetDirectory(req.GetLocalFilePath());`
`2007`		`- std::string resumable_task_json_file =`
`2008`		`- dir_name + "/" + req.GetObjectName() + kResumableDownloadTaskFileSuffix;`
	`2006`	`+ std::string resumable_task_json_file = req.GetLocalFilePath() + kResumableDownloadTaskFileSuffix;`
`2009`	`2007`
`2010`	`2008`	`std::map<std::string, std::string> resume_task_check_element = {`
`2011`	`2009`	`{kResumableDownloadTaskLastModified, head_resp.GetLastModified()},`