Author: vinodkv
Date: Sat Jun 1 22:22:27 2013
New Revision: 1488626
URL: http://svn.apache.org/r1488626
Log:
MAPREDUCE-5274. Bring back SecureShuffleUtils.toHex in mapreduce for binary
compatibility with 1.x APIs. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1488625 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1488626&r1=1488625&r2=1488626&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Sat
Jun 1 22:22:27 2013
@@ -136,6 +136,9 @@ Release 2.1.0-beta - UNRELEASED
MAPREDUCE-5229. Put back FileOutputCommitter.TEMP_DIR_NAME in mapreduce for
binary compatibility with 1.x APIs. (Zhijie Shen via vinodkv)
+ MAPREDUCE-5274. Bring back SecureShuffleUtils.toHex in mapreduce for binary
+ compatibility with 1.x APIs. (Mayank Bansal via vinodkv)
+
OPTIMIZATIONS
MAPREDUCE-4974. Optimising the LineRecordReader initialize() method
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java?rev=1488626&r1=1488625&r2=1488626&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java
Sat Jun 1 22:22:27 2013
@@ -132,4 +132,19 @@ public class SecureShuffleUtils {
private static String buildMsgFrom(String uri_path, String uri_query, int
port) {
return String.valueOf(port) + uri_path + "?" + uri_query;
}
+
+ /**
+ * byte array to Hex String
+ *
+ * @param ba
+ * @return string with HEX value of the key
+ */
+ public static String toHex(byte[] ba) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(baos);
+ for (byte b : ba) {
+ ps.printf("%x", b);
+ }
+ return baos.toString();
+ }
}
