Validate parquet writer version #19515
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use std::fmt::{self, Display}; | ||
| use std::str::FromStr; | ||
|
|
||
| use crate::config::{ConfigField, Visit}; | ||
| use crate::error::{DataFusionError, Result}; | ||
|
|
||
| /// Parquet writer version options for controlling the Parquet file format version | ||
| /// | ||
| /// This enum validates parquet writer version values at configuration time, | ||
| /// ensuring only valid versions ("1.0" or "2.0") can be set via `SET` commands | ||
| /// or proto deserialization. | ||
| #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] | ||
| pub enum DFParquetWriterVersion { | ||
| /// Parquet format version 1.0 | ||
| #[default] | ||
| V1_0, | ||
| /// Parquet format version 2.0 | ||
| V2_0, | ||
| } | ||
|
|
||
| /// Implement parsing strings to `DFParquetWriterVersion` | ||
| impl FromStr for DFParquetWriterVersion { | ||
| type Err = DataFusionError; | ||
|
|
||
| fn from_str(s: &str) -> Result<Self, Self::Err> { | ||
| match s.to_lowercase().as_str() { | ||
| "1.0" => Ok(DFParquetWriterVersion::V1_0), | ||
| "2.0" => Ok(DFParquetWriterVersion::V2_0), | ||
| other => Err(DataFusionError::Configuration(format!( | ||
| "Invalid parquet writer version: {other}. Expected one of: 1.0, 2.0" | ||
| ))), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Display for DFParquetWriterVersion { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| let s = match self { | ||
| DFParquetWriterVersion::V1_0 => "1.0", | ||
| DFParquetWriterVersion::V2_0 => "2.0", | ||
| }; | ||
| write!(f, "{s}") | ||
| } | ||
| } | ||
|
|
||
| impl ConfigField for DFParquetWriterVersion { | ||
| fn visit<V: Visit>(&self, v: &mut V, key: &str, description: &'static str) { | ||
| v.some(key, self, description) | ||
| } | ||
|
|
||
| fn set(&mut self, _: &str, value: &str) -> Result<()> { | ||
| *self = DFParquetWriterVersion::from_str(value)?; | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| /// Convert `DFParquetWriterVersion` to parquet crate's `WriterVersion` | ||
| /// | ||
| /// This conversion is infallible since `DFParquetWriterVersion` only contains | ||
| /// valid values that have been validated at configuration time. | ||
| #[cfg(feature = "parquet")] | ||
| impl From<DFParquetWriterVersion> for parquet::file::properties::WriterVersion { | ||
| fn from(value: DFParquetWriterVersion) -> Self { | ||
| match value { | ||
| DFParquetWriterVersion::V1_0 => { | ||
| parquet::file::properties::WriterVersion::PARQUET_1_0 | ||
| } | ||
| DFParquetWriterVersion::V2_0 => { | ||
| parquet::file::properties::WriterVersion::PARQUET_2_0 | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Convert parquet crate's `WriterVersion` to `DFParquetWriterVersion` | ||
| /// | ||
| /// This is used when converting from existing parquet writer properties, | ||
| /// such as when reading from proto or test code. | ||
| #[cfg(feature = "parquet")] | ||
| impl From<parquet::file::properties::WriterVersion> for DFParquetWriterVersion { | ||
| fn from(version: parquet::file::properties::WriterVersion) -> Self { | ||
| match version { | ||
| parquet::file::properties::WriterVersion::PARQUET_1_0 => { | ||
| DFParquetWriterVersion::V1_0 | ||
| } | ||
| parquet::file::properties::WriterVersion::PARQUET_2_0 => { | ||
| DFParquetWriterVersion::V2_0 | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
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.
minor nit -- as a follow on PR it might be nice to put this module in
config/parquet.rsor something rather than make a new top level module in datafusion-commonUh oh!
There was an error while loading. Please reload this page.
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.
oh yes it will get messy specially when we add the rest of the validations.
what do you think about adding a new module like
common/src/config_validations, and move to it theparquet_config.rsandformat.rs(implemented in #17549 ), and complete there the following validations that are to be added in the following PRs closing #17498