shangxinli commented on code in PR #954:
URL: https://github.com/apache/parquet-mr/pull/954#discussion_r850550025
##########
parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileWriter.java:
##########
@@ -336,20 +354,30 @@ public ParquetFileWriter(OutputFile file, MessageType
schema, Mode mode,
this.metadataConverter = new
ParquetMetadataConverter(statisticsTruncateLength);
- if (null == encryptionProperties) {
+ if (null == encryptionProperties && null == encryptor) {
this.fileEncryptor = null;
- } else {
- // Verify that every encrypted column is in file schema
- Map<ColumnPath, ColumnEncryptionProperties> columnEncryptionProperties =
encryptionProperties.getEncryptedColumns();
- if (null != columnEncryptionProperties) { // if null, every column in
file schema will be encrypted with footer key
- for (Map.Entry<ColumnPath, ColumnEncryptionProperties> entry :
columnEncryptionProperties.entrySet()) {
- String[] path = entry.getKey().toArray();
- if(!schema.containsPath(path)) {
- throw new ParquetCryptoRuntimeException("Encrypted column " +
Arrays.toString(path) + " not in file schema");
- }
+ return;
+ }
+
+ if (null == encryptionProperties) {
+ encryptionProperties = encryptor.getEncryptionProperties();
Review Comment:
You are right. How about we move up line 377~381? It would be easier to
read. We checked 1) both are null 2) ether one is null
--
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]
