Author: szita
Date: Tue May 30 09:32:31 2017
New Revision: 1796822
URL: http://svn.apache.org/viewvc?rev=1796822&view=rev
Log:
PIG-5244: Several unit tests are failing in Tez mode after merging spark branch
(nkollar via szita)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/build.xml
pig/trunk/test/excluded-tests-mr
pig/trunk/test/excluded-tests-tez
pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1796822&r1=1796821&r2=1796822&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue May 30 09:32:31 2017
@@ -122,6 +122,8 @@ OPTIMIZATIONS
Â
BUG FIXES
+PIG-5244: Several unit tests are failing in Tez mode after merging spark
branch (nkollar via szita)
+
PIG-5207: BugFix e2e tests fail on spark (szita)
PIG-5194: HiveUDF fails with Spark exec type (szita)
Modified: pig/trunk/build.xml
URL:
http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1796822&r1=1796821&r2=1796822&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Tue May 30 09:32:31 2017
@@ -909,6 +909,9 @@
<sysproperty key="test.exec.type" value="${test.exec.type}" />
<sysproperty key="ssh.gateway" value="${ssh.gateway}" />
<sysproperty key="hod.server" value="${hod.server}" />
+ <sysproperty key="build.classes" value="${build.classes}" />
+ <sysproperty key="test.build.classes"
value="${test.build.classes}" />
+ <sysproperty key="ivy.lib.dir" value="${ivy.lib.dir}" />
<sysproperty key="java.io.tmpdir" value="${junit.tmp.dir}" />
<sysproperty key="hadoop.log.dir" value="${test.log.dir}"/>
<jvmarg line="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M
${debugArgs} -Djava.library.path=${hadoop.root}\bin"/>
Modified: pig/trunk/test/excluded-tests-mr
URL:
http://svn.apache.org/viewvc/pig/trunk/test/excluded-tests-mr?rev=1796822&r1=1796821&r2=1796822&view=diff
==============================================================================
--- pig/trunk/test/excluded-tests-mr (original)
+++ pig/trunk/test/excluded-tests-mr Tue May 30 09:32:31 2017
@@ -1,2 +1,2 @@
**/tez/*.java
-+**/spark/*.java
\ No newline at end of file
+**/spark/*.java
\ No newline at end of file
Modified: pig/trunk/test/excluded-tests-tez
URL:
http://svn.apache.org/viewvc/pig/trunk/test/excluded-tests-tez?rev=1796822&r1=1796821&r2=1796822&view=diff
==============================================================================
--- pig/trunk/test/excluded-tests-tez (original)
+++ pig/trunk/test/excluded-tests-tez Tue May 30 09:32:31 2017
@@ -1,2 +1,2 @@
**/Test*MR.java
-+**/spark/*.java
\ No newline at end of file
+**/spark/*.java
\ No newline at end of file
Modified: pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java?rev=1796822&r1=1796821&r2=1796822&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java Tue May 30
09:32:31 2017
@@ -1597,9 +1597,8 @@ public class TestEvalPipeline2 {
String[] expected = new String[] {"(1,A)", "(1,B)", "(2,C)"};
- Util.checkQueryOutputs(iter, expected,
-
org.apache.pig.newplan.logical.Util.translateSchema(pigServer.dumpSchema("flattened")),
- Util.isSparkExecType(cluster.getExecType()));
+ Util.checkQueryOutputsAfterSortRecursive(iter, expected,
+
org.apache.pig.newplan.logical.Util.translateSchema(pigServer.dumpSchema("flattened")));
}
// See PIG-2237
