fix the hack

Author: TingDaoK

source/s3_parallel_input_stream.c

@@ -168,6 +168,12 @@ static int s_aws_s3_part_streaming_input_stream_read(struct aws_input_stream *st
         AWS_CONTAINER_OF(stream, struct aws_s3_part_streaming_input_stream_impl, base);
     int rt = aws_input_stream_read(test_input_stream->base_stream, dest);
     test_input_stream->length_read += dest->len;
+    if (test_input_stream->length_read > test_input_stream->total_length) {
+        size_t gap = test_input_stream->length_read - test_input_stream->total_length;
+        size_t new_len = dest->len - gap;
+        dest->len = new_len;
+        test_input_stream->length_read = test_input_stream->total_length;
+    }
     return rt;
 }
 
@@ -226,13 +232,12 @@ struct aws_input_stream *aws_input_stream_new_from_parallel(
         &test_input_stream->base.ref_count,
         test_input_stream,
         (aws_simple_completion_callback *)s_aws_s3_part_streaming_input_stream_destroy);
-
+    test_input_stream->allocator = allocator;
     test_input_stream->base.vtable = &s_aws_s3_part_streaming_input_stream_vtable;
-    struct aws_parallel_input_stream_from_file_impl *impl = parallel_stream->impl;
-    aws_mem_calloc(allocator, 1, sizeof(struct aws_parallel_input_stream_from_file_impl));
-    aws_parallel_input_stream_init_base(&impl->base, allocator, &s_parallel_input_stream_from_file_vtable, impl);
 
+    struct aws_parallel_input_stream_from_file_impl *impl = parallel_stream->impl;
     test_input_stream->base_stream = aws_input_stream_new_from_file(allocator, aws_string_c_str(impl->file_path));
+    AWS_FATAL_ASSERT(test_input_stream->base_stream != NULL);
     test_input_stream->total_length = request_body_size;
     test_input_stream->offset = offset;
     test_input_stream->length_read = 0;

source/s3_request.c

@@ -37,7 +37,9 @@ struct aws_s3_request *aws_s3_request_new(
 
     request->part_number = part_number;
     request->record_response_headers = (flags & AWS_S3_REQUEST_FLAG_RECORD_RESPONSE_HEADERS) != 0;
-    request->should_allocate_buffer_from_pool = (flags & AWS_S3_REQUEST_FLAG_ALLOCATE_BUFFER_FROM_POOL) != 0;
+    /* TODO: if the request is streaming, we are not allocating buffer from pool/ This will avoid the allocation buffer
+     * to be the bottleneck when streaming. */
+    request->should_allocate_buffer_from_pool = false;
     request->always_send = (flags & AWS_S3_REQUEST_FLAG_ALWAYS_SEND) != 0;
 
     return request;
@@ -132,6 +134,7 @@ static void s_s3_request_destroy(void *user_data) {
     aws_byte_buf_clean_up(&request->request_body);
     aws_s3_buffer_ticket_release(request->ticket);
     aws_string_destroy(request->operation_name);
+    aws_input_stream_release(request->request_stream);
     aws_s3_meta_request_release(request->meta_request);
 
     aws_mem_release(request->allocator, request);

source/s3_request_messages.c

@@ -394,9 +394,6 @@ struct aws_http_message *aws_s3_upload_part_message_new_streaming(
     }
 
     aws_http_message_set_body_stream(message, input_stream);
-    /* Let the message take the full ownership */
-    aws_input_stream_release(input_stream);
-
     return message;
 
 error_clean_up:
@@ -660,12 +657,13 @@ static const struct aws_byte_cursor s_complete_payload_begin = AWS_BYTE_CUR_INIT
 static const struct aws_byte_cursor s_complete_payload_end =
     AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("</CompleteMultipartUpload>");
 
-static const struct aws_byte_cursor s_part_section_string_0 = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("    <Part>\n"
-                                                                                                    "        <ETag>");
+static const struct aws_byte_cursor s_part_section_string_0 = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL(
+    "    <Part>\n"
+    "        <ETag>");
 
-static const struct aws_byte_cursor s_part_section_string_1 =
-    AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("</ETag>\n"
-                                          "         <PartNumber>");
+static const struct aws_byte_cursor s_part_section_string_1 = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL(
+    "</ETag>\n"
+    "         <PartNumber>");
 
 static const struct aws_byte_cursor s_close_part_number_tag = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("</PartNumber>\n");
 static const struct aws_byte_cursor s_close_part_tag = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("    </Part>\n");