-
Notifications
You must be signed in to change notification settings - Fork 49
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: handle unrecognized file types in Delta log #575
Open
cg-cognition
wants to merge
10
commits into
delta-io:main
Choose a base branch
from
devin-open-source:devin/1733561459-fix-unusual-log-patterns
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+46
−2
Open
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
59ddd85
fix: handle unrecognized log file patterns
devin-ai-integration[bot] 6fef42a
test: update test assertions for unusual log patterns
devin-ai-integration[bot] 91f8650
fix: filter out unknown file types in list_log_files
devin-ai-integration[bot] 8200c7b
fix: add filter for unknown file types in list_log_files
devin-ai-integration[bot] 0a0227d
address feedback, use try_collect
cg-cognition e4ae2a8
use flatten
cg-cognition 130e36e
Merge branch 'main' into devin/1733561459-fix-unusual-log-patterns
cg-cognition 2066988
Merge branch 'main' into devin/1733561459-fix-unusual-log-patterns
cg-cognition 124d2ae
Merge branch 'main' into devin/1733561459-fix-unusual-log-patterns
cg-cognition 920658e
Merge branch 'main' into devin/1733561459-fix-unusual-log-patterns
cg-cognition File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -289,9 +289,13 @@ fn list_log_files( | |
|
||
Ok(fs_client | ||
.list_from(&start_from)? | ||
.map(|meta| ParsedLogPath::try_from(meta?)) | ||
// TODO this filters out .crc files etc which start with "." - how do we want to use these kind of files? | ||
.map(|meta| meta.map(|m| ParsedLogPath::try_from(m).ok().and_then(identity))) | ||
.filter_map_ok(identity) | ||
.filter(|path_res| { | ||
path_res | ||
.as_ref() | ||
.map_or(true, |path| path.is_commit() || path.is_checkpoint()) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This keeps commit/checkpoint ( There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes that's right |
||
}) | ||
.take_while(move |path_res| match path_res { | ||
Ok(path) => !end_version.is_some_and(|end_version| end_version < path.version), | ||
Err(_) => true, | ||
|
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small nit:
.and_then(identity)
is flattening a nested option right? Could use.flatten()
in that case.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice catch, i actually didn't know about this -- will update