Fix gcs walker relative key for import #5114
Merged
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
nopcoder
added
bug
itaiad200
requested changes
Jan 26, 2023
| @@ -23,6 +23,10 @@ func NewGCSWalker(client *storage.Client) *gcsWalker { | |||
|
|
|||
| func (w *gcsWalker) Walk(ctx context.Context, storageURI *url.URL, op WalkOptions, walkFn func(e ObjectStoreEntry) error) error { | |||
| prefix := strings.TrimLeft(storageURI.Path, "/") | |||
| var basePath string | |||
| if idx := strings.LastIndex(prefix, "/"); idx != -1 { | |||
| basePath = prefix[:idx+1] | |||
There was a problem hiding this comment.
Is this what we want? I asked to import gs://foo/bar and you'll import gs://foo/
There was a problem hiding this comment.
it supports the case of a single file and directory
| @@ -51,7 +54,7 @@ func (w *gcsWalker) Walk(ctx context.Context, storageURI *url.URL, op WalkOption | |||
| } | |||
| if err := walkFn(ObjectStoreEntry{ | |||
| FullKey: attrs.Name, | |||
| RelativeKey: strings.TrimPrefix(attrs.Name, prefix), | |||
| RelativeKey: strings.TrimPrefix(attrs.Name, basePath), | |||
There was a problem hiding this comment.
Are we okay with this being empty?
There was a problem hiding this comment.
empty string does nothing to the original value
itaiad200
approved these changes
Jan 26, 2023
There was a problem hiding this comment.
I get why it works for the bugs we have opened. I'm afraid of 2 things:
- Regression in some other flow. It doesn't seem like our ingest/import tests cover the slashes bug well enough.
- Inconsistency with other block adapters. Minor, but still.
Approving to unblock, please consider addressing these in followup issues.
|
Thanks @itaiad200 - tested from the UI and lakectl
|
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.
Fix #5104
Fix #5102
Fix #5113