This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new e024529679 only consider main part of the url when deciding
is_collection in listing table (#10419)
e024529679 is described below
commit e0245296792eabdc35e83e8c5872345ff38c1fdf
Author: yfu <[email protected]>
AuthorDate: Thu May 9 03:58:28 2024 +1000
only consider main part of the url when deciding is_collection in listing
table (#10419)
* only consider main part of the url when deciding is_collection in listing
table
* use url path
* run `cargo fmt`
---------
Co-authored-by: Andrew Lamb <[email protected]>
---
datafusion/core/src/datasource/listing/url.rs | 32 ++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/datafusion/core/src/datasource/listing/url.rs
b/datafusion/core/src/datasource/listing/url.rs
index 82acb7a3b6..73fffd8aba 100644
--- a/datafusion/core/src/datasource/listing/url.rs
+++ b/datafusion/core/src/datasource/listing/url.rs
@@ -187,7 +187,7 @@ impl ListingTableUrl {
/// Returns `true` if `path` refers to a collection of objects
pub fn is_collection(&self) -> bool {
- self.url.as_str().ends_with(DELIMITER)
+ self.url.path().ends_with(DELIMITER)
}
/// Strips the prefix of this [`ListingTableUrl`] from the provided path,
returning
@@ -463,4 +463,34 @@ mod tests {
Some(("/a/b/c//", "alltypes_plain*.parquet")),
);
}
+
+ #[test]
+ fn test_is_collection() {
+ fn test(input: &str, expected: bool, message: &str) {
+ let url = ListingTableUrl::parse(input).unwrap();
+ assert_eq!(url.is_collection(), expected, "{message}");
+ }
+
+ test("https://a.b.c/path/";, true, "path ends with / - collection");
+ test(
+ "https://a.b.c/path/?a=b";,
+ true,
+ "path ends with / - with query args - collection",
+ );
+ test(
+ "https://a.b.c/path?a=b/";,
+ false,
+ "path not ends with / - query ends with / - not collection",
+ );
+ test(
+ "https://a.b.c/path/#a=b";,
+ true,
+ "path ends with / - with fragment - collection",
+ );
+ test(
+ "https://a.b.c/path#a=b/";,
+ false,
+ "path not ends with / - fragment ends with / - not collection",
+ );
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
