xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:error

This commit is contained in:
wangmm0220 2023-11-08 11:57:49 +08:00
parent 07aa749fcd
commit 047eb14f67
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/common/src/cos.c
View File

@ -298,7 +298,7 @@ S3Status initial_multipart_callback(const char *upload_id, void *callbackData) {
} }
S3Status MultipartResponseProperiesCallback(const S3ResponseProperties *properties, void *callbackData) { S3Status MultipartResponseProperiesCallback(const S3ResponseProperties *properties, void *callbackData) {
responsePropertiesCallback(properties, callbackData); // responsePropertiesCallback(properties, callbackData);
MultipartPartData *data = (MultipartPartData *)callbackData; MultipartPartData *data = (MultipartPartData *)callbackData;
int seq = data->seq; int seq = data->seq;
@ -476,7 +476,7 @@ int32_t s3PutObjectFromFile2(const char *file, const char *object) {
metaProperties, useServerSideEncryption}; metaProperties, useServerSideEncryption};
if (contentLength <= MULTIPART_CHUNK_SIZE) { if (contentLength <= MULTIPART_CHUNK_SIZE) {
S3PutObjectHandler putObjectHandler = {{&responsePropertiesCallback, &responseCompleteCallback}, S3PutObjectHandler putObjectHandler = {{NULL, &responseCompleteCallback},
&putObjectDataCallback}; &putObjectDataCallback};
do { do {
@ -513,14 +513,14 @@ int32_t s3PutObjectFromFile2(const char *file, const char *object) {
memset(&partData, 0, sizeof(MultipartPartData)); memset(&partData, 0, sizeof(MultipartPartData));
int partContentLength = 0; int partContentLength = 0;
S3MultipartInitialHandler handler = {{&responsePropertiesCallback, &responseCompleteCallback}, S3MultipartInitialHandler handler = {{NULL, &responseCompleteCallback},
&initial_multipart_callback}; &initial_multipart_callback};
S3PutObjectHandler putObjectHandler = {{&MultipartResponseProperiesCallback, &responseCompleteCallback}, S3PutObjectHandler putObjectHandler = {{&MultipartResponseProperiesCallback, &responseCompleteCallback},
&putObjectDataCallback}; &putObjectDataCallback};
S3MultipartCommitHandler commit_handler = { S3MultipartCommitHandler commit_handler = {
{&responsePropertiesCallback, &responseCompleteCallback}, &multipartPutXmlCallback, 0}; {NULL, &responseCompleteCallback}, &multipartPutXmlCallback, 0};
manager.etags = (char **)taosMemoryMalloc(sizeof(char *) * totalSeq); manager.etags = (char **)taosMemoryMalloc(sizeof(char *) * totalSeq);
manager.next_etags_pos = 0; manager.next_etags_pos = 0;
@ -668,7 +668,7 @@ static void s3FreeObjectKey(void *pItem) {
static SArray* getListByPrefix(const char *prefix){ static SArray* getListByPrefix(const char *prefix){
S3BucketContext bucketContext = {0, tsS3BucketName, protocolG, uriStyleG, tsS3AccessKeyId, tsS3AccessKeySecret, S3BucketContext bucketContext = {0, tsS3BucketName, protocolG, uriStyleG, tsS3AccessKeyId, tsS3AccessKeySecret,
0, awsRegionG}; 0, awsRegionG};
S3ListBucketHandler listBucketHandler = {{&responsePropertiesCallback, &responseCompleteCallback}, S3ListBucketHandler listBucketHandler = {{NULL, &responseCompleteCallback},
&listBucketCallback}; &listBucketCallback};
const char *marker = 0, *delimiter = 0; const char *marker = 0, *delimiter = 0;

2
source/libs/stream/src/streamCheckpoint.c
View File

@ -478,7 +478,7 @@ static int uploadCheckpointToS3(char* id, char* path){
taosDirEntryIsDir(de)) continue; taosDirEntryIsDir(de)) continue;
char filename[PATH_MAX] = {0}; char filename[PATH_MAX] = {0};
if(path[strlen(path - 1)] == TD_DIRSEP_CHAR){ if(path[strlen(path) - 1] == TD_DIRSEP_CHAR){
snprintf(filename, sizeof(filename), "%s%s", path, name); snprintf(filename, sizeof(filename), "%s%s", path, name);
}else{ }else{
snprintf(filename, sizeof(filename), "%s%s%s", path, TD_DIRSEP, name); snprintf(filename, sizeof(filename), "%s%s%s", path, TD_DIRSEP, name);