Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf4.q.xml URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf4.q.xml?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/ql/src/test/results/compiler/plan/udf4.q.xml (original) +++ hive/branches/tez/ql/src/test/results/compiler/plan/udf4.q.xml Wed Nov 27 20:11:44 2013 @@ -591,17 +591,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="operator"> - <boolean>true</boolean> - </void> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFOPNegative</string> - </void> - <void property="udfName"> - <string>-</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> @@ -679,17 +669,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="operator"> - <boolean>true</boolean> - </void> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFOPNegative</string> - </void> - <void property="udfName"> - <string>-</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> @@ -699,14 +679,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFFloor</string> - </void> - <void property="udfName"> - <string>floor</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFFloor"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> @@ -731,14 +704,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFFloor</string> - </void> - <void property="udfName"> - <string>floor</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFFloor"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> @@ -763,14 +729,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFFloor</string> - </void> - <void property="udfName"> - <string>floor</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFFloor"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> @@ -799,17 +758,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="operator"> - <boolean>true</boolean> - </void> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFOPNegative</string> - </void> - <void property="udfName"> - <string>-</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> @@ -869,14 +818,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFCeil</string> - </void> - <void property="udfName"> - <string>ceil</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCeil"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> @@ -933,14 +875,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFCeil</string> - </void> - <void property="udfName"> - <string>ceiling</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCeil"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> @@ -969,17 +904,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="operator"> - <boolean>true</boolean> - </void> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFOPNegative</string> - </void> - <void property="udfName"> - <string>-</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> @@ -989,14 +914,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFCeil</string> - </void> - <void property="udfName"> - <string>ceil</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCeil"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> @@ -1021,14 +939,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFCeil</string> - </void> - <void property="udfName"> - <string>ceil</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCeil"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> @@ -1067,17 +978,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="operator"> - <boolean>true</boolean> - </void> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFOPNegative</string> - </void> - <void property="udfName"> - <string>-</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo2"/> @@ -1147,17 +1048,7 @@ </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="operator"> - <boolean>true</boolean> - </void> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFOPNegative</string> - </void> - <void property="udfName"> - <string>-</string> - </void> - </object> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo2"/>
Modified: hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java (original) +++ hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java Wed Nov 27 20:11:44 2013 @@ -43,6 +43,7 @@ import org.apache.hive.ptest.execution.c import org.apache.hive.ptest.execution.conf.TestParser; import org.apache.hive.ptest.execution.context.ExecutionContext; import org.apache.hive.ptest.execution.context.ExecutionContextProvider; +import org.apache.hive.ptest.execution.ssh.NonZeroExitCodeException; import org.apache.hive.ptest.execution.ssh.RSyncCommandExecutor; import org.apache.hive.ptest.execution.ssh.SSHCommandExecutor; import org.apache.velocity.app.Velocity; @@ -171,7 +172,17 @@ public class PTest { } } catch(Throwable throwable) { mLogger.error("Test run exited with an unexpected error", throwable); - messages.add("Tests failed with: " + throwable.getClass().getSimpleName() + ": " + throwable.getMessage()); + // NonZeroExitCodeExceptions can have long messages and should be + // trimmable when published to the JIRA via the JiraService + if(throwable instanceof NonZeroExitCodeException) { + messages.add("Tests exited with: " + throwable.getClass().getSimpleName()); + for(String line : Strings.nullToEmpty(throwable.getMessage()).split("\n")) { + messages.add(line); + } + } else { + messages.add("Tests exited with: " + throwable.getClass().getSimpleName() + + ": " + throwable.getMessage()); + } error = true; } finally { for(HostExecutor hostExecutor : mHostExecutors) { Modified: hive/branches/tez/testutils/ptest2/src/main/resources/batch-exec.vm URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/main/resources/batch-exec.vm?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/main/resources/batch-exec.vm (original) +++ hive/branches/tez/testutils/ptest2/src/main/resources/batch-exec.vm Wed Nov 27 20:11:44 2013 @@ -59,7 +59,7 @@ then testModule=$(find ./ -name '${testClass}.java' | awk -F'/' '{print $2}') if [[ -z "$testModule" ]] then - testModule=./ + testModule=./ fi pushd $testModule timeout 2h mvn -B -o test -Dmaven.repo.local=$localDir/$instanceName/maven \ Modified: hive/branches/tez/testutils/ptest2/src/main/resources/source-prep.vm URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/main/resources/source-prep.vm?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/main/resources/source-prep.vm (original) +++ hive/branches/tez/testutils/ptest2/src/main/resources/source-prep.vm Wed Nov 27 20:11:44 2013 @@ -58,7 +58,7 @@ cd $workingDir/ fi if [[ -d ${repositoryName}-source ]] && [[ ! -d ${repositoryName}-source/.git ]] then - rm -rf ${repositoryName}-source + rm -rf ${repositoryName}-source fi if [[ ! -d ${repositoryName}-source ]] then @@ -85,11 +85,11 @@ cd $workingDir/ if [[ "${buildTool}" == "maven" ]] then rm -rf $workingDir/maven/org/apache/hive - mvn -B clean install -DskipTests -Dmaven.repo.local=$workingDir/maven - mvn -B test -Dmaven.repo.local=$workingDir/maven -Dtest=TestDummy + mvn -B clean install -DskipTests -Dmaven.repo.local=$workingDir/maven $mavenArgs + mvn -B test -Dmaven.repo.local=$workingDir/maven -Dtest=TestDummy $mavenArgs cd itests - mvn -B clean install -DskipTests -Dmaven.repo.local=$workingDir/maven - mvn -B test -Dmaven.repo.local=$workingDir/maven -Dtest=TestDummy + mvn -B clean install -DskipTests -Dmaven.repo.local=$workingDir/maven $mavenArgs + mvn -B test -Dmaven.repo.local=$workingDir/maven -Dtest=TestDummy $mavenArgs elif [[ "${buildTool}" == "ant" ]] then ant $antArgs -Divy.default.ivy.user.dir=$workingDir/ivy \ Modified: hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java (original) +++ hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java Wed Nov 27 20:11:44 2013 @@ -203,7 +203,7 @@ public class TestHostExecutor { executor.submitTests(parallelWorkQueue, isolatedWorkQueue, failedTestResults).get(); Assert.assertEquals(Collections.emptySet(), failedTestResults); Assert.assertEquals(parallelWorkQueue.toString(), 1, parallelWorkQueue.size()); - Approvals.verify(getExecutedCommands()); + Approvals.verify("EMPTY\n" + getExecutedCommands()); Assert.assertTrue(executor.isShutdown()); } @Test Modified: hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java (original) +++ hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java Wed Nov 27 20:11:44 2013 @@ -63,6 +63,7 @@ public class TestScripts { templateVariables.put("workingDir", "/some/working/dir"); templateVariables.put("buildTool", "maven"); templateVariables.put("antArgs", "-Dant=arg1"); + templateVariables.put("mavenArgs", "-Dant=arg1"); templateVariables.put("testClass", "TestCliDriver"); templateVariables.put("buildTag", "build-1"); templateVariables.put("logDir", "/some/log/dir"); Modified: hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt (original) +++ hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt Wed Nov 27 20:11:44 2013 @@ -58,7 +58,7 @@ then testModule=$(find ./ -name 'TestCliDriver.java' | awk -F'/' '{print $2}') if [[ -z "$testModule" ]] then - testModule=./ + testModule=./ fi pushd $testModule timeout 2h mvn -B -o test -Dmaven.repo.local=/some/local/dir/instance-1/maven \ Modified: hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt (original) +++ hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt Wed Nov 27 20:11:44 2013 @@ -58,11 +58,11 @@ then testModule=$(find ./ -name 'TestCliDriver.java' | awk -F'/' '{print $2}') if [[ -z "$testModule" ]] then - testModule=./ + testModule=./ fi pushd $testModule timeout 2h mvn -B -o test -Dmaven.repo.local=/some/local/dir/instance-1/maven \ - $mavenArgs $mavenTestArgs -Dtest=arg1 1>/some/log/dir/maven-test.txt 2>&1 </dev/null & + -Dant=arg1 $mavenTestArgs -Dtest=arg1 1>/some/log/dir/maven-test.txt 2>&1 </dev/null & pid=$! Modified: hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt (original) +++ hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt Wed Nov 27 20:11:44 2013 @@ -57,7 +57,7 @@ cd /some/working/dir/ fi if [[ -d apache-source ]] && [[ ! -d apache-source/.git ]] then - rm -rf apache-source + rm -rf apache-source fi if [[ ! -d apache-source ]] then @@ -84,11 +84,11 @@ cd /some/working/dir/ if [[ "${buildTool}" == "maven" ]] then rm -rf /some/working/dir/maven/org/apache/hive - mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven - mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy + mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven $mavenArgs + mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy $mavenArgs cd itests - mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven - mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy + mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven $mavenArgs + mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy $mavenArgs elif [[ "${buildTool}" == "ant" ]] then ant -Dant=arg1 -Divy.default.ivy.user.dir=/some/working/dir/ivy \ Modified: hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt (original) +++ hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt Wed Nov 27 20:11:44 2013 @@ -57,7 +57,7 @@ cd /some/working/dir/ fi if [[ -d apache-source ]] && [[ ! -d apache-source/.git ]] then - rm -rf apache-source + rm -rf apache-source fi if [[ ! -d apache-source ]] then @@ -84,11 +84,11 @@ cd /some/working/dir/ if [[ "ant" == "maven" ]] then rm -rf /some/working/dir/maven/org/apache/hive - mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven - mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy + mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven $mavenArgs + mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy $mavenArgs cd itests - mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven - mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy + mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven $mavenArgs + mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy $mavenArgs elif [[ "ant" == "ant" ]] then ant -Dant=arg1 -Divy.default.ivy.user.dir=/some/working/dir/ivy \ Modified: hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt?rev=1546180&r1=1546179&r2=1546180&view=diff ============================================================================== --- hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt (original) +++ hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt Wed Nov 27 20:11:44 2013 @@ -57,7 +57,7 @@ cd /some/working/dir/ fi if [[ -d apache-source ]] && [[ ! -d apache-source/.git ]] then - rm -rf apache-source + rm -rf apache-source fi if [[ ! -d apache-source ]] then @@ -84,11 +84,11 @@ cd /some/working/dir/ if [[ "maven" == "maven" ]] then rm -rf /some/working/dir/maven/org/apache/hive - mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven - mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy + mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven $mavenArgs + mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy $mavenArgs cd itests - mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven - mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy + mvn -B clean install -DskipTests -Dmaven.repo.local=/some/working/dir/maven $mavenArgs + mvn -B test -Dmaven.repo.local=/some/working/dir/maven -Dtest=TestDummy $mavenArgs elif [[ "maven" == "ant" ]] then ant -Dant=arg1 -Divy.default.ivy.user.dir=/some/working/dir/ivy \
