refactor RewriteOptions' builder

MaxNevermind · Oct 27, 2024 · 2aec624 · 2aec624
1 parent cff9f7f
commit 2aec624
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/rewrite/RewriteOptions.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/rewrite/RewriteOptions.java
@@ -18,11 +18,11 @@
  */
 package org.apache.parquet.hadoop.rewrite;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.stream.Collectors;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
@@ -589,15 +589,15 @@ public RewriteOptions build() {
                 !encryptColumns.contains(pruneColumn), "Cannot prune and encrypt same column");
           }
         }
-        if (renameColumns != null) {
+      }
+
+      if (renameColumns != null && !renameColumns.isEmpty()) {
+        if (encryptColumns != null && !encryptColumns.isEmpty()) {
           for (Map.Entry<String, String> entry : renameColumns.entrySet()) {
             Preconditions.checkArgument(
                 !encryptColumns.contains(entry.getKey()), "Cannot prune and rename same column");
           }
         }
-      }
-
-      if (renameColumns != null && !renameColumns.isEmpty()) {
         for (Map.Entry<String, String> entry : renameColumns.entrySet()) {
           Preconditions.checkArgument(
               entry.getValue() != null && !entry.getValue().trim().isEmpty(),