Replace FileSourceParams path with URI #5104
Closed
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
rdettai
force-pushed
the
refactor-file-source
branch
from
373435a
to
afd7868
Compare
rdettai
force-pushed
the
uri-file-src-params
branch
from
e34d436
to
383850e
Compare
guilload
approved these changes
Jun 11, 2024
| assert!(cache_directory_path.read_dir().unwrap().next().is_none()); | ||
|
|
||
| let does_not_exit_uri = uri_from_path(&test_env.data_dir_path) |
There was a problem hiding this comment.
Suggested change
| let does_not_exit_uri = uri_from_path(&test_env.data_dir_path) | |
| let does_not_exist_uri = uri_from_path(&test_env.data_dir_path) |
| } | ||
|
|
||
| /// Deserializing as an URI | ||
| fn uri_from_str<'de, D>(deserializer: D) -> Result<Option<Uri>, D::Error> |
There was a problem hiding this comment.
Uri implements Deserialize, so I don't think we need a custom deserializer for Option<Uri>.
| @@ -249,37 +254,33 @@ pub struct FileSourceParams { | |||
| #[schema(value_type = String)] | |||
| #[serde(skip_serializing_if = "Option::is_none")] | |||
| #[serde(default)] | |||
| #[serde(deserialize_with = "absolute_filepath_from_str")] | |||
| pub filepath: Option<PathBuf>, //< If None read from stdin. | |||
There was a problem hiding this comment.
We could rename this field file_uri and use an alias to maintain backward compatibility.
| }) | ||
| } | ||
|
|
||
| pub fn file_from_str<P: AsRef<str>>(filepath: P) -> anyhow::Result<Self> { |
There was a problem hiding this comment.
I don't think this is necessary, it's already super easy to go from &str to Uri and then to a file params object.
| /// TODO: we might want to replace `PathBuf` with `Uri` directly in | ||
| /// `FileSourceParams` | ||
| fn absolute_filepath_from_str<'de, D>(deserializer: D) -> Result<Option<PathBuf>, D::Error> | ||
| impl FromStr for FileSourceParams { |
| parsed_cust_event.uri(), | ||
| PathBuf::from("s3://quickwit-test/test.json"), | ||
| parsed_cust_event.uri().unwrap(), | ||
| Uri::from_str("s3://quickwit-test/test.json").unwrap(), |
There was a problem hiding this comment.
I believe Uri implements PartialEq for &str.
rdettai
force-pushed
the
refactor-file-source
branch
5 times, most recently
from
46208bf
to
fdc98a5
Compare
rdettai
force-pushed
the
uri-file-src-params
branch
from
ceaaeb3
to
24887c6
Compare
rdettai
force-pushed
the
refactor-file-source
branch
from
fdc98a5
to
3555d3a
Compare
rdettai
force-pushed
the
uri-file-src-params
branch
3 times, most recently
from
4b1775f
to
6c4f299
Compare
rdettai
force-pushed
the
refactor-file-source
branch
from
94f94ee
to
bea5d82
Compare
rdettai
force-pushed
the
uri-file-src-params
branch
from
6c4f299
to
cbcbfda
Compare
rdettai
force-pushed
the
refactor-file-source
branch
from
bea5d82
to
6d6fdb1
Compare
rdettai
force-pushed
the
uri-file-src-params
branch
from
cbcbfda
to
0c93920
Compare
|
Closing this in favor of #5148 that brings significant changes on top of the file source, |
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.
Description
The
FileSourceParamscurently contains a path that is converted forth and back to a URI. This PR straitens up things to avoid these conversions.How was this PR tested?
Describe how you tested this PR.