MINOR: Make ColumnPath immutable (#1380)

Similar to `ColumnPath.toArray`, but avoids copying the path.
apache · Jul 9, 2024 · 515ed4c · 515ed4c
1 parent 0876679
commit 515ed4c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 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 {
@@ -48,6 +50,8 @@ public static ColumnPath get(String... path) {
   private final String[] p;
 
   private ColumnPath(String[] path) {
+    // No need to copy the array here as the only published ColumnPath instances are created by the toCanonical
+    // method
     this.p = path;
   }
 
@@ -83,6 +87,10 @@ public int size() {
   }
 
   public String[] toArray() {
-    return p;
+    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
@@ -19,7 +19,6 @@
 
 package org.apache.parquet.crypto;
 
-import java.util.Arrays;
 import org.apache.parquet.format.BlockCipher;
 import org.apache.parquet.format.ColumnCryptoMetaData;
 import org.apache.parquet.format.EncryptionWithColumnKey;
@@ -48,7 +47,7 @@ public class InternalColumnEncryptionSetup {
         columnCryptoMetaData = ColumnCryptoMetaData.ENCRYPTION_WITH_FOOTER_KEY(new EncryptionWithFooterKey());
       } else {
         EncryptionWithColumnKey withColumnKeyStruct = new EncryptionWithColumnKey(
-            Arrays.asList(encryptionProperties.getPath().toArray()));
+            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
@@ -550,7 +550,7 @@ private void addRowGroup(
       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(),