Skip to content

BP 5.0 API #217

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
rpmoore merged 4 commits into from
Feb 14, 2018
Merged

BP 5.0 API #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94d3701
Generated 5.0 API with version changed to String
RachelTucker Feb 5, 2018
2383bfd
Updating bulk request payloads to marshal version
RachelTucker Feb 8, 2018
642c68b
Updating signature to include versioning and versions, and added test
RachelTucker Feb 13, 2018
42d8a72
namespacing get file size function
RachelTucker Feb 14, 2018
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ project(libds3)

set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/modules/")

set (DS3SDK_VERSION_MAJOR 4)
set (DS3SDK_VERSION_MINOR 1)
set (DS3SDK_VERSION_MAJOR 5)
set (DS3SDK_VERSION_MINOR 0)
set (DS3SDK_VERSION_PATCH 0)

add_subdirectory(src)
28 changes: 26 additions & 2 deletions src/ds3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,16 @@ static void get_file_size_posix(const char* file_path, uint64_t* file_size) {
}
}

uint64_t ds3_get_file_size(const char* file_path) {
uint64_t size = 0;
#ifdef _WIN32
get_file_size_windows(file_path, &size);
#else
get_file_size_posix(file_path, &size);
#endif
return size;
}

static ds3_bulk_object_response* _ds3_bulk_object_from_file(const char* file_name, const char* base_path) {
struct stat file_info;
int result;
Expand Down Expand Up @@ -350,6 +360,8 @@ ds3_bulk_object_list_response* ds3_convert_object_list(const ds3_contents_respon
for (object_index = 0; object_index < num_objects; object_index++) {
ds3_bulk_object_response* response = g_new0(ds3_bulk_object_response, 1);
response->name = ds3_str_dup(objects[object_index]->key);
response->version = ds3_str_dup(objects[object_index]->version_id);

g_ptr_array_add(ds3_bulk_object_response_array, response);
}

Expand Down Expand Up @@ -729,6 +741,7 @@ void ds3_s3_object_response_free(ds3_s3_object_response* response) {
ds3_str_free(response->creation_date);
ds3_str_free(response->id);
ds3_str_free(response->name);
ds3_str_free(response->version);

g_free(response);
}
Expand Down Expand Up @@ -1039,7 +1052,7 @@ void ds3_pool_response_free(ds3_pool_response* response) {
ds3_str_free(response->mountpoint);
ds3_str_free(response->name);
ds3_str_free(response->partition_id);
ds3_str_free(response->storage_domain_id);
ds3_str_free(response->storage_domain_member_id);

g_free(response);
}
Expand Down Expand Up @@ -1075,6 +1088,7 @@ void ds3_suspect_blob_pool_response_free(ds3_suspect_blob_pool_response* respons
ds3_str_free(response->date_written);
ds3_str_free(response->id);
ds3_str_free(response->last_accessed);
ds3_str_free(response->obsoletion_id);
ds3_str_free(response->pool_id);

g_free(response);
Expand All @@ -1086,6 +1100,7 @@ void ds3_suspect_blob_tape_response_free(ds3_suspect_blob_tape_response* respons

ds3_str_free(response->blob_id);
ds3_str_free(response->id);
ds3_str_free(response->obsoletion_id);
ds3_str_free(response->tape_id);

g_free(response);
Expand All @@ -1110,7 +1125,7 @@ void ds3_tape_response_free(ds3_tape_response* response) {
ds3_str_free(response->partially_verified_end_of_tape);
ds3_str_free(response->partition_id);
ds3_str_free(response->serial_number);
ds3_str_free(response->storage_domain_id);
ds3_str_free(response->storage_domain_member_id);
ds3_str_free(response->type);

g_free(response);
Expand Down Expand Up @@ -2741,6 +2756,7 @@ void ds3_bulk_object_response_free(ds3_bulk_object_response* response) {
ds3_str_free(response->id);
ds3_str_free(response->name);
ds3_physical_placement_response_free(response->physical_placement);
ds3_str_free(response->version);

g_free(response);
}
Expand All @@ -2754,6 +2770,7 @@ void ds3_bulk_object_list_response_free(ds3_bulk_object_list_response* response)
ds3_bulk_object_response_free(response->objects[index]);
}
g_free(response->objects);
ds3_paging_free(response->paging);

g_free(response);
}
Expand All @@ -2779,6 +2796,7 @@ void ds3_job_creation_failed_notification_payload_response_free(ds3_job_creation

ds3_str_free(response->notification_generation_date);
ds3_tapes_must_be_onlined_response_free(response->tapes_must_be_onlined);
ds3_str_free(response->user_name);

g_free(response);
}
Expand Down Expand Up @@ -2966,6 +2984,7 @@ void ds3_contents_response_free(ds3_contents_response* response) {
ds3_str_free(response->last_modified);
ds3_user_response_free(response->owner);
ds3_str_free(response->storage_class);
ds3_str_free(response->version_id);

g_free(response);
}
Expand All @@ -2981,6 +3000,7 @@ void ds3_detailed_s3_object_response_free(ds3_detailed_s3_object_response* respo
ds3_str_free(response->id);
ds3_str_free(response->name);
ds3_str_free(response->owner);
ds3_str_free(response->version);

g_free(response);
}
Expand Down Expand Up @@ -3031,6 +3051,10 @@ void ds3_list_bucket_result_response_free(ds3_list_bucket_result_response* respo
}
g_free(response->objects);
ds3_str_free(response->prefix);
for (index = 0; index < response->num_versioned_objects; index++) {
ds3_contents_response_free(response->versioned_objects[index]);
}
g_free(response->versioned_objects);

g_free(response);
}
Expand Down
Loading