svn commit: r1404285 - in /hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common: ./ src/main/docs/ src/main/java/ src/main/java/org/apache/hadoop/conf/ src/main/java/org/apache/hadoop/

2012-10-31 Thread szetszwo 
Author: szetszwo
Date: Wed Oct 31 18:34:51 2012
New Revision: 1404285

URL: http://svn.apache.org/viewvc?rev=1404285&view=rev
Log:
Merge r1403306 through r1404284 from trunk.

Modified:

hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
   (contents, props changed)

hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/
   (props changed)

hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/
   (props changed)

hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java

hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java

hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java

hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/core/
   (props changed)

Modified: 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1404285&r1=1404284&r2=1404285&view=diff
==
--- 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
 Wed Oct 31 18:34:51 2012
@@ -1106,6 +1106,8 @@ Release 0.23.5 - UNRELEASED
 HADOOP-8962. RawLocalFileSystem.listStatus fails when a child filename
 contains a colon (jlowe via bobby)
 
+HADOOP-8986. Server$Call object is never released after it is sent (bobby)
+
 Release 0.23.4 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Propchange: 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
--
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1403306-1404284

Propchange: 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/
--
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1403306-1404284

Propchange: 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/
--
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1403306-1404284

Modified: 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1404285&r1=1404284&r2=1404285&view=diff
==
--- 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
 (original)
+++ 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
 Wed Oct 31 18:34:51 2012
@@ -75,6 +75,7 @@ import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.StringInterner;
 import org.apache.hadoop.util.StringUtils;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
@@ -2002,13 +2003,16 @@ public class Configuration implements It
 continue;
   Element field = (Element)fieldNode;
   if ("name".equals(field.getTagName()) && field.hasChildNodes())
-attr = ((Text)field.getFirstChild()).getData().trim();
+attr = StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData().trim());
   if ("value".equals(field.getTagName()) && field.hasChildNodes())
-value = ((Text)field.getFirstChild()).getData();
+value = StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData());
   if ("final".equals(field.getTagName()) && field.hasChildNodes())
 finalParameter = 
"true".equals(((Text)field.getFirstChild()).getData());
   if ("source".equals(field.getTagName()) && field.hasChildNodes())
-source.add(((Text)field.getFirstChild()).getData());
+source.add(StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData()));
 }
 source.add(name);
 

Modified: 
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL: 
http:

svn commit: r1404285 - /hadoop/common/branches/HDFS-2802/

2012-10-31 Thread szetszwo 
Author: szetszwo
Date: Wed Oct 31 18:34:51 2012
New Revision: 1404285

URL: http://svn.apache.org/viewvc?rev=1404285&view=rev
Log:
Merge r1403306 through r1404284 from trunk.

Modified:
hadoop/common/branches/HDFS-2802/   (props changed)

Propchange: hadoop/common/branches/HDFS-2802/
--
  Merged /hadoop/common/trunk:r1403306-1404284

svn commit: r1404182 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop: conf/Configuration.java util/StringInterner.java

2012-10-31 Thread tgraves 
Author: tgraves
Date: Wed Oct 31 15:02:59 2012
New Revision: 1404182

URL: http://svn.apache.org/viewvc?rev=1404182&view=rev
Log:
merge -r 1404176:1404177  from trunk. FIXES: MAPREDUCE-4752

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1404182&r1=1404181&r2=1404182&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
 Wed Oct 31 15:02:59 2012
@@ -75,6 +75,7 @@ import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.StringInterner;
 import org.apache.hadoop.util.StringUtils;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
@@ -1964,13 +1965,16 @@ public class Configuration implements It
 continue;
   Element field = (Element)fieldNode;
   if ("name".equals(field.getTagName()) && field.hasChildNodes())
-attr = ((Text)field.getFirstChild()).getData().trim();
+attr = StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData().trim());
   if ("value".equals(field.getTagName()) && field.hasChildNodes())
-value = ((Text)field.getFirstChild()).getData();
+value = StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData());
   if ("final".equals(field.getTagName()) && field.hasChildNodes())
 finalParameter = 
"true".equals(((Text)field.getFirstChild()).getData());
   if ("source".equals(field.getTagName()) && field.hasChildNodes())
-source.add(((Text)field.getFirstChild()).getData());
+source.add(StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData()));
 }
 source.add(name);
 

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java?rev=1404182&r1=1404181&r2=1404182&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
 Wed Oct 31 15:02:59 2012
@@ -59,6 +59,9 @@ public class StringInterner {
* @return strong reference to interned string instance
*/
   public static String strongIntern(String sample) {
+if (sample == null) {
+  return null;
+}
 return strongInterner.intern(sample);
   }
   
@@ -72,6 +75,9 @@ public class StringInterner {
* @return weak reference to interned string instance
*/
   public static String weakIntern(String sample) {
+if (sample == null) {
+  return null;
+}
 return weakInterner.intern(sample);
   }

svn commit: r1404179 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop: conf/Configuration.java util/StringInterner.java

2012-10-31 Thread tgraves 
Author: tgraves
Date: Wed Oct 31 14:59:47 2012
New Revision: 1404179

URL: http://svn.apache.org/viewvc?rev=1404179&view=rev
Log:
MAPREDUCE-4752. Reduce MR AM memory usage through String Interning (Robert 
Evans via tgraves)

Modified:

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1404179&r1=1404178&r2=1404179&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
 Wed Oct 31 14:59:47 2012
@@ -74,6 +74,7 @@ import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.StringInterner;
 import org.apache.hadoop.util.StringUtils;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
@@ -1916,13 +1917,16 @@ public class Configuration implements It
 continue;
   Element field = (Element)fieldNode;
   if ("name".equals(field.getTagName()) && field.hasChildNodes())
-attr = ((Text)field.getFirstChild()).getData().trim();
+attr = StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData().trim());
   if ("value".equals(field.getTagName()) && field.hasChildNodes())
-value = ((Text)field.getFirstChild()).getData();
+value = StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData());
   if ("final".equals(field.getTagName()) && field.hasChildNodes())
 finalParameter = 
"true".equals(((Text)field.getFirstChild()).getData());
   if ("source".equals(field.getTagName()) && field.hasChildNodes())
-source.add(((Text)field.getFirstChild()).getData());
+source.add(StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData()));
 }
 source.add(name);
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java?rev=1404179&r1=1404178&r2=1404179&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
 Wed Oct 31 14:59:47 2012
@@ -59,6 +59,9 @@ public class StringInterner {
* @return strong reference to interned string instance
*/
   public static String strongIntern(String sample) {
+if (sample == null) {
+  return null;
+}
 return strongInterner.intern(sample);
   }
   
@@ -72,6 +75,9 @@ public class StringInterner {
* @return weak reference to interned string instance
*/
   public static String weakIntern(String sample) {
+if (sample == null) {
+  return null;
+}
 return weakInterner.intern(sample);
   }

svn commit: r1404177 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop: conf/Configuration.java util/StringInterner.java

2012-10-31 Thread tgraves 
Author: tgraves
Date: Wed Oct 31 14:57:12 2012
New Revision: 1404177

URL: http://svn.apache.org/viewvc?rev=1404177&view=rev
Log:
MAPREDUCE-4752. Reduce MR AM memory usage through String Interning (Robert 
Evans via tgraves)

Modified:

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1404177&r1=1404176&r2=1404177&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
 Wed Oct 31 14:57:12 2012
@@ -75,6 +75,7 @@ import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.StringInterner;
 import org.apache.hadoop.util.StringUtils;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
@@ -2002,13 +2003,16 @@ public class Configuration implements It
 continue;
   Element field = (Element)fieldNode;
   if ("name".equals(field.getTagName()) && field.hasChildNodes())
-attr = ((Text)field.getFirstChild()).getData().trim();
+attr = StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData().trim());
   if ("value".equals(field.getTagName()) && field.hasChildNodes())
-value = ((Text)field.getFirstChild()).getData();
+value = StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData());
   if ("final".equals(field.getTagName()) && field.hasChildNodes())
 finalParameter = 
"true".equals(((Text)field.getFirstChild()).getData());
   if ("source".equals(field.getTagName()) && field.hasChildNodes())
-source.add(((Text)field.getFirstChild()).getData());
+source.add(StringInterner.weakIntern(
+((Text)field.getFirstChild()).getData()));
 }
 source.add(name);
 

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java?rev=1404177&r1=1404176&r2=1404177&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
 Wed Oct 31 14:57:12 2012
@@ -59,6 +59,9 @@ public class StringInterner {
* @return strong reference to interned string instance
*/
   public static String strongIntern(String sample) {
+if (sample == null) {
+  return null;
+}
 return strongInterner.intern(sample);
   }
   
@@ -72,6 +75,9 @@ public class StringInterner {
* @return weak reference to interned string instance
*/
   public static String weakIntern(String sample) {
+if (sample == null) {
+  return null;
+}
 return weakInterner.intern(sample);
   }