Repository: tez Updated Branches: refs/heads/master 4c28bdaa5 -> 1e680a53a
TEZ-1995. Build failure against hadoop 2.2 (rbalamohan) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/1e680a53 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/1e680a53 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/1e680a53 Branch: refs/heads/master Commit: 1e680a53a4b18d49d7c754b71b94b128d014bfa1 Parents: 4c28bda Author: Rajesh Balamohan <[email protected]> Authored: Wed Jan 28 06:06:12 2015 +0530 Committer: Rajesh Balamohan <[email protected]> Committed: Wed Jan 28 06:47:29 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-runtime-library/pom.xml | 4 ++++ .../library/common/sort/impl/TestPipelinedSorter.java | 8 +++----- .../library/common/sort/impl/dflt/TestDefaultSorter.java | 7 +++---- 4 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/1e680a53/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a3350bb..9afb953 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ Release 0.7.0: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-1995. Build failure against hadoop 2.2. TEZ-1997. Remove synchronization DefaultSorter::isRLENeeded() (Causes sorter to hang indefinitely in large jobs). TEZ-1996. Update Website after 0.6.0 TEZ-1803. Support > 2gb sort buffer in pipelinedsorter. http://git-wip-us.apache.org/repos/asf/tez/blob/1e680a53/tez-runtime-library/pom.xml ---------------------------------------------------------------------- diff --git a/tez-runtime-library/pom.xml b/tez-runtime-library/pom.xml index e931f9d..539ca10 100644 --- a/tez-runtime-library/pom.xml +++ b/tez-runtime-library/pom.xml @@ -62,6 +62,10 @@ <artifactId>hadoop-yarn-common</artifactId> </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/tez/blob/1e680a53/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestPipelinedSorter.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestPipelinedSorter.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestPipelinedSorter.java index 4595c18..0a070ff 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestPipelinedSorter.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestPipelinedSorter.java @@ -1,7 +1,7 @@ package org.apache.tez.runtime.library.common.sort.impl; import com.google.common.collect.Maps; -import org.apache.commons.math3.random.RandomDataGenerator; +import org.apache.commons.lang.RandomStringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -21,7 +21,6 @@ import org.junit.Before; import org.junit.Test; import java.io.IOException; -import java.util.List; import java.util.Map; import java.util.TreeMap; import java.util.UUID; @@ -148,10 +147,9 @@ public class TestPipelinedSorter { private void writeData(ExternalSorter sorter, int numKeys, int keyLen) throws IOException { sortedDataMap.clear(); - RandomDataGenerator generator = new RandomDataGenerator(); for (int i = 0; i < numKeys; i++) { - Text key = new Text(generator.nextHexString(keyLen)); - Text value = new Text(generator.nextHexString(keyLen)); + Text key = new Text(RandomStringUtils.randomAlphanumeric(keyLen)); + Text value = new Text(RandomStringUtils.randomAlphanumeric(keyLen)); sorter.write(key, value); sortedDataMap.put(key.toString(), value.toString()); //for verifying data later } http://git-wip-us.apache.org/repos/asf/tez/blob/1e680a53/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/dflt/TestDefaultSorter.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/dflt/TestDefaultSorter.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/dflt/TestDefaultSorter.java index 1f5f67c..56c6e38 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/dflt/TestDefaultSorter.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/dflt/TestDefaultSorter.java @@ -29,7 +29,7 @@ import static org.mockito.Mockito.mock; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.commons.math3.random.RandomDataGenerator; +import org.apache.commons.lang.RandomStringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -138,10 +138,9 @@ public class TestDefaultSorter { } private void writeData(ExternalSorter sorter, int numKeys, int keyLen) throws IOException { - RandomDataGenerator generator = new RandomDataGenerator(); for (int i = 0; i < numKeys; i++) { - Text key = new Text(generator.nextHexString(keyLen)); - Text value = new Text(generator.nextHexString(keyLen)); + Text key = new Text(RandomStringUtils.randomAlphanumeric(keyLen)); + Text value = new Text(RandomStringUtils.randomAlphanumeric(keyLen)); sorter.write(key, value); } sorter.flush();
