You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by xu...@apache.org on 2016/04/01 22:15:38 UTC
svn commit: r1737431 -
/pig/branches/spark/test/org/apache/pig/test/TestBuiltin.java
Author: xuefu
Date: Fri Apr 1 20:15:38 2016
New Revision: 1737431
URL: http://svn.apache.org/viewvc?rev=1737431&view=rev
Log:
revert PIG-4855: Merge trunk[4] into spark branch (Pallavi via Xuefu)
Modified:
pig/branches/spark/test/org/apache/pig/test/TestBuiltin.java
Modified: pig/branches/spark/test/org/apache/pig/test/TestBuiltin.java
URL: http://svn.apache.org/viewvc/pig/branches/spark/test/org/apache/pig/test/TestBuiltin.java?rev=1737431&r1=1737430&r2=1737431&view=diff
==============================================================================
--- pig/branches/spark/test/org/apache/pig/test/TestBuiltin.java (original)
+++ pig/branches/spark/test/org/apache/pig/test/TestBuiltin.java Fri Apr 1 20:15:38 2016
@@ -3208,10 +3208,8 @@ public class TestBuiltin {
Util.resetStateForExecModeSwitch();
String inputFileName = "testUniqueID.txt";
Util.createInputFile(cluster, inputFileName, new String[]
- {"1\n2\n3\n4\n5\n1\n2\n3\n4\n5\n"});
- Properties copyproperties = new Properties();
- copyproperties.putAll(cluster.getProperties());
- PigServer pigServer = new PigServer(cluster.getExecType(), copyproperties);
+ {"1\n2\n3\n4\n5\n1\n2\n3\n4\n5\n"});
+ PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
pigServer.getPigContext().getProperties().setProperty("mapred.max.split.size", "10");
pigServer.getPigContext().getProperties().setProperty("pig.noSplitCombination", "true");
pigServer.registerQuery("A = load '" + inputFileName + "' as (name);");
@@ -3257,20 +3255,15 @@ public class TestBuiltin {
assertEquals(iter.next().get(1), "0-2");
assertEquals(iter.next().get(1), "0-3");
}
- Util.deleteFile(cluster, inputFileName);
}
-
@Test
public void testRANDOMWithJob() throws Exception {
Util.resetStateForExecModeSwitch();
String inputFileName = "testRANDOM.txt";
Util.createInputFile(cluster, inputFileName, new String[]
{"1\n2\n3\n4\n5\n1\n2\n3\n4\n5\n"});
-
- Properties copyproperties = new Properties();
- copyproperties.putAll(cluster.getProperties());
- PigServer pigServer = new PigServer(cluster.getExecType(), copyproperties);
+ PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
// running with two mappers
pigServer.getPigContext().getProperties().setProperty("mapred.max.split.size", "10");
pigServer.getPigContext().getProperties().setProperty("pig.noSplitCombination", "true");
@@ -3297,7 +3290,6 @@ public class TestBuiltin {
for( int i = 0; i < 5; i++ ){
assertNotEquals(mapper1[i], mapper2[i], 0.0001);
}
- Util.deleteFile(cluster, inputFileName);
}