MINIFICPP-2792 Fix S3 upload above 2GB on Windows#2167
Open
lordgamez wants to merge 3 commits intoapache:mainfrom
Open
MINIFICPP-2792 Fix S3 upload above 2GB on Windows#2167lordgamez wants to merge 3 commits intoapache:mainfrom
lordgamez wants to merge 3 commits intoapache:mainfrom
Conversation
1808a2e to
091f599
Compare
There was a problem hiding this comment.
Pull request overview
This PR updates the AWS S3 upload path to avoid copying FlowFile content into an intermediate Aws::StringStream, and to explicitly set request content length so large uploads work correctly on Windows. In the MiNiFi AWS extension, that means PutS3Object now streams directly from MiNiFi io::InputStream into the AWS SDK request bodies.
Changes:
- Replace the old copy-based
readFlowFileStreamhelper with a newMinifiToAwsInputStreamadapter aroundio::InputStream. - Explicitly set
ContentLengthon both single-part and multipart S3 upload requests. - Update S3 test mocks/helpers to model body consumption more like the AWS SDK for multipart uploads.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
extensions/aws/tests/MockS3RequestSender.h |
Adjusts test mock behavior so multipart request bodies are consumed/read more like the real SDK. |
extensions/aws/s3/S3Wrapper.h |
Removes the old helper declaration for copying FlowFile data into an AWS string stream. |
extensions/aws/s3/S3Wrapper.cpp |
Switches S3 uploads to the new stream adapter and sets request content lengths explicitly. |
extensions/aws/s3/MinifiToAwsInputStream.h |
Adds a new streambuf/iostream adapter that exposes MiNiFi io::InputStream as an AWS-compatible input stream. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Set content length to avoid narrowing size to int on Windows - Add MinifiToAwsInputStream to wrap MiNiFi InputStream and avoid stream copy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
https://issues.apache.org/jira/browse/MINIFICPP-2792
Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically main)?
Is your initial contribution a single, squashed commit?
For code changes:
For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.