[hudi] branch master updated: [HUDI-5185] Fix CLI run compaction failing with --hoodieConfigs (#7168)

[xushiyan]

This is an automated email from the ASF dual-hosted git repository.

xushiyan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git


The following commit(s) were added to refs/heads/master by this push:
     new 47df84db17 [HUDI-5185] Fix CLI run compaction failing with 
--hoodieConfigs (#7168)
47df84db17 is described below

commit 47df84db17833b3863ce5d01b876016964cac526
Author: Manu <36392121+x...@users.noreply.github.com>
AuthorDate: Sat Nov 12 00:24:11 2022 +0800

    [HUDI-5185] Fix CLI run compaction failing with --hoodieConfigs (#7168)
---
 .../src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java | 4 ++--
 hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java    | 2 +-
 .../test/java/org/apache/hudi/cli/integ/ITTestCompactionCommand.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java 
b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java
index cc2dd42c2c..cb24f56236 100644
--- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java
+++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CompactionCommand.java
@@ -220,13 +220,13 @@ public class CompactionCommand {
       @ShellOption(value = {"--parallelism"}, defaultValue = "3",
           help = "Parallelism for hoodie compaction") final String parallelism,
       @ShellOption(value = "--schemaFilePath",
-          help = "Path for Avro schema file", defaultValue = ShellOption.NULL) 
final String schemaFilePath,
+          help = "Path for Avro schema file", defaultValue = "") final String 
schemaFilePath,
       @ShellOption(value = "--sparkMaster", defaultValue = "local",
           help = "Spark Master") String master,
       @ShellOption(value = "--sparkMemory", defaultValue = "4G",
           help = "Spark executor memory") final String sparkMemory,
       @ShellOption(value = "--retry", defaultValue = "1", help = "Number of 
retries") final String retry,
-      @ShellOption(value = "--compactionInstant", help = "Base path for the 
target hoodie table",
+      @ShellOption(value = "--compactionInstant", help = "Instant of 
compaction.request",
           defaultValue = ShellOption.NULL) String compactionInstantTime,
       @ShellOption(value = "--propsFilePath", help = "path to properties file 
on localfs or dfs with configurations for hoodie client for compacting",
           defaultValue = "") final String propsFilePath,
diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java 
b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java
index 51e9bccac6..daea210fed 100644
--- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java
+++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java
@@ -151,7 +151,7 @@ public class SparkMain {
           }
           configs = new ArrayList<>();
           if (args.length > 10) {
-            configs.addAll(Arrays.asList(args).subList(9, args.length));
+            configs.addAll(Arrays.asList(args).subList(10, args.length));
           }
           returnCode = compact(jsc, args[3], args[4], args[5], 
Integer.parseInt(args[6]), args[7],
               Integer.parseInt(args[8]), HoodieCompactor.EXECUTE, 
propsFilePath, configs);
diff --git 
a/hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestCompactionCommand.java 
b/hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestCompactionCommand.java
index 21e961ee28..b8294f9e33 100644
--- 
a/hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestCompactionCommand.java
+++ 
b/hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestCompactionCommand.java
@@ -126,7 +126,7 @@ public class ITTestCompactionCommand extends 
HoodieCLIIntegrationTestBase {
     writeSchemaToTmpFile(schemaPath);
 
     Object result2 = shell.evaluate(() ->
-            String.format("compaction run --parallelism %s --schemaFilePath %s 
--sparkMaster %s",
+            String.format("compaction run --parallelism %s --schemaFilePath %s 
--sparkMaster %s --hoodieConfigs hoodie.embed.timeline.server=false",
             2, schemaPath, "local"));
 
     assertAll("Command run failed",