Skip to content

Commit 52c0234

Browse files
authored
Merge pull request #219 from RachelTucker/csdk-171-5-0-api
CSDK-171: Removing ChunkClientProcessingOrderGuarantee from request payload body
2 parents 22b312e + 04ac400 commit 52c0234

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

src/ds3_requests.c

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ static ds3_error* _get_request_xml_nodes(
405405
return NULL;
406406
}
407407

408-
static xmlDocPtr _generate_xml_bulk_objects_list(const ds3_bulk_object_list_response* obj_list, object_list_type list_type, ds3_job_chunk_client_processing_order_guarantee order) {
408+
static xmlDocPtr _generate_xml_bulk_objects_list(const ds3_bulk_object_list_response* obj_list, object_list_type list_type) {
409409
char size_buff[STRING_BUFFER_SIZE];
410410
xmlDocPtr doc;
411411
ds3_bulk_object_response* obj;
@@ -416,17 +416,6 @@ static xmlDocPtr _generate_xml_bulk_objects_list(const ds3_bulk_object_list_resp
416416
doc = xmlNewDoc((xmlChar*)"1.0");
417417
objects_node = xmlNewNode(NULL, (xmlChar*) "Objects");
418418

419-
if (list_type == BULK_GET) {
420-
if (order == DS3_JOB_CHUNK_CLIENT_PROCESSING_ORDER_GUARANTEE_NONE) {
421-
xmlSetProp(objects_node, (xmlChar*) "ChunkClientProcessingOrderGuarantee", (const xmlChar *) "NONE");
422-
} else if (order == DS3_JOB_CHUNK_CLIENT_PROCESSING_ORDER_GUARANTEE_IN_ORDER) {
423-
xmlSetProp(objects_node, (xmlChar*) "ChunkClientProcessingOrderGuarantee", (const xmlChar *) "IN_ORDER");
424-
} else {
425-
return NULL;
426-
}
427-
}
428-
429-
430419
for (obj_index = 0; obj_index < obj_list->num_objects; obj_index++) {
431420
obj = obj_list->objects[obj_index];
432421
memset(size_buff, 0, sizeof(size_buff));
@@ -517,7 +506,7 @@ static ds3_error* _init_request_payload(const ds3_request* _request,
517506
if (request->object_list == NULL || request->object_list->num_objects == 0) {
518507
return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The bulk command requires a list of objects to process");
519508
}
520-
doc = _generate_xml_bulk_objects_list(request->object_list, operation_type, request->chunk_ordering);
509+
doc = _generate_xml_bulk_objects_list(request->object_list, operation_type);
521510
break;
522511

523512
case COMPLETE_MPU:

0 commit comments

Comments
 (0)