You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2015/01/21 22:53:08 UTC
[1/2] hadoop git commit: MAPREDUCE-3283. mapred classpath CLI does
not display the complete classpath. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 95858db0c -> 60dc848f2
refs/heads/trunk c0af72c7f -> 074259133
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/trunk
Commit: 0742591335f15d2f8916555704c2db6124107618
Parents: c0af72c
Author: cnauroth <cn...@apache.org>
Authored: Wed Jan 21 13:50:39 2015 -0800
Committer: cnauroth <cn...@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
[2/2] hadoop git commit: MAPREDUCE-3283. mapred classpath CLI does
not display the complete classpath. Contributed by Varun Saxena.
Posted by cn...@apache.org.
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/60dc848f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/60dc848f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/60dc848f
Branch: refs/heads/branch-2
Commit: 60dc848f239841b42ae79b45be71bb476db8452d
Parents: 95858db
Author: cnauroth <cn...@apache.org>
Authored: Wed Jan 21 13:52:09 2015 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Wed Jan 21 13:52:09 2015 -0800
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
hadoop-mapreduce-project/bin/mapred | 12 ++++++++----
hadoop-mapreduce-project/bin/mapred.cmd | 10 +++++++++-
3 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/60dc848f/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 78099d4..56a7b22 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -77,6 +77,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/60dc848f/hadoop-mapreduce-project/bin/mapred
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred
index 1b54bc7..a70faf0 100755
--- a/hadoop-mapreduce-project/bin/mapred
+++ b/hadoop-mapreduce-project/bin/mapred
@@ -148,11 +148,15 @@ for f in $HADOOP_MAPRED_HOME/modules/*.jar; do
done
if [ "$COMMAND" = "classpath" ] ; then
- if $cygwin; then
- CLASSPATH=$(cygpath -p -w "$CLASSPATH" 2>/dev/null)
+ if [ "$#" -gt 0 ]; then
+ CLASS=org.apache.hadoop.util.Classpath
+ else
+ if $cygwin; then
+ CLASSPATH=$(cygpath -p -w "$CLASSPATH" 2>/dev/null)
+ fi
+ echo $CLASSPATH
+ exit 0
fi
- echo $CLASSPATH
- exit
fi
# cygwin path translation
http://git-wip-us.apache.org/repos/asf/hadoop/blob/60dc848f/hadoop-mapreduce-project/bin/mapred.cmd
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/bin/mapred.cmd b/hadoop-mapreduce-project/bin/mapred.cmd
index c7bc801..550b1ed 100644
--- a/hadoop-mapreduce-project/bin/mapred.cmd
+++ b/hadoop-mapreduce-project/bin/mapred.cmd
@@ -94,6 +94,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%
@@ -102,7 +110,7 @@ goto :eof
:classpath
- @echo %CLASSPATH%
+ set CLASS=org.apache.hadoop.util.Classpath
goto :eof
:job