Skip to content

Commit 655e562

Browse files
huberyxxiaohuberyxxiao
committed
Merge branch 'dev/cos_ut' into 'master' (merge request !38)
dev/cos_ut
2 parents f7e8c3b + 2b96a6d commit 655e562

File tree

7 files changed

+149
-139
lines changed

7 files changed

+149
-139
lines changed

‎.code.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2022050909
2+
3+
source:
4+
5+
test_source:
6+
filepath_regex: ["unittest/.*", "unittest/src/.*"]
7+
8+
third_party_source:
9+
# 填写相对路径的正则表达式(相对于代码库根目录)，要求匹配到文件层级。
10+
filepath_regex: ["include/rapidxml/1.13/.*"]

‎include/cos_defines.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
namespace qcloud_cos {
1313

14-
#define COS_CPP_SDK_VERSON "v5.5.11"
14+
#define COS_CPP_SDK_VERSON "v5.5.12"
1515

1616
/// 路径分隔符
17-
const std::string kPathDelimiter = "/";
17+
const char kPathDelimiter[] = "/";
1818
/// 路径分隔符
1919
const unsigned char kPathDelimiterChar = '/';
2020

‎include/cos_params.h‎

Lines changed: 129 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@
66
namespace qcloud_cos{
77

88
/// http header中的Authorization字段
9-
const std::string kHttpHeaderAuthorization = "Authorization";
9+
const char kHttpHeaderAuthorizatio[] = "Authorization";
1010
//const std::string kParaCustomHeaders = "custom_headers";
11-
const std::string kHttpHeaderCacheControl = "Cache-Control";
12-
const std::string kHttpHeaderContentType = "Content-Type";
13-
const std::string kHttpHeaderContentLength = "Content-Length";
14-
const std::string kHttpHeaderContentDisposition = "Content-Disposition";
15-
const std::string kHttpHeaderContentLanguage = "Content-Language";
16-
const std::string kHttpHeaderContentEncoding = "Content-Encoding";
17-
const std::string kHttpHeaderContentRange = "Content-Range";
18-
const std::string kHttpHeaderExpires = "Expires";
19-
const std::string kHttpHeaderLastModified = "Last-Modified";
20-
const std::string kHttpHeaderConnection = "Connection";
21-
const std::string kHttpHeaderDate = "Date";
22-
const std::string kHttpHeaderServer = "Server";
23-
const std::string kHttpHeaderEtag = "ETag";
24-
const std::string kHttpHeaderLowerCaseEtag = "Etag";
25-
26-
const std::string kParaXCosMetaPrefix = "x-cos-meta-";
27-
28-
const std::string kParaMoveDstFileid = "dest_fileid";
29-
const std::string kParaMoveOverWrite = "to_over_write";
30-
31-
const std::string kParaListNum = "num";
32-
const std::string kParaListFlag = "list_flag";
33-
const std::string kParaListContext = "context";
11+
const char kHttpHeaderCacheControl[] = "Cache-Control";
12+
const char kHttpHeaderContentType[] = "Content-Type";
13+
const char kHttpHeaderContentLength[] = "Content-Length";
14+
const char kHttpHeaderContentDisposition[] = "Content-Disposition";
15+
const char kHttpHeaderContentLanguage[] = "Content-Language";
16+
const char kHttpHeaderContentEncoding[] = "Content-Encoding";
17+
const char kHttpHeaderContentRange[] = "Content-Range";
18+
const char kHttpHeaderExpires[] = "Expires";
19+
const char kHttpHeaderLastModified[] = "Last-Modified";
20+
const char kHttpHeaderConnection[] = "Connection";
21+
const char kHttpHeaderDate[] = "Date";
22+
const char kHttpHeaderServer[] = "Server";
23+
const char kHttpHeaderEtag[] = "ETag";
24+
const char kHttpHeaderLowerCaseEtag[] = "Etag";
25+
26+
const char kParaXCosMetaPrefix[] = "x-cos-meta-";
27+
28+
const char kParaMoveDstFileid[] = "dest_fileid";
29+
const char kParaMoveOverWrite[] = "to_over_write";
30+
31+
const char kParaListNum[] = "num";
32+
const char kParaListFlag[] = "list_flag";
33+
const char kParaListContext[] = "context";
3434

3535
// const std::string kParaErrorDesc = "parameter error";
3636
// const std::string kNetworkErrorDesc = "network error";
@@ -39,137 +39,137 @@ const std::string kParaListContext = "context";
3939
// const std::string kCanNotOpRootPath = "can not operator root folder";
4040

4141
// x-cos-meta-前缀
42-
const std::string kXCosMetaPrefix = "x-cos-meta-";
42+
const char kXCosMetaPrefix[] = "x-cos-meta-";
4343

4444
// Request Header
45-
const std::string kReqHeaderEtag = "ETag";
46-
const std::string kReqHeaderLowerCaseEtag = "Etag";
47-
const std::string kReqHeaderContentLen = "Content-Length";
48-
const std::string kReqHeaderContentType = "Content-Type";
49-
const std::string kReqHeaderConnection = "Connection";
50-
const std::string kReqHeaderDate = "Date";
51-
const std::string kReqHeaderServer = "Server";
52-
const std::string kReqHeaderXCosReqId = "x-cos-request-id";
53-
const std::string kReqHeaderXCosTraceId = "x-cos-trace-id";
45+
const char kReqHeaderEtag[] = "ETag";
46+
const char kReqHeaderLowerCaseEtag[] = "Etag";
47+
const char kReqHeaderContentLen[] = "Content-Length";
48+
const char kReqHeaderContentType[] = "Content-Type";
49+
const char kReqHeaderConnection[] = "Connection";
50+
const char kReqHeaderDate[] = "Date";
51+
const char kReqHeaderServer[] = "Server";
52+
const char kReqHeaderXCosReqId[] = "x-cos-request-id";
53+
const char kReqHeaderXCosTraceId[] = "x-cos-trace-id";
5454

5555
// Response Header
56-
const std::string kRespHeaderLastModified = "Last-Modified";
57-
const std::string kRespHeaderXCosObjectType = "x-cos-object-type";
58-
const std::string kRespHeaderXCosStorageClass = "x-cos-storage-class";
59-
const std::string kRespHeaderXCosHashCrc64Ecma = "x-cos-hash-crc64ecma";
60-
const std::string kRespHeaderXCosStorageTier = "x-cos-storage-tier";
61-
const std::string kRespHeaderXCosReqId = "x-cos-request-id";
62-
const std::string kRespHeaderXCosTraceId = "x-cos-trace-id";
63-
const std::string kRespHeaderXCosNextAppendPosition = "x-cos-next-append-position";
64-
const std::string kRespHeaderXCosContentSha1 = "x-cos-content-sha1";
65-
const std::string kRespHeaderXCosTaggingCount = "x-cos-tagging-count";
56+
const char kRespHeaderLastModified[] = "Last-Modified";
57+
const char kRespHeaderXCosObjectType[] = "x-cos-object-type";
58+
const char kRespHeaderXCosStorageClass[] = "x-cos-storage-class";
59+
const char kRespHeaderXCosHashCrc64Ecma[] = "x-cos-hash-crc64ecma";
60+
const char kRespHeaderXCosStorageTier[] = "x-cos-storage-tier";
61+
const char kRespHeaderXCosReqId[] = "x-cos-request-id";
62+
const char kRespHeaderXCosTraceId[] = "x-cos-trace-id";
63+
const char kRespHeaderXCosNextAppendPosition[] = "x-cos-next-append-position";
64+
const char kRespHeaderXCosContentSha1[] = "x-cos-content-sha1";
65+
const char kRespHeaderXCosTaggingCount[] = "x-cos-tagging-count";
6666

6767
// doc preview response header
68-
const std::string kRespHeaderXTotalPage = "X-Total-Page";
69-
const std::string kRespHeaderXErrNo = "X-ErrNo";
70-
const std::string kRespHeaderXTotalSheet = "X-Total-Sheet";
71-
const std::string kRespHeaderXSheetName = "X-Sheet-Name";
68+
const char kRespHeaderXTotalPage[] = "X-Total-Page";
69+
const char kRespHeaderXErrNo[] = "X-ErrNo";
70+
const char kRespHeaderXTotalSheet[] = "X-Total-Sheet";
71+
const char kRespHeaderXSheetName[] = "X-Sheet-Name";
7272

7373

7474
// V5 返回错误信息的xml node名
75-
const std::string kErrorRoot = "Error";
76-
const std::string kErrorCode = "Code";
77-
const std::string kErrorMessage = "Message";
78-
const std::string kErrorResource = "Resource";
79-
const std::string kErrorTraceId = "TraceId";
80-
const std::string kErrorRequestId = "RequestId";
81-
const std::string kErrorServerTime = "ServerTime";
75+
const char kErrorRoot[] = "Error";
76+
const char kErrorCode[] = "Code";
77+
const char kErrorMessage[] = "Message";
78+
const char kErrorResource[] = "Resource";
79+
const char kErrorTraceId[] = "TraceId";
80+
const char kErrorRequestId[] = "RequestId";
81+
const char kErrorServerTime[] = "ServerTime";
8282

8383
// GetBucketResponse XML node
84-
const std::string kGetBucketRoot = "ListBucketResult";
85-
const std::string kGetBucketName = "Name";
86-
const std::string kGetBucketDelimiter = "Delimiter";
87-
const std::string kGetBucketEncodingType = "EncodingType";
88-
const std::string kGetBucketNextMarker = "NextMarker";
89-
const std::string kGetBucketPrefix = "Prefix";
90-
const std::string kGetBucketMarker = "Marker";
91-
const std::string kGetBucketMaxKeys = "MaxKeys";
92-
const std::string kGetBucketIsTruncated = "IsTruncated";
93-
const std::string kGetBucketCommonPrefixes = "CommonPrefixes";
94-
const std::string kGetBucketContents = "Contents";
95-
const std::string kGetBucketContentsKey = "Key";
96-
const std::string kGetBucketContentsLastModified = "LastModified";
97-
const std::string kGetBucketContentsETag = "ETag";
98-
const std::string kGetBucketContentsSize = "Size";
99-
const std::string kGetBucketContentsStorageClass = "StorageClass";
100-
const std::string kGetBucketContentsOwner = "Owner";
101-
const std::string kGetBucketContentsOwnerID = "ID";
84+
const char kGetBucketRoot[] = "ListBucketResult";
85+
const char kGetBucketName[] = "Name";
86+
const char kGetBucketDelimiter[] = "Delimiter";
87+
const char kGetBucketEncodingType[] = "EncodingType";
88+
const char kGetBucketNextMarker[] = "NextMarker";
89+
const char kGetBucketPrefix[] = "Prefix";
90+
const char kGetBucketMarker[] = "Marker";
91+
const char kGetBucketMaxKeys[] = "MaxKeys";
92+
const char kGetBucketIsTruncated[] = "IsTruncated";
93+
const char kGetBucketCommonPrefixes[] = "CommonPrefixes";
94+
const char kGetBucketContents[] = "Contents";
95+
const char kGetBucketContentsKey[] = "Key";
96+
const char kGetBucketContentsLastModified[] = "LastModified";
97+
const char kGetBucketContentsETag[] = "ETag";
98+
const char kGetBucketContentsSize[] = "Size";
99+
const char kGetBucketContentsStorageClass[] = "StorageClass";
100+
const char kGetBucketContentsOwner[] = "Owner";
101+
const char kGetBucketContentsOwnerID[] = "ID";
102102

103103
// ListMultipartUpload XML node
104-
const std::string kListMultipartUploadRoot = "ListMultipartUploadsResult";
105-
const std::string kListMultipartUploadBucket = "Bucket";
106-
const std::string kListMultipartUploadMarker = "KeyMarker";
107-
const std::string kListMultipartUploadIdMarker = "UploadIdMarker";
108-
const std::string kListMultipartUploadNextKeyMarker = "NextKeyMarker";
109-
const std::string kListMultipartUploadNextUploadIdMarker = "NextUploadIdMarker";
110-
const std::string kListMultipartUploadMaxUploads = "MaxUploads";
111-
const std::string kListMultipartUploadUpload = "Upload";
112-
const std::string kListMultipartUploadKey = "Key";
113-
const std::string kListMultipartUploadId = "UploadId";
114-
const std::string kListMultipartUploadStorageClass = "StorageClass";
115-
const std::string kListMultipartUploadInitiator = "Initiator";
116-
const std::string kListMultipartUploadOwner = "Owner";
117-
const std::string kListMultipartUploadInitiated = "Initiated";
118-
const std::string kListMultipartUploadID = "ID";
119-
const std::string kListMultipartUploadDisplayName = "DisplayName";
104+
const char kListMultipartUploadRoot[] = "ListMultipartUploadsResult";
105+
const char kListMultipartUploadBucket[] = "Bucket";
106+
const char kListMultipartUploadMarker[] = "KeyMarker";
107+
const char kListMultipartUploadIdMarker[] = "UploadIdMarker";
108+
const char kListMultipartUploadNextKeyMarker[] = "NextKeyMarker";
109+
const char kListMultipartUploadNextUploadIdMarker[] = "NextUploadIdMarker";
110+
const char kListMultipartUploadMaxUploads[] = "MaxUploads";
111+
const char kListMultipartUploadUpload[] = "Upload";
112+
const char kListMultipartUploadKey[] = "Key";
113+
const char kListMultipartUploadId[] = "UploadId";
114+
const char kListMultipartUploadStorageClass[] = "StorageClass";
115+
const char kListMultipartUploadInitiator[] = "Initiator";
116+
const char kListMultipartUploadOwner[] = "Owner";
117+
const char kListMultipartUploadInitiated[] = "Initiated";
118+
const char kListMultipartUploadID[] = "ID";
119+
const char kListMultipartUploadDisplayName[] = "DisplayName";
120120

121121
// BucketReplicationResponse XML node
122-
const std::string kBucketReplicationRoot = "ReplicationConfiguration";
123-
const std::string kBucketReplicationRule = "Rule";
124-
const std::string kBucketReplicationID = "ID";
125-
const std::string kBucketReplicationRole = "Role";
126-
const std::string kBucketReplicationPrefix = "Prefix";
127-
const std::string kBucketReplicationStatus = "Status";
128-
const std::string kBucketReplicationDestination = "Destination";
129-
const std::string kBucketReplicationBucket = "Bucket";
130-
const std::string kBucketReplicationStorageClass = "StorageClass";
122+
const char kBucketReplicationRoot[] = "ReplicationConfiguration";
123+
const char kBucketReplicationRule[] = "Rule";
124+
const char kBucketReplicationID[] = "ID";
125+
const char kBucketReplicationRole[] = "Role";
126+
const char kBucketReplicationPrefix[] = "Prefix";
127+
const char kBucketReplicationStatus[] = "Status";
128+
const char kBucketReplicationDestination[] = "Destination";
129+
const char kBucketReplicationBucket[] = "Bucket";
130+
const char kBucketReplicationStorageClass[] = "StorageClass";
131131

132132
// InitMultiUploadResp XML node
133-
const std::string kInitiateMultipartUploadRoot = "InitiateMultipartUploadResult";
134-
const std::string kInitiateMultipartUploadBucket = "Bucket";
135-
const std::string kInitiateMultipartUploadKey = "Key";
136-
const std::string kInitiateMultipartUploadId = "UploadId";
133+
const char kInitiateMultipartUploadRoot[] = "InitiateMultipartUploadResult";
134+
const char kInitiateMultipartUploadBucket[] = "Bucket";
135+
const char kInitiateMultipartUploadKey[] = "Key";
136+
const char kInitiateMultipartUploadId[] = "UploadId";
137137

138138
// CompleteMultiUploadResp XML node
139-
const std::string kCompleteMultiUploadRoot = "CompleteMultipartUploadResult";
140-
const std::string kCompleteMultiUploadLocation = "Location";
141-
const std::string kCompleteMultiUploadBucket = "Bucket";
142-
const std::string kCompleteMultiUploadKey = "Key";
143-
const std::string kCompleteMultiUploadETag = "ETag";
139+
const char kCompleteMultiUploadRoot[] = "CompleteMultipartUploadResult";
140+
const char kCompleteMultiUploadLocation[] = "Location";
141+
const char kCompleteMultiUploadBucket[] = "Bucket";
142+
const char kCompleteMultiUploadKey[] = "Key";
143+
const char kCompleteMultiUploadETag[] = "ETag";
144144

145145
// StorageClass
146-
const std::string kStorageClassStandard = "STANDARD";
147-
const std::string kStorageClassStandardIA = "STANDARD_IA";
148-
const std::string kStorageClassMAZStandard = "MAZ_STANDARD";
149-
const std::string kStorageClassMAZStandardIA = "MAZ_STANDARD_IA";
150-
const std::string kStorageClassIntelligentTiering = "INTELLIGENT_TIERING";
151-
const std::string kStorageClassArchive = "ARCHIVE";
152-
const std::string kStorageClassDeepArchive = "DEEP_ARCHIVE";
146+
const char kStorageClassStandard[] = "STANDARD";
147+
const char kStorageClassStandardIA[] = "STANDARD_IA";
148+
const char kStorageClassMAZStandard[] = "MAZ_STANDARD";
149+
const char kStorageClassMAZStandardIA[] = "MAZ_STANDARD_IA";
150+
const char kStorageClassIntelligentTiering[] = "INTELLIGENT_TIERING";
151+
const char kStorageClassArchive[] = "ARCHIVE";
152+
const char kStorageClassDeepArchive[] = "DEEP_ARCHIVE";
153153

154154
// Resumable download
155-
const std::string kResumableDownloadTaskFileSuffix = ".cosresumabletask";
156-
const std::string kResumableDownloadFileName = "fileName";
157-
const std::string kResumableDownloadTaskLastModified = "lastModified";
158-
const std::string kResumableDownloadTaskContentLength = "contentLength";
159-
const std::string kResumableDownloadTaskEtag = "eTag";
160-
const std::string kResumableDownloadTaskCrc64ecma = "crc64ecma";
161-
const std::string kResumableDownloadResumeOffset = "resumeOffset";
155+
const char kResumableDownloadTaskFileSuffix[] = ".cosresumabletask";
156+
const char kResumableDownloadFileName[] = "fileName";
157+
const char kResumableDownloadTaskLastModified[] = "lastModified";
158+
const char kResumableDownloadTaskContentLength[] = "contentLength";
159+
const char kResumableDownloadTaskEtag[] = "eTag";
160+
const char kResumableDownloadTaskCrc64ecma[] = "crc64ecma";
161+
const char kResumableDownloadResumeOffset[] = "resumeOffset";
162162

163163
// 预设ACL
164-
const std::string kAclDefault = "default";
165-
const std::string kAclPrivate = "private";
166-
const std::string kAclPublicRead = "public-read";
167-
const std::string kAclPublicReadWrite = "public-read-write";
168-
const std::string kAclAuthenticatedRead = "authenticated-read";
169-
const std::string kAclBucketOwnerRead = "bucket-owner-read";
164+
const char kAclDefault[] = "default";
165+
const char kAclPrivate[] = "private";
166+
const char kAclPublicRead[] = "public-read";
167+
const char kAclPublicReadWrite[] = "public-read-write";
168+
const char kAclAuthenticatedRead[] = "authenticated-read";
169+
const char kAclBucketOwnerRead[] = "bucket-owner-read";
170170

171171
// object type
172-
const std::string kObjectTypeAppendable = "appendable";
173-
const std::string kObjectTypeNormal = "normal";
172+
const char kObjectTypeAppendable[] = "appendable";
173+
const char kObjectTypeNormal[] = "normal";
174174
} // namespace qcloud_cos
175175
#endif

‎src/op/cos_result.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ bool CosResult::ParseFromHttpResponse(
4141
return false;
4242
}
4343

44-
rapidxml::xml_node<>* root = doc.first_node(kErrorRoot.c_str());
44+
rapidxml::xml_node<>* root = doc.first_node(kErrorRoot);
4545
if (NULL == root) {
4646
// SDK_LOG_INFO("Miss root node=Error, xml_body=%s", body.c_str());
4747
// SetErrorMsg(body);

‎src/response/bucket_resp.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ bool GetBucketResp::ParseFromXmlString(const std::string& body) {
3030
return false;
3131
}
3232

33-
rapidxml::xml_node<>* root = doc.first_node(kGetBucketRoot.c_str());
33+
rapidxml::xml_node<>* root = doc.first_node(kGetBucketRoot);
3434
if (NULL == root) {
3535
SDK_LOG_ERR("Miss root node=kGetBucketRoot, xml_body=%s", body.c_str());
3636
return false;
@@ -109,7 +109,7 @@ bool ListMultipartUploadResp::ParseFromXmlString(const std::string& body) {
109109
return false;
110110
}
111111

112-
rapidxml::xml_node<>* root = doc.first_node(kListMultipartUploadRoot.c_str());
112+
rapidxml::xml_node<>* root = doc.first_node(kListMultipartUploadRoot);
113113
if (NULL == root) {
114114
SDK_LOG_ERR("Miss root node=kListMultipartUploadRoot, xml_body=%s",
115115
body.c_str());
@@ -213,7 +213,7 @@ bool GetBucketReplicationResp::ParseFromXmlString(const std::string& body) {
213213
return false;
214214
}
215215

216-
rapidxml::xml_node<>* root = doc.first_node(kBucketReplicationRoot.c_str());
216+
rapidxml::xml_node<>* root = doc.first_node(kBucketReplicationRoot);
217217
if (NULL == root) {
218218
SDK_LOG_ERR("Miss root node=BucketReplicationRoot, xml_body=%s",
219219
body.c_str());

‎src/response/object_resp.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ bool InitMultiUploadResp::ParseFromXmlString(const std::string& body) {
3636
}
3737

3838
rapidxml::xml_node<>* root =
39-
doc.first_node(kInitiateMultipartUploadRoot.c_str());
39+
doc.first_node(kInitiateMultipartUploadRoot);
4040
if (NULL == root) {
4141
SDK_LOG_ERR("Miss root node=InitiateMultipartUploadResult, xml_body=%s",
4242
body.c_str());
@@ -71,7 +71,7 @@ bool CompleteMultiUploadResp::ParseFromXmlString(const std::string& body) {
7171
return false;
7272
}
7373

74-
rapidxml::xml_node<>* root = doc.first_node(kCompleteMultiUploadRoot.c_str());
74+
rapidxml::xml_node<>* root = doc.first_node(kCompleteMultiUploadRoot);
7575
if (NULL == root) {
7676
SDK_LOG_ERR("Miss root node=CompleteMultipartUploadResult, xml_body=%s",
7777
body.c_str());
@@ -105,7 +105,7 @@ bool MultiPutObjectResp::ParseFromXmlString(const std::string& body) {
105105
return false;
106106
}
107107

108-
rapidxml::xml_node<>* root = doc.first_node(kCompleteMultiUploadRoot.c_str());
108+
rapidxml::xml_node<>* root = doc.first_node(kCompleteMultiUploadRoot);
109109
if (NULL == root) {
110110
SDK_LOG_ERR("Miss root node=CompleteMultipartUploadResult, xml_body=%s",
111111
body.c_str());

‎src/util/string_util.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ std::string StringUtil::JoinStrings(const std::vector<std::string>& str_vec,
111111
}
112112

113113
uint64_t StringUtil::StringToUint64(const std::string& str) {
114-
unsigned long long temp = strtoull(str.c_str(), NULL, 10);
114+
uint64_t temp = strtoull(str.c_str(), NULL, 10);
115115
return temp;
116116
}
117117

0 commit comments

Comments
 (0)