Skip to content

Commit d2128af

Browse files
authored
GH-3029: Fix EncryptionPropertiesHelper not to use java.nio.file.Path (#3038)
1 parent 73a4430 commit d2128af

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

parquet-hadoop/src/main/java/org/apache/parquet/hadoop/EncryptionPropertiesHelper.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,25 @@
1818
*/
1919
package org.apache.parquet.hadoop;
2020

21-
import java.net.URI;
22-
import java.nio.file.Path;
2321
import org.apache.hadoop.conf.Configuration;
2422
import org.apache.parquet.conf.ParquetConfiguration;
2523
import org.apache.parquet.crypto.EncryptionPropertiesFactory;
2624
import org.apache.parquet.crypto.FileEncryptionProperties;
2725
import org.apache.parquet.hadoop.api.WriteSupport;
2826
import org.apache.parquet.hadoop.util.ConfigurationUtil;
27+
import org.apache.parquet.io.OutputFile;
2928

3029
final class EncryptionPropertiesHelper {
3130
static FileEncryptionProperties createEncryptionProperties(
32-
ParquetConfiguration fileParquetConfig, Path tempFilePath, WriteSupport.WriteContext fileWriteContext) {
31+
ParquetConfiguration fileParquetConfig, OutputFile file, WriteSupport.WriteContext fileWriteContext) {
3332
EncryptionPropertiesFactory cryptoFactory = EncryptionPropertiesFactory.loadFactory(fileParquetConfig);
3433
if (null == cryptoFactory) {
3534
return null;
3635
}
3736

3837
Configuration hadoopConf = ConfigurationUtil.createHadoopConfiguration(fileParquetConfig);
39-
URI path = tempFilePath == null ? null : tempFilePath.toUri();
4038
return cryptoFactory.getFileEncryptionProperties(
41-
hadoopConf, path == null ? null : new org.apache.hadoop.fs.Path(path), fileWriteContext);
39+
hadoopConf, file == null ? null : new org.apache.hadoop.fs.Path(file.getPath()), fileWriteContext);
4240
}
4341

4442
static FileEncryptionProperties createEncryptionProperties(

parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetWriter.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import java.io.Closeable;
2222
import java.io.IOException;
23-
import java.nio.file.Paths;
2423
import java.util.HashMap;
2524
import java.util.Map;
2625
import org.apache.hadoop.conf.Configuration;
@@ -387,9 +386,7 @@ public ParquetWriter(Path file, Configuration conf, WriteSupport<T> writeSupport
387386
// encryptionProperties could be built from the implementation of EncryptionPropertiesFactory when it is
388387
// attached.
389388
if (encryptionProperties == null) {
390-
String path = file == null ? null : file.getPath();
391-
encryptionProperties = EncryptionPropertiesHelper.createEncryptionProperties(
392-
conf, path == null ? null : Paths.get(path), writeContext);
389+
encryptionProperties = EncryptionPropertiesHelper.createEncryptionProperties(conf, file, writeContext);
393390
}
394391

395392
ParquetFileWriter fileWriter = new ParquetFileWriter(

0 commit comments

Comments
 (0)