Skip to content

Commit daad566

Browse files
rpmoorerpmoore
authored
Merge pull request #138 from DenverM80/final_3_0_update
fix handling of ds3_str response types; rename (init_)ds3_get_objects…
2 parents 1272cc6 + b7f477e commit daad566

File tree

3 files changed

+34
-32
lines changed

3 files changed

+34
-32
lines changed

‎src/ds3.c‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2388,7 +2388,7 @@ ds3_request* ds3_init_get_object_details_spectra_s3_request(const char* resource
23882388
}
23892389
return (ds3_request*) request;
23902390
}
2391-
ds3_request* ds3_init_get_objects_spectra_s3_request(void) {
2391+
ds3_request* ds3_init_get_objects_details_spectra_s3_request(void) {
23922392
struct _ds3_request* request = _common_request_init(HTTP_GET, _build_path("/_rest_/object/", NULL, NULL));
23932393
return (ds3_request*) request;
23942394
}
@@ -14784,9 +14784,10 @@ ds3_error* ds3_get_jobs_spectra_s3_request(const ds3_client* client, const ds3_r
1478414784

1478514785
return _parse_top_level_ds3_job_list_response(client, request, response, xml_blob);
1478614786
}
14787-
ds3_error* ds3_get_put_job_to_replicate_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_str* response) {
14787+
ds3_error* ds3_get_put_job_to_replicate_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_str** response) {
1478814788
ds3_error* error;
1478914789
GByteArray* xml_blob;
14790+
ds3_str* _response;
1479014791

1479114792
int num_slashes = num_chars_in_ds3_str(request->path, '/');
1479214793
if (num_slashes < 2 || ((num_slashes == 2) && ('/' == request->path->value[request->path->size-1]))) {
@@ -14802,9 +14803,10 @@ ds3_error* ds3_get_put_job_to_replicate_spectra_s3_request(const ds3_client* cli
1480214803
return error;
1480314804
}
1480414805

14805-
response->value = (char*)xml_blob->data;
14806-
response->size = xml_blob->len;
14807-
g_byte_array_free(xml_blob, FALSE);
14806+
_response = ds3_str_init_with_size((char*)xml_blob->data, xml_blob->len);
14807+
g_byte_array_free(xml_blob, TRUE);
14808+
14809+
*response = _response;
1480814810
return error;
1480914811
}
1481014812
ds3_error* ds3_modify_job_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_master_object_list_response** response) {
@@ -15533,7 +15535,7 @@ ds3_error* ds3_get_object_details_spectra_s3_request(const ds3_client* client, c
1553315535

1553415536
return _parse_top_level_ds3_s3_object_response(client, request, response, xml_blob);
1553515537
}
15536-
ds3_error* ds3_get_objects_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_s3_object_list_response** response) {
15538+
ds3_error* ds3_get_objects_details_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_s3_object_list_response** response) {
1553715539
ds3_error* error;
1553815540
GByteArray* xml_blob;
1553915541

@@ -19203,11 +19205,11 @@ static ds3_bulk_object_response* _ds3_bulk_object_from_file(const char* file_nam
1920319205
return obj;
1920419206
}
1920519207

19206-
ds3_bulk_object_list_response* ds3_convert_file_list(const char** file_list, size_t num_files) {
19208+
ds3_bulk_object_list_response* ds3_convert_file_list(const char** file_list, uint64_t num_files) {
1920719209
return ds3_convert_file_list_with_basepath(file_list, num_files, NULL);
1920819210
}
1920919211

19210-
ds3_bulk_object_list_response* ds3_convert_file_list_with_basepath(const char** file_list, size_t num_files, const char* base_path) {
19212+
ds3_bulk_object_list_response* ds3_convert_file_list_with_basepath(const char** file_list, uint64_t num_files, const char* base_path) {
1921119213
size_t file_index;
1921219214
ds3_bulk_object_list_response* obj_list = ds3_init_bulk_object_list();
1921319215

@@ -19223,7 +19225,7 @@ ds3_bulk_object_list_response* ds3_convert_file_list_with_basepath(const char**
1922319225
return obj_list;
1922419226
}
1922519227

19226-
ds3_bulk_object_list_response* ds3_convert_object_list(const ds3_contents_response** objects, size_t num_objects) {
19228+
ds3_bulk_object_list_response* ds3_convert_object_list(const ds3_contents_response** objects, uint64_t num_objects) {
1922719229
size_t object_index;
1922819230
ds3_bulk_object_list_response* obj_list = ds3_init_bulk_object_list();
1922919231

‎src/ds3.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,7 +2405,7 @@ LIBRARY_API ds3_error* ds3_get_job_spectra_s3_request(const ds3_client* client,
24052405
LIBRARY_API ds3_request* ds3_init_get_jobs_spectra_s3_request(void);
24062406
LIBRARY_API ds3_error* ds3_get_jobs_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_job_list_response** response);
24072407
LIBRARY_API ds3_request* ds3_init_get_put_job_to_replicate_spectra_s3_request(const char* resource_id);
2408-
LIBRARY_API ds3_error* ds3_get_put_job_to_replicate_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_str* response);
2408+
LIBRARY_API ds3_error* ds3_get_put_job_to_replicate_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_str** response);
24092409

24102410
/** Optional Request Modifiers for ds3_init_modify_job_spectra_s3_request
24112411
* void ds3_request_set_created_at(const ds3_request* request, const char* value)
@@ -2671,7 +2671,7 @@ LIBRARY_API ds3_error* ds3_delete_folder_recursively_spectra_s3_request(const ds
26712671
LIBRARY_API ds3_request* ds3_init_get_object_details_spectra_s3_request(const char* resource_id, const char* bucket_id);
26722672
LIBRARY_API ds3_error* ds3_get_object_details_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_s3_object_response** response);
26732673

2674-
/** Optional Request Modifiers for ds3_init_get_objects_spectra_s3_request
2674+
/** Optional Request Modifiers for ds3_init_get_objects_details_spectra_s3_request
26752675
* void ds3_request_set_bucket_id(const ds3_request* request, const char* value)
26762676
* void ds3_request_set_folder(const ds3_request* request, const char* value)
26772677
* void ds3_request_set_include_physical_placement(const ds3_request* request, ds3_bool value)
@@ -2684,8 +2684,8 @@ LIBRARY_API ds3_error* ds3_get_object_details_spectra_s3_request(const ds3_clien
26842684
* void ds3_request_set_type_ds3_s3_object_type(const ds3_request* request, const ds3_s3_object_type value)
26852685
* void ds3_request_set_version(const ds3_request* request, const uint64_t value)
26862686
*/
2687-
LIBRARY_API ds3_request* ds3_init_get_objects_spectra_s3_request(void);
2688-
LIBRARY_API ds3_error* ds3_get_objects_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_s3_object_list_response** response);
2687+
LIBRARY_API ds3_request* ds3_init_get_objects_details_spectra_s3_request(void);
2688+
LIBRARY_API ds3_error* ds3_get_objects_details_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_s3_object_list_response** response);
26892689

26902690
/** Optional Request Modifiers for ds3_init_get_objects_with_full_details_spectra_s3_request
26912691
* void ds3_request_set_bucket_id(const ds3_request* request, const char* value)

‎test/search_tests.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ BOOST_AUTO_TEST_CASE( get_all_objects ) {
1111
const char* bucket_name = "search_bucket_test";
1212
populate_with_objects(client, bucket_name);
1313

14-
ds3_request* request = ds3_init_get_objects_spectra_s3_request();
14+
ds3_request* request = ds3_init_get_objects_details_spectra_s3_request();
1515
ds3_request_set_bucket_id(request, bucket_name);
1616
ds3_request_set_name(request, "%txt%");
17-
ds3_error* error = ds3_get_objects_spectra_s3_request(client, request, &response);
17+
ds3_error* error = ds3_get_objects_details_spectra_s3_request(client, request, &response);
1818

1919
handle_error(error);
2020
num_objs = response->num_s3_objects;
@@ -59,10 +59,10 @@ BOOST_AUTO_TEST_CASE( get_no_objects ) {
5959
const char* bucket_name = "search_bucket_test";
6060
populate_with_objects(client, bucket_name);
6161

62-
ds3_request* request = ds3_init_get_objects_spectra_s3_request();
62+
ds3_request* request = ds3_init_get_objects_details_spectra_s3_request();
6363
ds3_request_set_bucket_id(request, bucket_name);
6464
ds3_request_set_name(request, "%frankenstein.txt%");
65-
ds3_error* error = ds3_get_objects_spectra_s3_request(client, request, &response);
65+
ds3_error* error = ds3_get_objects_details_spectra_s3_request(client, request, &response);
6666
handle_error(error);
6767
num_objs = response->num_s3_objects;
6868
BOOST_CHECK_EQUAL(num_objs, 0);
@@ -81,10 +81,10 @@ BOOST_AUTO_TEST_CASE( get_two_objects ) {
8181
const char* bucket_name = "search_bucket_test";
8282
populate_with_objects(client, bucket_name);
8383

84-
ds3_request* request = ds3_init_get_objects_spectra_s3_request();
84+
ds3_request* request = ds3_init_get_objects_details_spectra_s3_request();
8585
ds3_request_set_bucket_id(request, bucket_name);
8686
ds3_request_set_name(request, "%ulysses%");
87-
ds3_error* error = ds3_get_objects_spectra_s3_request(client, request, &response);
87+
ds3_error* error = ds3_get_objects_details_spectra_s3_request(client, request, &response);
8888
handle_error(error);
8989
num_objs = response->num_s3_objects;
9090
BOOST_CHECK_EQUAL(num_objs, 2);
@@ -103,10 +103,10 @@ BOOST_AUTO_TEST_CASE( get_one_objects ) {
103103
const char* bucket_name = "search_bucket_test";
104104
populate_with_objects(client, bucket_name);
105105

106-
ds3_request* request = ds3_init_get_objects_spectra_s3_request();
106+
ds3_request* request = ds3_init_get_objects_details_spectra_s3_request();
107107
ds3_request_set_bucket_id(request, bucket_name);
108108
ds3_request_set_name(request, "%ulysses.txt%");
109-
ds3_error* error = ds3_get_objects_spectra_s3_request(client, request, &response);
109+
ds3_error* error = ds3_get_objects_details_spectra_s3_request(client, request, &response);
110110
handle_error(error);
111111
num_objs = response->num_s3_objects;
112112
BOOST_CHECK_EQUAL(num_objs, 1);
@@ -120,11 +120,11 @@ BOOST_AUTO_TEST_CASE( get_one_objects ) {
120120

121121
/* Disabling from nightly test until network timeout failure is resolved */
122122
/*
123-
BOOST_AUTO_TEST_CASE(get_objects_with_plus_query_param) {
123+
BOOST_AUTO_TEST_CASE(get_objects_details_with_plus_query_param) {
124124
printf("-----Testing Search Object with +-------\n");
125125
126126
ds3_client* client = get_client();
127-
const char* bucket_name = "get_objects_with_plus_query_param";
127+
const char* bucket_name = "get_objects_details_with_plus_query_param";
128128
const char* plus_object = "Plus+Object";
129129
130130
ds3_error* bucket_error = create_bucket_with_data_policy(client, bucket_name, ids.data_policy_id->value);
@@ -138,11 +138,11 @@ BOOST_AUTO_TEST_CASE(get_objects_with_plus_query_param) {
138138
fclose(obj_file);
139139
handle_error(error);
140140
141-
ds3_request* get_obj_request = ds3_init_get_objects_spectra_s3_request();
141+
ds3_request* get_obj_request = ds3_init_get_objects_details_spectra_s3_request();
142142
ds3_request_set_bucket_id(get_obj_request, bucket_name);
143143
ds3_request_set_name(get_obj_request, plus_object);
144144
ds3_s3_object_list_response* objects_response = NULL;
145-
error = ds3_get_objects_spectra_s3_request(client, get_obj_request, &objects_response);
145+
error = ds3_get_objects_details_spectra_s3_request(client, get_obj_request, &objects_response);
146146
handle_error(error);
147147
148148
BOOST_CHECK_EQUAL(objects_response->num_s3_objects, 1);
@@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE(get_objects_with_plus_query_param) {
159159

160160
/* Disabling from nightly test until network timeout failure is resolved */
161161
/*
162-
BOOST_AUTO_TEST_CASE(get_objects_with_special_chars_query_param) {
162+
BOOST_AUTO_TEST_CASE(get_objects_details_with_special_chars_query_param) {
163163
printf("-----Testing Search Object with special char-------\n");
164164
165165
ds3_client* client = get_client();
@@ -177,11 +177,11 @@ BOOST_AUTO_TEST_CASE(get_objects_with_special_chars_query_param) {
177177
fclose(obj_file);
178178
handle_error(error);
179179
180-
ds3_request* get_obj_request = ds3_init_get_objects_spectra_s3_request();
180+
ds3_request* get_obj_request = ds3_init_get_objects_details_spectra_s3_request();
181181
ds3_request_set_bucket_id(get_obj_request, bucket_name);
182182
ds3_request_set_name(get_obj_request, special_char_object);
183183
ds3_s3_object_list_response* objects_response = NULL;
184-
error = ds3_get_objects_spectra_s3_request(client, get_obj_request, &objects_response);
184+
error = ds3_get_objects_details_spectra_s3_request(client, get_obj_request, &objects_response);
185185
ds3_request_free(get_obj_request);
186186
handle_error(error);
187187
@@ -203,10 +203,10 @@ BOOST_AUTO_TEST_CASE( get_folder_and_objects ) {
203203
const char* bucket_name = "search_bucket_test";
204204
populate_with_objects(client, bucket_name);
205205

206-
ds3_request* request = ds3_init_get_objects_spectra_s3_request();
206+
ds3_request* request = ds3_init_get_objects_details_spectra_s3_request();
207207
ds3_request_set_bucket_id(request, bucket_name);
208208
ds3_request_set_name(request, "%resources%");
209-
ds3_error* error = ds3_get_objects_spectra_s3_request(client, request, &response);
209+
ds3_error* error = ds3_get_objects_details_spectra_s3_request(client, request, &response);
210210
handle_error(error);
211211
num_objs = response->num_s3_objects;
212212
BOOST_CHECK_EQUAL(num_objs, 5);
@@ -224,10 +224,10 @@ BOOST_AUTO_TEST_CASE( get_incorrect_bucket_name ) {
224224
const char* bucket_name = "search_bucket_test";
225225
populate_with_objects(client, bucket_name);
226226

227-
ds3_request* request = ds3_init_get_objects_spectra_s3_request();
227+
ds3_request* request = ds3_init_get_objects_details_spectra_s3_request();
228228
ds3_request_set_bucket_id(request, "fake_bucket");
229229
ds3_request_set_name(request, "%resources%");
230-
ds3_error* error = ds3_get_objects_spectra_s3_request(client, request, &response);
230+
ds3_error* error = ds3_get_objects_details_spectra_s3_request(client, request, &response);
231231
BOOST_CHECK(error!=NULL);
232232
BOOST_CHECK(error->error->http_error_code == 404);
233233

0 commit comments

Comments
 (0)