address comments

Author: TingDaoK

include/aws/s3/private/s3_request.h

@@ -172,6 +172,7 @@ struct aws_s3_request_metrics {
         bool memory_allocated_from_pool;
     } crt_info_metrics;
 
+    /* TODO: align the part info metrics with the others, eg: `aws_s3_mpu_part_info`. */
     struct {
         /* Beginning range of this part. */
         uint64_t part_range_start;

include/aws/s3/private/s3_util.h

@@ -255,8 +255,7 @@ int aws_s3_parse_content_range_response_header(
     uint64_t *out_object_size);
 
 /* Given a Content-Range header value as a byte cursor, parses the range-start, range-end and
- * object-size. All output arguments are optional. This is an optimized version that doesn't
- * require string allocation. */
+ * object-size. All output arguments are optional. */
 AWS_S3_API
 int aws_s3_parse_content_range_cursor(
     struct aws_byte_cursor content_range_cursor,

source/s3_auto_ranged_get.c

@@ -821,15 +821,14 @@ static void s_s3_auto_ranged_get_request_finished(
             /* No part size has been set from user. Now we use the optimal part size based on the throughput and memory
              * limit */
             uint64_t out_request_optimal_range_size = 0;
-            int error = aws_s3_calculate_request_optimal_range_size(
-                meta_request->client->optimal_range_size,
-                auto_ranged_get->estimated_object_stored_part_size,
-                &out_request_optimal_range_size);
-            if (!error) {
+            if (aws_s3_calculate_request_optimal_range_size(
+                    meta_request->client->optimal_range_size,
+                    auto_ranged_get->estimated_object_stored_part_size,
+                    &out_request_optimal_range_size) == AWS_OP_SUCCESS) {
                 /* Override the part size to be optimal */
                 *((size_t *)&meta_request->part_size) = (size_t)out_request_optimal_range_size;
                 if (request->request_tag == AWS_S3_AUTO_RANGE_GET_REQUEST_TYPE_HEAD_OBJECT) {
-                    /* Update the first part size as well */
+                    /* Update the first part size as well, if we haven't made the request yet. */
                     first_part_size = meta_request->part_size;
                 }
             }

source/s3_util.c

@@ -844,7 +844,7 @@ int aws_s3_calculate_client_optimal_range_size(
     uint32_t max_connections,
     uint64_t *out_client_optimal_range_size) {
 
-    AWS_PRECONDITION(out_client_optimal_range_size);
+    AWS_ERROR_PRECONDITION(out_client_optimal_range_size);
 
     /* Validate input parameters */
     if (memory_limit_in_bytes == 0 || max_connections == 0) {
@@ -898,7 +898,7 @@ int aws_s3_calculate_request_optimal_range_size(
     uint64_t estimated_object_stored_part_size,
     uint64_t *out_request_optimal_range_size) {
 
-    AWS_PRECONDITION(out_request_optimal_range_size);
+    AWS_ERROR_PRECONDITION(out_request_optimal_range_size);
 
     /* Validate input parameters */
     if (client_optimal_range_size == 0) {
@@ -944,7 +944,7 @@ static bool s_is_quote_or_space_char(uint8_t c) {
 
 int aws_s3_extract_parts_from_etag(struct aws_byte_cursor etag_header_value, uint32_t *out_num_parts) {
 
-    AWS_PRECONDITION(out_num_parts);
+    AWS_ERROR_PRECONDITION(out_num_parts);
     /* Strip quotes if present (ETags often come wrapped in quotes) */
     struct aws_byte_cursor etag_cursor = aws_byte_cursor_trim_pred(&etag_header_value, s_is_quote_or_space_char);
 
@@ -964,7 +964,10 @@ int aws_s3_extract_parts_from_etag(struct aws_byte_cursor etag_header_value, uin
     while (aws_byte_cursor_next_split(&remaining_cursor, '-', &substr)) {
         split_count++;
         if (split_count == 2) {
-            /* The ETag should follow the pattern <hash>-<parts_count>, so the second part is the parts count. */
+            /**
+             * The ETag should follow the pattern <hash>-<parts_count>, so the second part is the parts count.
+             * The S3 ETag will not have `-` in the hash value, as it's a HEX string.
+             **/
             parts_count = substr;
         }
         if (split_count > 2) {