yanghua commented on a change in pull request #1452: [HUDI-740]Fix can not
specify the sparkMaster of cleans run command
URL: https://github.com/apache/incubator-hudi/pull/1452#discussion_r404550161
##########
File path: hudi-cli/src/main/java/org/apache/hudi/cli/commands/SparkMain.java
##########
@@ -118,53 +121,55 @@ public static void main(String[] args) throws Exception {
break;
case COMPACT_VALIDATE:
assert (args.length == 7);
- doCompactValidate(jsc, args[1], args[2], args[3],
Integer.parseInt(args[4]), args[5], args[6]);
+ doCompactValidate(jsc, args[3], args[4], args[5],
Integer.parseInt(args[6]));
returnCode = 0;
break;
case COMPACT_REPAIR:
assert (args.length == 8);
- doCompactRepair(jsc, args[1], args[2], args[3],
Integer.parseInt(args[4]), args[5], args[6],
+ doCompactRepair(jsc, args[3], args[4], args[5],
Integer.parseInt(args[6]),
Boolean.parseBoolean(args[7]));
returnCode = 0;
break;
case COMPACT_UNSCHEDULE_FILE:
assert (args.length == 9);
- doCompactUnscheduleFile(jsc, args[1], args[2], args[3],
Integer.parseInt(args[4]), args[5], args[6],
+ doCompactUnscheduleFile(jsc, args[3], args[4], args[5],
Integer.parseInt(args[6]),
Boolean.parseBoolean(args[7]), Boolean.parseBoolean(args[8]));
returnCode = 0;
break;
case COMPACT_UNSCHEDULE_PLAN:
assert (args.length == 9);
- doCompactUnschedule(jsc, args[1], args[2], args[3],
Integer.parseInt(args[4]), args[5], args[6],
+ doCompactUnschedule(jsc, args[3], args[4], args[5],
Integer.parseInt(args[6]),
Boolean.parseBoolean(args[7]), Boolean.parseBoolean(args[8]));
returnCode = 0;
break;
case CLEAN:
assert (args.length >= 5);
propsFilePath = null;
- if (!StringUtils.isNullOrEmpty(args[3])) {
- propsFilePath = args[3];
+ if (!StringUtils.isNullOrEmpty(args[4])) {
+ propsFilePath = args[4];
}
configs = new ArrayList<>();
if (args.length > 5) {
configs.addAll(Arrays.asList(args).subList(5, args.length));
}
- clean(jsc, args[1], args[2], propsFilePath, args[4], configs);
+ clean(jsc, args[3], propsFilePath, configs);
break;
default:
break;
}
System.exit(returnCode);
}
- private static void clean(JavaSparkContext jsc, String basePath, String
sparkMaster, String propsFilePath,
- String sparkMemory, List<String> configs) throws
Exception {
+ private static boolean sparkMasterContained(SparkCommand command) {
+ List masterContained = Arrays.asList(SparkCommand.COMPACT_VALIDATE,
SparkCommand.COMPACT_REPAIR,
+ SparkCommand.COMPACT_UNSCHEDULE_PLAN,
SparkCommand.COMPACT_UNSCHEDULE_FILE, SparkCommand.CLEAN);
+ return masterContained.contains(command);
+ }
+
+ private static void clean(JavaSparkContext jsc, String basePath, String
propsFilePath,
+ List<String> configs) {
Review comment:
The indent of arg is wrong?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
