enh(cos/put): put object with cp
This commit is contained in:
parent
215dbeaa3d
commit
3deaea9abf
|
@ -0,0 +1,84 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can use, redistribute, and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3
|
||||||
|
* or later ("AGPL"), as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _TD_COMMON_COS_CP_H_
|
||||||
|
#define _TD_COMMON_COS_CP_H_
|
||||||
|
|
||||||
|
#include "os.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
COS_CP_TYPE_UPLOAD, // upload
|
||||||
|
COS_CP_TYPE_DOWNLOAD // download
|
||||||
|
} ECpType;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
int32_t index; // the index of part, start from 0
|
||||||
|
int64_t offset; // the offset point of part
|
||||||
|
int64_t size; // the size of part
|
||||||
|
int completed; // COS_TRUE completed, COS_FALSE uncompleted
|
||||||
|
char* etag; // the etag of part, for upload
|
||||||
|
uint64_t crc64;
|
||||||
|
} SCheckpointPart;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
char* md5; // the md5 of checkout content
|
||||||
|
ECpType cp_type; // 1 upload, 2 download
|
||||||
|
TdFilePtr* thefile; // the handle of checkpoint file
|
||||||
|
|
||||||
|
char* file_path; // local file path
|
||||||
|
int64_t file_size; // local file size, for upload
|
||||||
|
int32_t file_last_modified; // local file last modified time, for upload
|
||||||
|
char* file_md5; // the md5 of the local file content, for upload, reserved
|
||||||
|
|
||||||
|
char* object_name; // object name
|
||||||
|
int64_t object_size; // object size, for download
|
||||||
|
char* object_last_modified; // object last modified time, for download
|
||||||
|
char* object_etag; // object etag, for download
|
||||||
|
|
||||||
|
char* upload_id; // upload id
|
||||||
|
|
||||||
|
int part_num; // the total number of parts
|
||||||
|
int64_t part_size; // the part size, byte
|
||||||
|
SCheckpointPart* parts; // the parts of local or object, from 0
|
||||||
|
} SCheckpoint;
|
||||||
|
|
||||||
|
void cos_cp_get_path(char const* filepath, char* cp_path);
|
||||||
|
TdFilePtr cos_cp_open(char const* cp_path, SCheckpoint* checkpoint);
|
||||||
|
void cos_cp_close(TdFilePtr fd);
|
||||||
|
void cos_cp_remove(char const* filepath);
|
||||||
|
bool cos_cp_exist(char const* filepath);
|
||||||
|
|
||||||
|
int32_t cos_cp_load(char const* filepath, SCheckpoint* checkpoint);
|
||||||
|
int32_t cos_cp_dump(SCheckpoint* checkpoint);
|
||||||
|
void cos_cp_get_parts(SCheckpoint* checkpoint, int* part_num, SCheckpointPart* parts, int64_t consume_bytes);
|
||||||
|
void cos_cp_update(SCheckpoint* checkpoint, int32_t part_index, char const* etag, uint64_t crc64);
|
||||||
|
void cos_cp_build_upload(SCheckpoint* checkpoint, char const* filepath, int64_t size, int32_t mtime,
|
||||||
|
char const* upload_id, int64_t part_size);
|
||||||
|
bool cos_cp_is_valid_upload(SCheckpoint* checkpoint, int64_t size, int32_t mtime);
|
||||||
|
|
||||||
|
void cos_cp_build_download(SCheckpoint* checkpoint, char const* filepath, char const* object_name, int64_t object_size,
|
||||||
|
char const* object_lmtime, char const* object_etag, int64_t part_size);
|
||||||
|
bool cos_cp_is_valid_download(SCheckpoint* checkpoint, char const* object_name, int64_t object_size,
|
||||||
|
char const* object_lmtime, char const* object_etag);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /*_TD_COMMON_COS_CP_H_*/
|
|
@ -1,6 +1,7 @@
|
||||||
#define ALLOW_FORBID_FUNC
|
#define ALLOW_FORBID_FUNC
|
||||||
|
|
||||||
#include "cos.h"
|
#include "cos.h"
|
||||||
|
#include "cos_cp.h"
|
||||||
|
|
||||||
extern char tsS3Endpoint[];
|
extern char tsS3Endpoint[];
|
||||||
extern char tsS3AccessKeyId[];
|
extern char tsS3AccessKeyId[];
|
||||||
|
@ -446,8 +447,22 @@ static int try_get_parts_info(const char *bucketName, const char *key, UploadMan
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
static int32_t s3PutObjectFromFileWithoutCp(const char *file, int64_t size, int32_t lmtime, const char *object) {
|
||||||
|
int32_t code = 0;
|
||||||
|
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int32_t s3PutObjectFromFileWithCp(const char *file, int64_t size, int32_t lmtime, const char *object) {
|
||||||
|
int32_t code = 0;
|
||||||
|
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
int32_t s3PutObjectFromFile2(const char *file, const char *object) {
|
int32_t s3PutObjectFromFile2(const char *file, const char *object) {
|
||||||
int32_t code = 0;
|
int32_t code = 0;
|
||||||
|
int32_t lmtime = 0;
|
||||||
const char *key = object;
|
const char *key = object;
|
||||||
// const char *uploadId = 0;
|
// const char *uploadId = 0;
|
||||||
const char *filename = 0;
|
const char *filename = 0;
|
||||||
|
@ -468,7 +483,7 @@ int32_t s3PutObjectFromFile2(const char *file, const char *object) {
|
||||||
// data.noStatus = noStatus;
|
// data.noStatus = noStatus;
|
||||||
|
|
||||||
// uError("ERROR: %s stat file %s: ", __func__, file);
|
// uError("ERROR: %s stat file %s: ", __func__, file);
|
||||||
if (taosStatFile(file, &contentLength, NULL, NULL) < 0) {
|
if (taosStatFile(file, &contentLength, &lmtime, NULL) < 0) {
|
||||||
uError("ERROR: %s Failed to stat file %s: ", __func__, file);
|
uError("ERROR: %s Failed to stat file %s: ", __func__, file);
|
||||||
code = TAOS_SYSTEM_ERROR(errno);
|
code = TAOS_SYSTEM_ERROR(errno);
|
||||||
return code;
|
return code;
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
#define ALLOW_FORBID_FUNC
|
||||||
|
|
||||||
|
#include "cos_cp.h"
|
||||||
|
|
||||||
|
void cos_cp_get_path(char const* filepath, char* cp_path) {}
|
||||||
|
TdFilePtr cos_cp_open(char const* cp_path, SCheckpoint* checkpoint) { return NULL; }
|
||||||
|
void cos_cp_close(TdFilePtr fd) {}
|
||||||
|
void cos_cp_remove(char const* filepath) {}
|
||||||
|
bool cos_cp_exist(char const* filepath) { return true; }
|
||||||
|
|
||||||
|
int32_t cos_cp_load(char const* filepath, SCheckpoint* checkpoint) { return 0; }
|
||||||
|
int32_t cos_cp_dump(SCheckpoint* checkpoint) { return 0; }
|
||||||
|
void cos_cp_get_parts(SCheckpoint* checkpoint, int* part_num, SCheckpointPart* parts, int64_t consume_bytes) {}
|
||||||
|
void cos_cp_update(SCheckpoint* checkpoint, int32_t part_index, char const* etag, uint64_t crc64) {}
|
||||||
|
void cos_cp_build_upload(SCheckpoint* checkpoint, char const* filepath, int64_t size, int32_t mtime,
|
||||||
|
char const* upload_id, int64_t part_size) {}
|
||||||
|
bool cos_cp_is_valid_upload(SCheckpoint* checkpoint, int64_t size, int32_t mtime) { return true; }
|
Loading…
Reference in New Issue