update

Author: ArnavBalyan

parquet-cli/README.md

@@ -137,7 +137,7 @@ Usage: parquet [options] [command] [command options]
 ### Configuration Options
 
 - `--conf` or `--property`: Set any configuration property in format `key=value`. Can be specified multiple times.
-- `--config-file`: Path to a properties configuration file containing key=value pairs.
+- `--config-file`: Path to a configuration file (`.properties` or `.xml` format).
 
 Examples:
 ```bash

parquet-cli/src/main/java/org/apache/parquet/cli/Main.java

@@ -34,6 +34,7 @@
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.log4j.Level;
@@ -78,7 +79,7 @@ public class Main extends Configured implements Tool {
 
   @Parameter(
       names = {"--config-file"},
-      description = "Path to a properties configuration file containing key=value pairs.")
+      description = "Path to a configuration file (properties or Hadoop XML format).")
   private String configFilePath;
 
   @VisibleForTesting
@@ -182,11 +183,16 @@ public int run(String[] args) throws Exception {
       Configuration merged = new Configuration(getConf());
 
       if (configFilePath != null) {
-        try (InputStream in = new FileInputStream(configFilePath)) {
-          Properties props = new Properties();
-          props.load(in);
-          props.forEach((key, value) -> merged.set(key.toString(), value.toString()));
-          console.debug("Loaded configuration from file: {}", configFilePath);
+        try {
+          if (isXmlConfigFile(configFilePath)) {
+            loadXmlConfiguration(merged, configFilePath);
+          } else if (isPropertiesConfigFile(configFilePath)) {
+            loadPropertiesConfiguration(merged, configFilePath);
+          } else {
+            throw new IllegalArgumentException(
+                "Unsupported config file format. Only .xml and .properties files are supported: "
+                    + configFilePath);
+          }
         } catch (Exception e) {
           throw new IllegalArgumentException(
               "Failed to load config file '" + configFilePath + "': " + e.getMessage(), e);
@@ -239,4 +245,27 @@ public static void main(String[] args) throws Exception {
     int rc = ToolRunner.run(new Configuration(), new Main(console), args);
     System.exit(rc);
   }
+
+  private boolean isXmlConfigFile(String filePath) {
+    return filePath.toLowerCase().endsWith(".xml");
+  }
+
+  private boolean isPropertiesConfigFile(String filePath) {
+    String lowerPath = filePath.toLowerCase();
+    return lowerPath.endsWith(".properties");
+  }
+
+  private void loadXmlConfiguration(Configuration config, String filePath) {
+    config.addResource(new Path(filePath));
+    console.debug("Loaded XML configuration from file: {}", filePath);
+  }
+
+  private void loadPropertiesConfiguration(Configuration config, String filePath) throws Exception {
+    try (InputStream in = new FileInputStream(filePath)) {
+      Properties props = new Properties();
+      props.load(in);
+      props.forEach((key, value) -> config.set(key.toString(), value.toString()));
+      console.debug("Loaded properties configuration from file: {}", filePath);
+    }
+  }
 }

parquet-cli/src/test/java/org/apache/parquet/cli/MainTest.java

@@ -51,4 +51,20 @@ public void testConfigFileLoading() throws Exception {
       Assert.fail("Config file loading failed: " + e.getMessage());
     }
   }
+
+  @Test
+  public void testLocalPropertiesFile() throws Exception {
+    String configFile = getClass().getResource("/test-config.properties").getPath();
+    ToolRunner.run(new Configuration(), new Main(LoggerFactory.getLogger(MainTest.class)), new String[] {
+      "--config-file", configFile, "version"
+    });
+  }
+
+  @Test
+  public void testLocalXmlFile() throws Exception {
+    String configFile = getClass().getResource("/test-config.xml").getPath();
+    ToolRunner.run(new Configuration(), new Main(LoggerFactory.getLogger(MainTest.class)), new String[] {
+      "--config-file", configFile, "version"
+    });
+  }
 }

parquet-cli/src/test/resources/test-config.properties

@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+test.key=test.value
+parquet.avro.write-old-list-structure=false
+parquet.compression=SNAPPY
+parquet.block.size=134217728

parquet-cli/src/test/resources/test-config.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<configuration>
+  <property>
+    <name>test.key</name>
+    <value>test.value</value>
+  </property>
+
+  <property>
+    <name>parquet.avro.write-old-list-structure</name>
+    <value>false</value>
+  </property>
+
+  <property>
+    <name>parquet.compression</name>
+    <value>SNAPPY</value>
+  </property>
+
+</configuration>