Skip to content

MINOR: Improve exception message in InternalFileDecryptor #3143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggershinsky merged 1 commit into from
Feb 6, 2025
Merged

MINOR: Improve exception message in InternalFileDecryptor #3143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions parquet-hadoop/src/main/java/org/apache/parquet/crypto/InternalFileDecryptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public InternalColumnDecryptionSetup setColumnCryptoMetadata(
"Re-use: wrong encryption key (column vs footer). Column: " + path);
}
if (!encryptedWithFooterKey && !Arrays.equals(columnDecryptionSetup.getKeyMetadata(), keyMetadata)) {
throw new ParquetCryptoRuntimeException("Decryptor re-use: Different footer key metadata ");
throw new ParquetCryptoRuntimeException("Decryptor re-use: Different footer key metadata");
}
}
return columnDecryptionSetup;
Expand All @@ -244,7 +244,8 @@ public InternalColumnDecryptionSetup setColumnCryptoMetadata(
} else {
if (encryptedWithFooterKey) {
if (null == footerKey) {
throw new ParquetCryptoRuntimeException("Column " + path + " is encrypted with NULL footer key");
throw new ParquetCryptoRuntimeException(
"Column " + path + " is encrypted with footer key, but the provided footer key is NULL");
}
columnDecryptionSetup = new InternalColumnDecryptionSetup(
path,
Expand All @@ -269,7 +270,8 @@ public InternalColumnDecryptionSetup setColumnCryptoMetadata(
}
}
if (null == columnKeyBytes) {
throw new ParquetCryptoRuntimeException("Column " + path + "is encrypted with NULL column key");
throw new ParquetCryptoRuntimeException("Column " + path
+ " is encrypted with column-specific key, but the provided column key is NULL");
}
columnDecryptionSetup = new InternalColumnDecryptionSetup(
path,
Expand Down