Author: rohini
Date: Wed Sep 2 21:46:10 2015
New Revision: 1700907
URL: http://svn.apache.org/r1700907
Log:
Fix test failure from PIG-4574: Eliminate identity vertex for order by and
skewed join right after LOAD
Modified:
pig/trunk/test/org/apache/pig/test/TestPigServerLocal.java
pig/trunk/test/org/apache/pig/tez/TestTezGraceParallelism.java
Modified: pig/trunk/test/org/apache/pig/test/TestPigServerLocal.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPigServerLocal.java?rev=1700907&r1=1700906&r2=1700907&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPigServerLocal.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPigServerLocal.java Wed Sep 2
21:46:10 2015
@@ -254,8 +254,8 @@ public class TestPigServerLocal {
// createRecordReader->RandomSampleLoader, getSplits,
createRecordReader)
// numTimesSchemaCalled = 4 (once per registerQuery)
if (Util.getLocalTestMode().toString().startsWith("TEZ")) {
- _testSkipParseInRegisterForBatch(false, 6, 4);
- _testSkipParseInRegisterForBatch(true, 3, 1);
+ _testSkipParseInRegisterForBatch(false, 8, 4);
+ _testSkipParseInRegisterForBatch(true, 5, 1);
} else {
_testSkipParseInRegisterForBatch(false, 10, 4);
_testSkipParseInRegisterForBatch(true, 7, 1);
Modified: pig/trunk/test/org/apache/pig/tez/TestTezGraceParallelism.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/tez/TestTezGraceParallelism.java?rev=1700907&r1=1700906&r2=1700907&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/tez/TestTezGraceParallelism.java (original)
+++ pig/trunk/test/org/apache/pig/tez/TestTezGraceParallelism.java Wed Sep 2
21:46:10 2015
@@ -18,8 +18,8 @@
package org.apache.pig.tez;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileWriter;
@@ -118,8 +118,8 @@ public class TestTezGraceParallelism {
// 48(1) /
// However, when 49 finishes, the actual output of 49 only justify
parallelism 1.
// We adjust the parallelism for 61 to 100 based on this.
- // At runtime, ShuffleVertexManager still kick in and further
reduce parallelism from 100 to 1.
- //
+ // At runtime, ShuffleVertexManager still kick in and further
reduce parallelism from 100 to 1.
+ //
pigServer.registerQuery("A = load '" + INPUT_DIR + "/" +
INPUT_FILE1 + "' as (name:chararray, age:int);");
pigServer.registerQuery("B = load '" + INPUT_DIR + "/" +
INPUT_FILE2 + "' as (name:chararray, gender:chararray);");
pigServer.registerQuery("C = join A by name, B by name;");
@@ -159,7 +159,7 @@ public class TestTezGraceParallelism {
// 36(1) /
// However, when 56 finishes, the actual output of 56 need
parallelism 5.
// We adjust the parallelism for 64 to 50 based on this.
- // At runtime, ShuffleVertexManager will play and reduce
parallelism from 50
+ // At runtime, ShuffleVertexManager will play and reduce
parallelism from 50
pigServer.getPigContext().getProperties().setProperty(InputSizeReducerEstimator.BYTES_PER_REDUCER_PARAM,
"80000");
pigServer.registerQuery("A = load '" + INPUT_DIR + "/" +
INPUT_FILE1 + "' as (name:chararray, age:int);");
pigServer.registerQuery("B = load '" + INPUT_DIR + "/" +
INPUT_FILE2 + "' as (name:chararray, gender:chararray);");
@@ -212,8 +212,8 @@ public class TestTezGraceParallelism {
count++;
}
assertEquals(count, 20);
- assertTrue(writer.toString().contains("All predecessors for
scope-79 are finished, time to set parallelism for scope-80"));
- assertTrue(writer.toString().contains("Initialize parallelism for
scope-80 to 101"));
+ assertTrue(writer.toString().contains("All predecessors for
scope-84 are finished, time to set parallelism for scope-85"));
+ assertTrue(writer.toString().contains("Initialize parallelism for
scope-85 to 101"));
} finally {
Util.removeLogAppender(PigGraceShuffleVertexManager.class,
"testJoinWithDifferentDepth");
}
