kumarUjjawal commented on code in PR #21985:
URL: https://github.com/apache/datafusion/pull/21985#discussion_r3176936177
##########
datafusion/common/src/config.rs:
##########
@@ -2862,28 +2862,42 @@ impl ConfigField for ConfigFileEncryptionProperties {
}
#[cfg(feature = "parquet_encryption")]
-impl From<ConfigFileEncryptionProperties> for FileEncryptionProperties {
- fn from(val: ConfigFileEncryptionProperties) -> Self {
+impl TryFrom<ConfigFileEncryptionProperties> for FileEncryptionProperties {
Review Comment:
we need entry in upgrade guide.
##########
datafusion/common/src/config.rs:
##########
@@ -2862,28 +2862,42 @@ impl ConfigField for ConfigFileEncryptionProperties {
}
#[cfg(feature = "parquet_encryption")]
-impl From<ConfigFileEncryptionProperties> for FileEncryptionProperties {
- fn from(val: ConfigFileEncryptionProperties) -> Self {
+impl TryFrom<ConfigFileEncryptionProperties> for FileEncryptionProperties {
+ type Error = DataFusionError;
+
+ fn try_from(val: ConfigFileEncryptionProperties) -> Result<Self> {
let mut fep = FileEncryptionProperties::builder(
- hex::decode(val.footer_key_as_hex).unwrap(),
+ hex::decode(val.footer_key_as_hex)
+ .map_err(|e| {
+ DataFusionError::Configuration(format!("Unable to decode hex
footer key from ConfigFileEncryptionProperties: {e}"))
+ })?,
)
.with_plaintext_footer(!val.encrypt_footer)
.with_aad_prefix_storage(val.store_aad_prefix);
if !val.footer_key_metadata_as_hex.is_empty() {
fep = fep.with_footer_key_metadata(
hex::decode(&val.footer_key_metadata_as_hex)
- .expect("Invalid footer key metadata"),
+ .map_err(|e| {
+ DataFusionError::Configuration(format!("Unable to
decode hex footer key metadata from ConfigFileEncryptionProperties: {e}"))
+ })?,
);
}
for (column_name, encryption_props) in
val.column_encryption_properties.iter() {
let encryption_key =
hex::decode(&encryption_props.column_key_as_hex)
- .expect("Invalid column encryption key");
+ .map_err(|e| {
+ DataFusionError::Configuration(format!("Unable to decode
hex encryption key metadata for column {column_name}: {e}"))
Review Comment:
message says "encryption key metadata", but this is decoding the actual
column encryption key. Please change it.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
