You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by GitBox <gi...@apache.org> on 2022/12/15 07:58:11 UTC
[GitHub] [arrow-datafusion] HaoYang670 opened a new pull request, #4637: Detect invalid (unsupported) compression types when parsing
HaoYang670 opened a new pull request, #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637
# Which issue does this PR close?
<!--
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
-->
Closes #4636.
# Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
-->
# What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
-->
# Are these changes tested?
<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code
If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
-->
# Are there any user-facing changes?
<!--
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->
<!--
If there are any breaking changes to public APIs, please add the `api change` label.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] alamb commented on pull request #4637: Detect invalid (unsupported) compression types when parsing
Posted by GitBox <gi...@apache.org>.
alamb commented on PR #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637#issuecomment-1356183674
I took the liberty of merging up from master to resolve another conflict and plan to merge this PR when CI passes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] HaoYang670 commented on pull request #4637: Detect invalid (unsupported) compression types when parsing
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on PR #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637#issuecomment-1356183818
Thanks @alamb !
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] HaoYang670 commented on a diff in pull request #4637: Detect invalid (unsupported) compression types when parsing
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on code in PR #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637#discussion_r1049572758
##########
datafusion/sql/src/parser.rs:
##########
@@ -66,7 +63,7 @@ pub struct CreateExternalTable {
/// Option to not error if table already exists
pub if_not_exists: bool,
/// File compression type (GZIP, BZIP2, XZ)
- pub file_compression_type: String,
+ pub file_compression_type: CompressionTypeVariant,
Review Comment:
Strengthening the type can let us find errors earlier.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] ursabot commented on pull request #4637: Detect invalid (unsupported) compression types when parsing
Posted by GitBox <gi...@apache.org>.
ursabot commented on PR #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637#issuecomment-1356226710
Benchmark runs are scheduled for baseline = 067d0443d2167cc33666c6490f383083a1c2b200 and contender = c2f199adbec8b650de5668c97675f8a757607df8. c2f199adbec8b650de5668c97675f8a757607df8 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped :warning: Benchmarking of arrow-datafusion-commits is not supported on ec2-t3-xlarge-us-east-2] [ec2-t3-xlarge-us-east-2](https://conbench.ursa.dev/compare/runs/a09167a525864135964f8271f8b35fd2...879373fa42a24ca68843223742d73306/)
[Skipped :warning: Benchmarking of arrow-datafusion-commits is not supported on test-mac-arm] [test-mac-arm](https://conbench.ursa.dev/compare/runs/e008b570aad1459884df601d0a7f453e...9672c97e92aa4b5a86304c8409fb7747/)
[Skipped :warning: Benchmarking of arrow-datafusion-commits is not supported on ursa-i9-9960x] [ursa-i9-9960x](https://conbench.ursa.dev/compare/runs/9c39c5824d034fdaafdd8063b59dce98...d19824e1a8604a57b885e0bb6e975e65/)
[Skipped :warning: Benchmarking of arrow-datafusion-commits is not supported on ursa-thinkcentre-m75q] [ursa-thinkcentre-m75q](https://conbench.ursa.dev/compare/runs/08a3ee3390434162b97171d598e29bdd...1caedc1f0c0040119b6125c455400311/)
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] alamb merged pull request #4637: Detect invalid (unsupported) compression types when parsing
Posted by GitBox <gi...@apache.org>.
alamb merged PR #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] HaoYang670 commented on a diff in pull request #4637: Detect invalid (unsupported) compression types when parsing
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on code in PR #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637#discussion_r1049572758
##########
datafusion/sql/src/parser.rs:
##########
@@ -66,7 +63,7 @@ pub struct CreateExternalTable {
/// Option to not error if table already exists
pub if_not_exists: bool,
/// File compression type (GZIP, BZIP2, XZ)
- pub file_compression_type: String,
+ pub file_compression_type: CompressionTypeVariant,
Review Comment:
Strength the type can let us find errors earlier.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] HaoYang670 commented on a diff in pull request #4637: Detect invalid (unsupported) compression types when parsing
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on code in PR #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637#discussion_r1049570255
##########
datafusion/core/src/datasource/file_format/file_type.rs:
##########
@@ -50,48 +52,59 @@ pub trait GetExt {
/// Readable file compression type
#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum FileCompressionType {
- /// Gzip-ed file
- GZIP,
- /// Bzip2-ed file
- BZIP2,
- /// Xz-ed file (liblzma)
- XZ,
- /// Uncompressed file
- UNCOMPRESSED,
+pub struct FileCompressionType {
+ variant: CompressionTypeVariant,
}
impl GetExt for FileCompressionType {
fn get_ext(&self) -> String {
- match self {
- FileCompressionType::GZIP => ".gz".to_owned(),
- FileCompressionType::BZIP2 => ".bz2".to_owned(),
- FileCompressionType::XZ => ".xz".to_owned(),
- FileCompressionType::UNCOMPRESSED => "".to_owned(),
+ match self.variant {
+ GZIP => ".gz".to_owned(),
+ BZIP2 => ".bz2".to_owned(),
+ XZ => ".xz".to_owned(),
+ UNCOMPRESSED => "".to_owned(),
}
}
}
+impl From<CompressionTypeVariant> for FileCompressionType {
+ fn from(t: CompressionTypeVariant) -> Self {
+ Self { variant: t }
+ }
+}
+
impl FromStr for FileCompressionType {
type Err = DataFusionError;
fn from_str(s: &str) -> Result<Self> {
- let s = s.to_uppercase();
- match s.as_str() {
- "GZIP" | "GZ" => Ok(FileCompressionType::GZIP),
- "BZIP2" | "BZ2" => Ok(FileCompressionType::BZIP2),
- "XZ" => Ok(FileCompressionType::XZ),
- "" => Ok(FileCompressionType::UNCOMPRESSED),
- _ => Err(DataFusionError::NotImplemented(format!(
- "Unknown FileCompressionType: {}",
- s
- ))),
- }
+ let variant = CompressionTypeVariant::from_str(s).map_err(|_| {
+ DataFusionError::NotImplemented(format!("Unknown FileCompressionType: {}", s))
+ })?;
+ Ok(Self { variant })
}
}
/// `FileCompressionType` implementation
impl FileCompressionType {
+ /// Gzip-ed file
+ pub const GZIP: Self = Self { variant: GZIP };
+
+ /// Bzip2-ed file
+ pub const BZIP2: Self = Self { variant: BZIP2 };
+
+ /// Xz-ed file (liblzma)
+ pub const XZ: Self = Self { variant: XZ };
+
+ /// Uncompressed file
+ pub const UNCOMPRESSED: Self = Self {
+ variant: UNCOMPRESSED,
+ };
Review Comment:
They are a little tricky, but can minimize the code change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] HaoYang670 commented on a diff in pull request #4637: Detect invalid (unsupported) compression types when parsing
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on code in PR #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637#discussion_r1049572758
##########
datafusion/sql/src/parser.rs:
##########
@@ -66,7 +63,7 @@ pub struct CreateExternalTable {
/// Option to not error if table already exists
pub if_not_exists: bool,
/// File compression type (GZIP, BZIP2, XZ)
- pub file_compression_type: String,
+ pub file_compression_type: CompressionTypeVariant,
Review Comment:
Strengthen the type can let us find errors earlier.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] alamb commented on a diff in pull request #4637: Detect invalid (unsupported) compression types when parsing
Posted by GitBox <gi...@apache.org>.
alamb commented on code in PR #4637:
URL: https://github.com/apache/arrow-datafusion/pull/4637#discussion_r1051186990
##########
datafusion/expr/src/logical_plan/plan.rs:
##########
@@ -1487,7 +1488,7 @@ pub struct CreateExternalTable {
/// SQL used to create the table, if available
pub definition: Option<String>,
/// File compression type (GZIP, BZIP2, XZ)
- pub file_compression_type: String,
+ pub file_compression_type: CompressionTypeVariant,
Review Comment:
👍
##########
datafusion/sql/src/parser.rs:
##########
@@ -724,4 +726,13 @@ mod tests {
Ok(())
}
+
+ #[test]
+ fn invalid_compression_type() {
+ let sql = "CREATE EXTERNAL TABLE t STORED AS CSV COMPRESSION TYPE ZZZ LOCATION 'blahblah'";
+ expect_parse_error(
+ sql,
+ "sql parser error: Unsupported file compression type ZZZ",
Review Comment:
👍
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org