Bläddra i källkod

HADOOP-13153. fix typo in debug statement for dynamic subcommands

Allen Wittenauer 9 år sedan
förälder
incheckning
1d5cc11098

+ 1 - 1
hadoop-common-project/hadoop-common/src/main/bin/hadoop

@@ -197,7 +197,7 @@ shift
 HADOOP_SUBCMD_ARGS=("$@")
 
 if declare -f hadoop_subcommand_"${HADOOP_SUBCMD}" >/dev/null 2>&1; then
-  hadoop_debug "Calling dynamically: hadoop_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[$*]}"
+  hadoop_debug "Calling dynamically: hadoop_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[*]}"
   "hadoop_subcommand_${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"
 else
   hadoopcmd_case "${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"

+ 12 - 0
hadoop-common-project/hadoop-common/src/test/scripts/hadoop_subcommands.bats

@@ -41,6 +41,12 @@ hadoop_subcommand_envcheck ()
   echo ${HADOOP_SHELL_EXECNAME}
   exit 0
 }
+
+hadoop_subcommand_multi ()
+{
+  echo $2
+  exit 0
+}
 TOKEN
   chmod a+rx "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
 }
@@ -64,3 +70,9 @@ TOKEN
   run "${BATS_TEST_DIRNAME}/../../main/bin/hadoop" envcheck
   [ "${output}" = hadoop ]
 }
+
+@test "hadoop_subcommand (multiparams)" {
+  subcommandsetup
+  run "${BATS_TEST_DIRNAME}/../../main/bin/hadoop" multi 1 2
+  [ "${output}" = 2 ]
+}

+ 1 - 1
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs

@@ -279,7 +279,7 @@ shift
 HADOOP_SUBCMD_ARGS=("$@")
 
 if declare -f hdfs_subcommand_"${HADOOP_SUBCMD}" >/dev/null 2>&1; then
-  hadoop_debug "Calling dynamically: hdfs_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[$*]}"
+  hadoop_debug "Calling dynamically: hdfs_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[*]}"
   "hdfs_subcommand_${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"
 else
   hdfscmd_case "${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"

+ 12 - 0
hadoop-hdfs-project/hadoop-hdfs/src/test/scripts/hdfs_subcommands.bats

@@ -41,6 +41,12 @@ hdfs_subcommand_envcheck ()
   echo ${HADOOP_SHELL_EXECNAME}
   exit 0
 }
+
+hdfs_subcommand_multi ()
+{
+  echo $2
+  exit 0
+}
 TOKEN
   chmod a+rx "${HADOOP_LIBEXEC_DIR}/hdfs-config.sh"
 }
@@ -64,3 +70,9 @@ TOKEN
   run "${BATS_TEST_DIRNAME}/../../main/bin/hdfs" envcheck
   [ "${output}" = hdfs ]
 }
+
+@test "hdfs_subcommand (multiparams)" {
+  subcommandsetup
+  run "${BATS_TEST_DIRNAME}/../../main/bin/hdfs" multi 1 2
+  [ "${output}" = 2 ]
+}

+ 1 - 1
hadoop-mapreduce-project/bin/mapred

@@ -144,7 +144,7 @@ shift
 HADOOP_SUBCMD_ARGS=("$@")
 
 if declare -f mapred_subcommand_"${HADOOP_SUBCMD}" >/dev/null 2>&1; then
-  hadoop_debug "Calling dynamically: mapred_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[$*]}"
+  hadoop_debug "Calling dynamically: mapred_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[*]}"
   "mapred_subcommand_${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"
 else
   mapredcmd_case "${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/bin/yarn

@@ -256,7 +256,7 @@ shift
 HADOOP_SUBCMD_ARGS=("$@")
 
 if declare -f yarn_subcommand_"${HADOOP_SUBCMD}" >/dev/null 2>&1; then
-  hadoop_debug "Calling dynamically: yarn_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[$*]}"
+  hadoop_debug "Calling dynamically: yarn_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[*]}"
   "yarn_subcommand_${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"
 else
   yarncmd_case "${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"