Fix RDS S3 sub-pipeline folder depth calculation when partition_prefix is absent.#6859
Merged
Merged
Conversation
divbok
requested review from
KarstenSchnitter,
Zhangxunmt,
dinujoh,
dlvenable,
graytaylor0,
kkondaka,
oeyh,
san81,
sb2k16 and
srikanthjg
as code owners
oeyh
reviewed
May 13, 2026
Collaborator
oeyh
left a comment
oeyh
left a comment
There was a problem hiding this comment.
Thanks for the PR! I'm good with the fix. Can we add a test?
graytaylor0
reviewed
May 13, 2026
| return Integer.toString(getDepth(s3Prefix, 3)); | ||
| String envSourceCoordinationIdentifier = System.getenv(SOURCE_COORDINATION_IDENTIFIER_ENVIRONMENT_VARIABLE); | ||
| int baseDepth = envSourceCoordinationIdentifier != null ? 3 : 2; | ||
| return Integer.toString(getDepth(s3Prefix, baseDepth)); |
Member
There was a problem hiding this comment.
+1 on ading a test here, otherwise looks good
oeyh
reviewed
May 18, 2026
Collaborator
oeyh
left a comment
oeyh
left a comment
There was a problem hiding this comment.
Thanks for adding tests! Some minor things:
Signed-off-by: Divyansh Bokadia <dbokadia@amazon.com>
oeyh
approved these changes
May 18, 2026
graytaylor0
approved these changes
May 19, 2026
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
3 participants
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.
Description
Fix RDS S3 sub-pipeline folder depth calculation when
partition_prefixis absent.calculateDepthForRdsSourceuses a hardcoded base depth of 3, assuming the S3 buffer path always contains<partition_prefix>/buffer/<hash>. WhenSOURCE_COORDINATION_PIPELINE_IDENTIFIERis not set, the path only hasbuffer/<hash>(2 segments), causing the depth filter inS3ScanPartitionCreationSupplier.getPrefixWithDepth()to reject all objects — resulting in silent data loss.This fix checks the env var and uses base depth 2 when absent, consistent with the logic already used in
getIncludePrefixForRdsSource.Issues Resolved
Resolves #6754
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.