3085 lakectl ingest adds multiple excess slash to object name #3108
Conversation
This file contains 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
itaidavid
added
the
include-changelog
itaiad200
approved these changes
Mar 24, 2022
cmd/lakectl/cmd/store/s3.go
Outdated
| @@ -31,6 +31,10 @@ func (s *S3Walker) Walk(ctx context.Context, storageURI *url.URL, walkFn func(e | |||
| var continuation *string | |||
| const maxKeys = 1000 | |||
| prefix := strings.TrimLeft(storageURI.Path, "/") | |||
| var trimPrefix string | |||
| if idx := strings.LastIndex(prefix, "/"); idx != -1 { | |||
| trimPrefix = prefix[:idx+1] | |||
There was a problem hiding this comment.
It took me some time to understand why this is the right value, it's based on the ObjectStoreEntry definition:
// RelativeKey represents a path relative to prefix (or directory). If none specified, will be identical to FullKey
Would you mind adding a comment explaining the trimPrefix part?
itaidavid
force-pushed
the
3085-lakectl-ingest-adds-multiple-excess-slash-to-object-name
branch
from
3de4fcf to
4796114
Compare
|
Please rebase on |
johnnyaug
approved these changes
Mar 25, 2022
Co-authored-by: itaiad200 <itaiad200@gmail.com>
itaidavid
force-pushed
the
3085-lakectl-ingest-adds-multiple-excess-slash-to-object-name
branch
from
1a65f03 to
15830eb
Compare
Co-authored-by: johnnyaug <yoni.augarten@treeverse.io>
Co-authored-by: johnnyaug <yoni.augarten@treeverse.io>
johnnyaug
deleted the
3085-lakectl-ingest-adds-multiple-excess-slash-to-object-name
branch
johnnyaug
restored the
3085-lakectl-ingest-adds-multiple-excess-slash-to-object-name
branch
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.
Fixed
ingestfunction not to add a"/"if the to path ends wirh rhe branch name (and thus ends with"/")Fixed
S3Walkto correctly trim prefixes: with"/"if exists, and partial prefixes tooTested manually with
--froms3:://mybucket/data/,s3:://mybucket/dataands3:://mybucket/daOpened #3109 for adding tests