Add ColumnPath.toList

Similar to `ColumnPath.toArray`, but avoids copying the path.
apache · Jun 22, 2024 · 4e5bc8c · 4e5bc8c
1 parent b30c4f4
commit 4e5bc8c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/parquet-common/src/main/java/org/apache/parquet/hadoop/metadata/ColumnPath.java b/parquet-common/src/main/java/org/apache/parquet/hadoop/metadata/ColumnPath.java
@@ -20,7 +20,9 @@
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Objects;
 
 public final class ColumnPath implements Iterable<String>, Serializable {
@@ -86,4 +88,8 @@ public int size() {
   public String[] toArray() {
     return p.clone();
   }
+
+  public List<String> toList() {
+    return Collections.unmodifiableList(Arrays.asList(p));
+  }
 }
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/crypto/InternalColumnEncryptionSetup.java b/parquet-hadoop/src/main/java/org/apache/parquet/crypto/InternalColumnEncryptionSetup.java
@@ -45,7 +45,7 @@ public class InternalColumnEncryptionSetup {
       if (encryptionProperties.isEncryptedWithFooterKey()) {
         columnCryptoMetaData = ColumnCryptoMetaData.ENCRYPTION_WITH_FOOTER_KEY(new EncryptionWithFooterKey());
       } else {
-        EncryptionWithColumnKey withColumnKeyStruct = new EncryptionWithColumnKey(Arrays.asList(encryptionProperties.getPath().toArray()));
+        EncryptionWithColumnKey withColumnKeyStruct = new EncryptionWithColumnKey(encryptionProperties.getPath().toList());
         if (null != encryptionProperties.getKeyMetaData()) {
           withColumnKeyStruct.setKey_metadata(encryptionProperties.getKeyMetaData());
         }

diff --git a/...et-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/...et-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java
@@ -510,7 +510,7 @@ private void addRowGroup(ParquetMetadata parquetMetadata, List<RowGroup> rowGrou
       ColumnMetaData metaData = new ColumnMetaData(
           getType(columnMetaData.getType()),
           toFormatEncodings(columnMetaData.getEncodings()),
-          Arrays.asList(columnMetaData.getPath().toArray()),
+          columnMetaData.getPath().toList(),
           toFormatCodec(columnMetaData.getCodec()),
           columnMetaData.getValueCount(),
           columnMetaData.getTotalUncompressedSize(),