Author: szetszwo
Date: Fri Jul 26 00:59:44 2013
New Revision: 1507166
URL: http://svn.apache.org/r1507166
Log:
svn merge -c 1507165 from trunk for HADOOP-9773. TestLightWeightCache should
not set size limit to zero when esting it.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLightWeightCache.java
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1507165
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1507166&r1=1507165&r2=1507166&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Jul 26 00:59:44 2013
@@ -344,6 +344,9 @@ Release 2.1.0-beta - 2013-07-02
HADOOP-9759. Add support for NativeCodeLoader#getLibraryName on Windows.
(Chuan Liu via cnauroth)
+ HADOOP-9773. TestLightWeightCache should not set size limit to zero when
+ testing it. (szetszwo)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1507165
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1507165
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1507165
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLightWeightCache.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLightWeightCache.java?rev=1507166&r1=1507165&r2=1507166&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLightWeightCache.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLightWeightCache.java
Fri Jul 26 00:59:44 2013
@@ -27,9 +27,10 @@ import org.junit.Test;
/** Testing {@link LightWeightCache} */
public class TestLightWeightCache {
private static final long starttime = Time.now();
- private static final Random ran = new Random(starttime);
+ private static final long seed = starttime;
+ private static final Random ran = new Random(seed);
static {
- println("Start time = " + new Date(starttime) + ", seed=" + starttime);
+ println("Start time = " + new Date(starttime) + ", seed=" + seed);
}
private static void print(Object s) {
@@ -65,7 +66,7 @@ public class TestLightWeightCache {
final int dataSize = 1 << 16;
for(int i = 0; i < 10; i++) {
final int modulus = ran.nextInt(1024) + 1;
- final int sizeLimit = ran.nextInt(modulus);
+ final int sizeLimit = ran.nextInt(modulus) + 1;
checkSizeLimit(sizeLimit, dataSize, modulus);
}
}
