Skip to content

Commit 6d4ce5c

Browse files
authored
Merge pull request #464 from RachelTucker/4-1-csdk-171
CSDK-171: Removing JobChunkClientProcessingOrderGuarantee from C request payload body
2 parents a5bf072 + 51c2ad1 commit 6d4ce5c

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

ds3-autogen-c/src/main/resources/templates/source-templates/internal_request_processors.ftl

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static ds3_error* _get_request_xml_nodes(
6969
return NULL;
7070
}
7171

72-
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) {
72+
static xmlDocPtr _generate_xml_bulk_objects_list(const ds3_bulk_object_list_response* obj_list, object_list_type list_type) {
7373
char size_buff[STRING_BUFFER_SIZE];
7474
xmlDocPtr doc;
7575
ds3_bulk_object_response* obj;
@@ -80,17 +80,6 @@ static xmlDocPtr _generate_xml_bulk_objects_list(const ds3_bulk_object_list_resp
8080
doc = xmlNewDoc((xmlChar*)"1.0");
8181
objects_node = xmlNewNode(NULL, (xmlChar*) "Objects");
8282

83-
if (list_type == BULK_GET) {
84-
if (order == DS3_JOB_CHUNK_CLIENT_PROCESSING_ORDER_GUARANTEE_NONE) {
85-
xmlSetProp(objects_node, (xmlChar*) "ChunkClientProcessingOrderGuarantee", (const xmlChar *) "NONE");
86-
} else if (order == DS3_JOB_CHUNK_CLIENT_PROCESSING_ORDER_GUARANTEE_IN_ORDER) {
87-
xmlSetProp(objects_node, (xmlChar*) "ChunkClientProcessingOrderGuarantee", (const xmlChar *) "IN_ORDER");
88-
} else {
89-
return NULL;
90-
}
91-
}
92-
93-
9483
for (obj_index = 0; obj_index < obj_list->num_objects; obj_index++) {
9584
obj = obj_list->objects[obj_index];
9685
memset(size_buff, 0, sizeof(size_buff));
@@ -177,7 +166,7 @@ static ds3_error* _init_request_payload(const ds3_request* _request,
177166
if (request->object_list == NULL || request->object_list->num_objects == 0) {
178167
return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The bulk command requires a list of objects to process");
179168
}
180-
doc = _generate_xml_bulk_objects_list(request->object_list, operation_type, request->chunk_ordering);
169+
doc = _generate_xml_bulk_objects_list(request->object_list, operation_type);
181170
break;
182171

183172
case COMPLETE_MPU:

0 commit comments

Comments
 (0)