hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjs...@apache.org
Subject [09/50] [abbrv] hadoop git commit: MAPREDUCE-3283. mapred classpath CLI does not display the complete classpath. Contributed by Varun Saxena.
Date Tue, 27 Jan 2015 18:40:27 GMT
MAPREDUCE-3283. mapred classpath CLI does not display the complete classpath. Contributed by
Varun Saxena.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/07425913
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/07425913
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/07425913

Branch: refs/heads/YARN-2928
Commit: 0742591335f15d2f8916555704c2db6124107618
Parents: c0af72c
Author: cnauroth <cnauroth@apache.org>
Authored: Wed Jan 21 13:50:39 2015 -0800
Committer: cnauroth <cnauroth@apache.org>
Committed: Wed Jan 21 13:50:39 2015 -0800

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt    |  3 +++
 hadoop-mapreduce-project/bin/mapred     |  4 +---
 hadoop-mapreduce-project/bin/mapred.cmd | 10 +++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/07425913/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index a7379ec..489369d 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -307,6 +307,9 @@ Release 2.7.0 - UNRELEASED
     MAPREDUCE-6206. TestAggregatedTransferRate fails on non-US systems (Jens
     Rabe via jlowe)
 
+    MAPREDUCE-3283. mapred classpath CLI does not display the complete classpath
+    (Varun Saxena via cnauroth)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/07425913/hadoop-mapreduce-project/bin/mapred
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred
index 066c438..6d0c781 100755
--- a/hadoop-mapreduce-project/bin/mapred
+++ b/hadoop-mapreduce-project/bin/mapred
@@ -78,9 +78,7 @@ case ${COMMAND} in
     HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_CLIENT_OPTS}"
   ;;
   classpath)
-    hadoop_finalize
-    echo "${CLASSPATH}"
-    exit 0
+    hadoop_do_classpath_subcommand "$@" 
   ;;
   distcp)
     CLASS=org.apache.hadoop.tools.DistCp

http://git-wip-us.apache.org/repos/asf/hadoop/blob/07425913/hadoop-mapreduce-project/bin/mapred.cmd
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/bin/mapred.cmd b/hadoop-mapreduce-project/bin/mapred.cmd
index bb59c03..4085599 100644
--- a/hadoop-mapreduce-project/bin/mapred.cmd
+++ b/hadoop-mapreduce-project/bin/mapred.cmd
@@ -95,6 +95,14 @@ if "%1" == "--loglevel" (
   @rem add modules to CLASSPATH
   set CLASSPATH=%CLASSPATH%;%HADOOP_MAPRED_HOME%\modules\*
 
+  if %mapred-command% == classpath (
+    if not defined mapred-command-arguments (
+      @rem No need to bother starting up a JVM for this simple case.
+      @echo %CLASSPATH%
+      exit /b
+    )
+  )
+
   call :%mapred-command% %mapred-command-arguments%
   set java_arguments=%JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% %mapred-command-arguments%
   call %JAVA% %java_arguments%
@@ -103,7 +111,7 @@ goto :eof
 
 
 :classpath
-  @echo %CLASSPATH%
+  set CLASS=org.apache.hadoop.util.Classpath
   goto :eof
 
 :job


Mime
View raw message