Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F3C97D8E6 for ; Sat, 20 Oct 2012 00:35:08 +0000 (UTC) Received: (qmail 24586 invoked by uid 500); 20 Oct 2012 00:35:08 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 24530 invoked by uid 500); 20 Oct 2012 00:35:08 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 24520 invoked by uid 99); 20 Oct 2012 00:35:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Oct 2012 00:35:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Oct 2012 00:35:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E6FAA2388A68; Sat, 20 Oct 2012 00:34:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1400351 [3/3] - in /hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project: ./ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/mai... Date: Sat, 20 Oct 2012 00:34:02 -0000 To: mapreduce-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121020003403.E6FAA2388A68@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java?rev=1400351&r1=1400350&r2=1400351&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java (original) +++ hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java Sat Oct 20 00:33:57 2012 @@ -317,7 +317,7 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test0): " + split); } - assertEquals(splits.size(), 1); + assertEquals(1, splits.size()); CombineFileSplit fileSplit = (CombineFileSplit) splits.get(0); assertEquals(2, fileSplit.getNumPaths()); assertEquals(1, fileSplit.getLocations().length); @@ -347,24 +347,24 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test1): " + split); } - assertEquals(splits.size(), 2); + assertEquals(2, splits.size()); fileSplit = (CombineFileSplit) splits.get(0); - assertEquals(fileSplit.getNumPaths(), 2); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], hosts2[0]); // should be on r2 - fileSplit = (CombineFileSplit) splits.get(1); - assertEquals(fileSplit.getNumPaths(), 1); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file1.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], hosts1[0]); // should be on r1 + assertEquals(2, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file2.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file2.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals(hosts2[0], fileSplit.getLocations()[0]); // should be on r2 + fileSplit = (CombineFileSplit) splits.get(1); + assertEquals(1, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file1.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(hosts1[0], fileSplit.getLocations()[0]); // should be on r1 // create another file on 3 datanodes and 3 racks. dfs.startDataNodes(conf, 1, true, null, rack3, hosts3, null); @@ -378,37 +378,37 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test2): " + split); } - assertEquals(splits.size(), 3); + assertEquals(3, splits.size()); fileSplit = (CombineFileSplit) splits.get(0); - assertEquals(fileSplit.getNumPaths(), 3); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getPath(2).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(2), 2 * BLOCKSIZE); - assertEquals(fileSplit.getLength(2), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], hosts3[0]); // should be on r3 - fileSplit = (CombineFileSplit) splits.get(1); - assertEquals(fileSplit.getNumPaths(), 2); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], hosts2[0]); // should be on r2 - fileSplit = (CombineFileSplit) splits.get(2); - assertEquals(fileSplit.getNumPaths(), 1); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file1.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], hosts1[0]); // should be on r1 + assertEquals(3, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file3.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file3.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals(file3.getName(), fileSplit.getPath(2).getName()); + assertEquals(2 * BLOCKSIZE, fileSplit.getOffset(2)); + assertEquals(BLOCKSIZE, fileSplit.getLength(2)); + assertEquals(hosts3[0], fileSplit.getLocations()[0]); // should be on r3 + fileSplit = (CombineFileSplit) splits.get(1); + assertEquals(2, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file2.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file2.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals(hosts2[0], fileSplit.getLocations()[0]); // should be on r2 + fileSplit = (CombineFileSplit) splits.get(2); + assertEquals(1, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file1.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(hosts1[0], fileSplit.getLocations()[0]); // should be on r1 // create file4 on all three racks Path file4 = new Path(dir4 + "/file4"); @@ -420,37 +420,37 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test3): " + split); } - assertEquals(splits.size(), 3); + assertEquals(3, splits.size()); fileSplit = (CombineFileSplit) splits.get(0); - assertEquals(fileSplit.getNumPaths(), 6); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getPath(2).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(2), 2 * BLOCKSIZE); - assertEquals(fileSplit.getLength(2), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], hosts3[0]); // should be on r3 - fileSplit = (CombineFileSplit) splits.get(1); - assertEquals(fileSplit.getNumPaths(), 2); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], hosts2[0]); // should be on r2 - fileSplit = (CombineFileSplit) splits.get(2); - assertEquals(fileSplit.getNumPaths(), 1); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file1.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], hosts1[0]); // should be on r1 + assertEquals(6, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file3.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file3.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals(file3.getName(), fileSplit.getPath(2).getName()); + assertEquals(2 * BLOCKSIZE, fileSplit.getOffset(2)); + assertEquals(BLOCKSIZE, fileSplit.getLength(2)); + assertEquals(hosts3[0], fileSplit.getLocations()[0]); // should be on r3 + fileSplit = (CombineFileSplit) splits.get(1); + assertEquals(2, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file2.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file2.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals(hosts2[0], fileSplit.getLocations()[0]); // should be on r2 + fileSplit = (CombineFileSplit) splits.get(2); + assertEquals(1, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file1.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(hosts1[0], fileSplit.getLocations()[0]); // should be on r1 // maximum split size is 2 blocks inFormat = new DummyInputFormat(); @@ -462,35 +462,35 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test4): " + split); } - assertEquals(splits.size(), 5); + assertEquals(5, splits.size()); fileSplit = (CombineFileSplit) splits.get(0); - assertEquals(fileSplit.getNumPaths(), 2); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], "host3.rack3.com"); - fileSplit = (CombineFileSplit) splits.get(1); - assertEquals(fileSplit.getPath(0).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(0), 2 * BLOCKSIZE); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file4.getName()); - assertEquals(fileSplit.getOffset(1), 0); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], "host3.rack3.com"); - fileSplit = (CombineFileSplit) splits.get(2); - assertEquals(fileSplit.getNumPaths(), 2); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file4.getName()); - assertEquals(fileSplit.getOffset(0), BLOCKSIZE); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file4.getName()); - assertEquals(fileSplit.getOffset(1), 2 * BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], "host3.rack3.com"); + assertEquals(2, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file3.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file3.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals("host3.rack3.com", fileSplit.getLocations()[0]); + fileSplit = (CombineFileSplit) splits.get(1); + assertEquals(file3.getName(), fileSplit.getPath(0).getName()); + assertEquals(2 * BLOCKSIZE, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file4.getName(), fileSplit.getPath(1).getName()); + assertEquals(0, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals("host3.rack3.com", fileSplit.getLocations()[0]); + fileSplit = (CombineFileSplit) splits.get(2); + assertEquals(2, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file4.getName(), fileSplit.getPath(0).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file4.getName(), fileSplit.getPath(1).getName()); + assertEquals(2 * BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals("host3.rack3.com", fileSplit.getLocations()[0]); // maximum split size is 3 blocks inFormat = new DummyInputFormat(); @@ -502,48 +502,48 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test5): " + split); } - assertEquals(splits.size(), 4); + assertEquals(4, splits.size()); fileSplit = (CombineFileSplit) splits.get(0); - assertEquals(fileSplit.getNumPaths(), 3); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getPath(2).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(2), 2 * BLOCKSIZE); - assertEquals(fileSplit.getLength(2), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], "host3.rack3.com"); - fileSplit = (CombineFileSplit) splits.get(1); - assertEquals(fileSplit.getPath(0).getName(), file4.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file4.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getPath(2).getName(), file4.getName()); - assertEquals(fileSplit.getOffset(2), 2 * BLOCKSIZE); - assertEquals(fileSplit.getLength(2), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], "host3.rack3.com"); - fileSplit = (CombineFileSplit) splits.get(2); - assertEquals(fileSplit.getNumPaths(), 2); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], "host2.rack2.com"); + assertEquals(3, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file3.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file3.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals(file3.getName(), fileSplit.getPath(2).getName()); + assertEquals(2 * BLOCKSIZE, fileSplit.getOffset(2)); + assertEquals(BLOCKSIZE, fileSplit.getLength(2)); + assertEquals("host3.rack3.com", fileSplit.getLocations()[0]); + fileSplit = (CombineFileSplit) splits.get(1); + assertEquals(file4.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file4.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals(file4.getName(), fileSplit.getPath(2).getName()); + assertEquals( 2 * BLOCKSIZE, fileSplit.getOffset(2)); + assertEquals(BLOCKSIZE, fileSplit.getLength(2)); + assertEquals("host3.rack3.com", fileSplit.getLocations()[0]); + fileSplit = (CombineFileSplit) splits.get(2); + assertEquals(2, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file2.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file2.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals("host2.rack2.com", fileSplit.getLocations()[0]); fileSplit = (CombineFileSplit) splits.get(3); - assertEquals(fileSplit.getNumPaths(), 1); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file1.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], "host1.rack1.com"); + assertEquals(1, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file1.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals("host1.rack1.com", fileSplit.getLocations()[0]); // maximum split size is 4 blocks inFormat = new DummyInputFormat(); @@ -553,42 +553,42 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test6): " + split); } - assertEquals(splits.size(), 3); + assertEquals(3, splits.size()); fileSplit = (CombineFileSplit) splits.get(0); - assertEquals(fileSplit.getNumPaths(), 4); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getPath(2).getName(), file3.getName()); - assertEquals(fileSplit.getOffset(2), 2 * BLOCKSIZE); - assertEquals(fileSplit.getLength(2), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], "host3.rack3.com"); - fileSplit = (CombineFileSplit) splits.get(1); - assertEquals(fileSplit.getNumPaths(), 4); - assertEquals(fileSplit.getPath(0).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getPath(1).getName(), file2.getName()); - assertEquals(fileSplit.getOffset(1), BLOCKSIZE); - assertEquals(fileSplit.getLength(1), BLOCKSIZE); - assertEquals(fileSplit.getPath(2).getName(), file4.getName()); - assertEquals(fileSplit.getOffset(2), BLOCKSIZE); - assertEquals(fileSplit.getLength(2), BLOCKSIZE); - assertEquals(fileSplit.getPath(3).getName(), file4.getName()); - assertEquals(fileSplit.getOffset(3), 2 * BLOCKSIZE); - assertEquals(fileSplit.getLength(3), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], "host2.rack2.com"); - fileSplit = (CombineFileSplit) splits.get(2); - assertEquals(fileSplit.getNumPaths(), 1); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getPath(0).getName(), file1.getName()); - assertEquals(fileSplit.getOffset(0), 0); - assertEquals(fileSplit.getLength(0), BLOCKSIZE); - assertEquals(fileSplit.getLocations()[0], hosts1[0]); // should be on r1 + assertEquals(4, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file3.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file3.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals(file3.getName(), fileSplit.getPath(2).getName()); + assertEquals(2 * BLOCKSIZE, fileSplit.getOffset(2)); + assertEquals(BLOCKSIZE, fileSplit.getLength(2)); + assertEquals("host3.rack3.com", fileSplit.getLocations()[0]); + fileSplit = (CombineFileSplit) splits.get(1); + assertEquals(4, fileSplit.getNumPaths()); + assertEquals(file2.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(file2.getName(), fileSplit.getPath(1).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(1)); + assertEquals(BLOCKSIZE, fileSplit.getLength(1)); + assertEquals(file4.getName(), fileSplit.getPath(2).getName()); + assertEquals(BLOCKSIZE, fileSplit.getOffset(2)); + assertEquals(BLOCKSIZE, fileSplit.getLength(2)); + assertEquals(file4.getName(), fileSplit.getPath(3).getName()); + assertEquals( 2 * BLOCKSIZE, fileSplit.getOffset(3)); + assertEquals(BLOCKSIZE, fileSplit.getLength(3)); + assertEquals("host2.rack2.com", fileSplit.getLocations()[0]); + fileSplit = (CombineFileSplit) splits.get(2); + assertEquals(1, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(file1.getName(), fileSplit.getPath(0).getName()); + assertEquals(0, fileSplit.getOffset(0)); + assertEquals(BLOCKSIZE, fileSplit.getLength(0)); + assertEquals(hosts1[0], fileSplit.getLocations()[0]); // should be on r1 // maximum split size is 7 blocks and min is 3 blocks inFormat = new DummyInputFormat(); @@ -601,15 +601,15 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test7): " + split); } - assertEquals(splits.size(), 2); + assertEquals(2, splits.size()); fileSplit = (CombineFileSplit) splits.get(0); - assertEquals(fileSplit.getNumPaths(), 6); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getLocations()[0], "host3.rack3.com"); - fileSplit = (CombineFileSplit) splits.get(1); - assertEquals(fileSplit.getNumPaths(), 3); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getLocations()[0], "host1.rack1.com"); + assertEquals(6, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals("host3.rack3.com", fileSplit.getLocations()[0]); + fileSplit = (CombineFileSplit) splits.get(1); + assertEquals(3, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals("host1.rack1.com", fileSplit.getLocations()[0]); // Rack 1 has file1, file2 and file3 and file4 // Rack 2 has file2 and file3 and file4 @@ -624,19 +624,19 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test1): " + split); } - assertEquals(splits.size(), 3); + assertEquals(3, splits.size()); fileSplit = (CombineFileSplit) splits.get(0); - assertEquals(fileSplit.getNumPaths(), 2); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getLocations()[0], hosts2[0]); // should be on r2 - fileSplit = (CombineFileSplit) splits.get(1); - assertEquals(fileSplit.getNumPaths(), 1); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getLocations()[0], hosts1[0]); // should be on r1 - fileSplit = (CombineFileSplit) splits.get(2); - assertEquals(fileSplit.getNumPaths(), 6); - assertEquals(fileSplit.getLocations().length, 1); - assertEquals(fileSplit.getLocations()[0], hosts3[0]); // should be on r3 + assertEquals(2, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(hosts2[0], fileSplit.getLocations()[0]); // should be on r2 + fileSplit = (CombineFileSplit) splits.get(1); + assertEquals(1, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(hosts1[0], fileSplit.getLocations()[0]); // should be on r1 + fileSplit = (CombineFileSplit) splits.get(2); + assertEquals(6, fileSplit.getNumPaths()); + assertEquals(1, fileSplit.getLocations().length); + assertEquals(hosts3[0], fileSplit.getLocations()[0]); // should be on r3 // measure performance when there are multiple pools and // many files in each pool. @@ -669,7 +669,7 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test8): " + split); } - assertEquals(6, splits.size()); + assertEquals(splits.size(), 6); } finally { if (dfs != null) { @@ -750,7 +750,7 @@ public class TestCombineFileInputFormat for (InputSplit split : splits) { System.out.println("File split(Test0): " + split); } - assertEquals(splits.size(), 1); + assertEquals(1, splits.size()); CombineFileSplit fileSplit = (CombineFileSplit) splits.get(0); assertEquals(2, fileSplit.getNumPaths()); assertEquals(1, fileSplit.getLocations().length); @@ -1135,7 +1135,7 @@ public class TestCombineFileInputFormat Job job = Job.getInstance(conf); FileInputFormat.setInputPaths(job, "test"); List splits = inFormat.getSplits(job); - assertEquals(splits.size(), 1); + assertEquals(1, splits.size()); CombineFileSplit fileSplit = (CombineFileSplit) splits.get(0); assertEquals(1, fileSplit.getNumPaths()); assertEquals(file.getName(), fileSplit.getPath(0).getName()); Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/c++/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/c++:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/contrib/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/contrib/block_forensics/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/contrib/build-contrib.xml ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/contrib/build.xml ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/contrib/data_join/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/contrib/index/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/contrib/vaidya/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/examples/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/examples:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/java:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/test/mapred/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:r1399946-1400349 Propchange: hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/src/webapps/job/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:r1399946-1400349