Author: olga
Date: Wed Feb 27 18:07:28 2008
New Revision: 631817
URL: http://svn.apache.org/viewvc?rev=631817&view=rev
Log:
PIG-101: changes to unit tests to use enum as type
Modified:
incubator/pig/trunk/CHANGES.txt
incubator/pig/trunk/test/org/apache/pig/test/TestAlgebraicEval.java
incubator/pig/trunk/test/org/apache/pig/test/TestBuiltin.java
incubator/pig/trunk/test/org/apache/pig/test/TestCombiner.java
incubator/pig/trunk/test/org/apache/pig/test/TestCompressedFiles.java
incubator/pig/trunk/test/org/apache/pig/test/TestEvalPipeline.java
incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpNumeric.java
incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpString.java
incubator/pig/trunk/test/org/apache/pig/test/TestInfixArithmetic.java
incubator/pig/trunk/test/org/apache/pig/test/TestLargeFile.java
incubator/pig/trunk/test/org/apache/pig/test/TestMapReduce.java
incubator/pig/trunk/test/org/apache/pig/test/TestOrderBy.java
incubator/pig/trunk/test/org/apache/pig/test/TestPi.java
incubator/pig/trunk/test/org/apache/pig/test/TestStore.java
Modified: incubator/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/CHANGES.txt?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/CHANGES.txt (original)
+++ incubator/pig/trunk/CHANGES.txt Wed Feb 27 18:07:28 2008
@@ -139,3 +139,5 @@
PIG-127: changes to build.xml to have description for each target
(francisoud via olgan)
+
+ PIG-101: changes in tests to use enum type (francisoud via olgan)
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestAlgebraicEval.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestAlgebraicEval.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestAlgebraicEval.java
(original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestAlgebraicEval.java Wed Feb
27 18:07:28 2008
@@ -17,6 +17,8 @@
*/
package org.apache.pig.test;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
@@ -32,12 +34,11 @@
public class TestAlgebraicEval extends TestCase {
- private String initString = "mapreduce";
MiniCluster cluster = MiniCluster.buildCluster();
@Test
public void testSimpleCount() throws Throwable {
int LOOP_COUNT = 1024;
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -57,7 +58,7 @@
@Test
public void testGroupCount() throws Throwable {
int LOOP_COUNT = 1024;
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -77,7 +78,7 @@
@Test
public void testGroupReorderCount() throws Throwable {
int LOOP_COUNT = 1024;
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -99,7 +100,7 @@
@Test
public void testGroupUniqueColumnCount() throws Throwable {
int LOOP_COUNT = 1024;
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
int groupsize = 0;
@@ -127,7 +128,7 @@
@Test
public void testGroupDuplicateColumnCount() throws Throwable {
int LOOP_COUNT = 1024;
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
int groupsize = 0;
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestBuiltin.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestBuiltin.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestBuiltin.java (original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestBuiltin.java Wed Feb 27
18:07:28 2008
@@ -38,11 +38,10 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.builtin.ShellBagEvalFunc;
import org.apache.pig.impl.io.BufferedPositionedInputStream;
+import static org.apache.pig.PigServer.ExecType.LOCAL;
public class TestBuiltin extends TestCase {
- private String initString = "local";
-
// Builtin MATH Functions
// =======================
@Test
@@ -458,7 +457,7 @@
@Test
public void testShellFuncSingle() throws Throwable {
//ShellBagEvalFunc func = new ShellBagEvalFunc("tr o 0");
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(LOCAL);
File tempFile = File.createTempFile("tmp", ".dat");
PrintWriter writer = new PrintWriter(tempFile);
@@ -486,7 +485,7 @@
@Test
public void testShellFuncMultiple() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(LOCAL);
final int numTimes = 100;
File tempFile = File.createTempFile("tmp", ".dat");
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestCombiner.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestCombiner.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestCombiner.java (original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestCombiner.java Wed Feb 27
18:07:28 2008
@@ -1,5 +1,6 @@
package org.apache.pig.test;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -27,7 +28,7 @@
public void testOnCluster() throws Exception {
// run the test on cluster
MiniCluster.buildCluster();
- runTest(new PigServer("mapreduce"));
+ runTest(new PigServer(MAPREDUCE));
}
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestCompressedFiles.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestCompressedFiles.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestCompressedFiles.java
(original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestCompressedFiles.java Wed
Feb 27 18:07:28 2008
@@ -18,6 +18,7 @@
package org.apache.pig.test;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
import java.io.File;
import java.io.FileOutputStream;
import java.util.Iterator;
@@ -72,7 +73,7 @@
@Test
public void testCompressed1() throws Throwable {
- PigServer pig = new PigServer("mapreduce");
+ PigServer pig = new PigServer(MAPREDUCE);
pig.registerQuery("A = foreach (cogroup (load 'file:"+gzFile+"') by
$1, (load 'file:"+datFile + "') by $1) generate flatten( " +
DIFF.class.getName() + "($1.$1,$2.$1)) ;");
Iterator it = pig.openIterator("A");
boolean success = true;
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestEvalPipeline.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestEvalPipeline.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestEvalPipeline.java
(original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestEvalPipeline.java Wed Feb
27 18:07:28 2008
@@ -40,6 +40,7 @@
import org.apache.pig.data.*;
import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.impl.io.PigFile;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
import org.apache.pig.backend.executionengine.ExecException;
@@ -47,7 +48,6 @@
public class TestEvalPipeline extends TestCase {
- String initString = "mapreduce";
MiniCluster cluster = MiniCluster.buildCluster();
@@ -73,7 +73,7 @@
@Test
public void testFunctionInsideFunction() throws Throwable {
- PigServer pigServer = new PigServer(initString);
+ PigServer pigServer = new PigServer(MAPREDUCE);
File f1 = createFile(new String[]{"a:1","b:1","a:1"});
@@ -89,7 +89,7 @@
@Test
public void testJoin() throws Throwable {
- PigServer pigServer = new PigServer(initString);
+ PigServer pigServer = new PigServer(MAPREDUCE);
File f1 = createFile(new String[]{"a:1","b:1","a:1"});
File f2 = createFile(new String[]{"b","b","a"});
@@ -111,7 +111,7 @@
@Test
public void testDriverMethod() throws Throwable {
- PigServer pigServer = new PigServer(initString);
+ PigServer pigServer = new PigServer(MAPREDUCE);
File f = File.createTempFile("tmp", "");
PrintWriter pw = new PrintWriter(f);
pw.println("a");
@@ -134,7 +134,7 @@
@Test
public void testMapLookup() throws Throwable {
- PigServer pigServer = new PigServer(initString);
+ PigServer pigServer = new PigServer(MAPREDUCE);
DataBag b = BagFactory.getInstance().newDefaultBag();
DataMap colors = new DataMap();
colors.put("apple","red");
@@ -217,7 +217,7 @@
@Test
public void testBagFunctionWithFlattening() throws Throwable {
- PigServer pigServer = new PigServer(initString);
+ PigServer pigServer = new PigServer(MAPREDUCE);
File queryLogFile = createFile(
new String[]{
"stanford\tdeer\tsighting",
@@ -279,7 +279,7 @@
}
ps.close();
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
String tmpOutputFile = FileLocalizer.getTemporaryPath(null,
pig.getPigContext()).toString();
pig.registerQuery("A = LOAD 'file:" + tmpFile + "';");
if (eliminateDuplicates){
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpNumeric.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpNumeric.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpNumeric.java
(original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpNumeric.java Wed
Feb 27 18:07:28 2008
@@ -17,6 +17,7 @@
*/
package org.apache.pig.test;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
@@ -37,12 +38,11 @@
private final Log log = LogFactory.getLog(getClass());
private static int LOOP_COUNT = 1024;
- private String initString = "mapreduce";
MiniCluster cluster = MiniCluster.buildCluster();
@Test
public void testNumericEq() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -73,7 +73,7 @@
@Test
public void testNumericNeq() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -100,7 +100,7 @@
@Test
public void testNumericGt() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -128,7 +128,7 @@
@Test
public void testBinCond() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -157,7 +157,7 @@
@Test
public void testNestedBinCond() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -185,7 +185,7 @@
@Test
public void testNumericLt() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -215,7 +215,7 @@
@Test
public void testNumericGte() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -245,7 +245,7 @@
@Test
public void testNumericLte() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpString.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpString.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpString.java
(original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestFilterOpString.java Wed
Feb 27 18:07:28 2008
@@ -17,6 +17,7 @@
*/
package org.apache.pig.test;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
@@ -37,12 +38,11 @@
private final Log log = LogFactory.getLog(getClass());
private static int LOOP_COUNT = 1024;
- private String initString = "mapreduce";
MiniCluster cluster = MiniCluster.buildCluster();
@Test
public void testStringEq() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -70,7 +70,7 @@
@Test
public void testStringNeq() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -98,7 +98,7 @@
@Test
public void testStringGt() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -128,7 +128,7 @@
@Test
public void testStringGte() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -159,7 +159,7 @@
@Test
public void testStringLt() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -188,7 +188,7 @@
@Test
public void testStringLte() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestInfixArithmetic.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestInfixArithmetic.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestInfixArithmetic.java
(original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestInfixArithmetic.java Wed
Feb 27 18:07:28 2008
@@ -17,6 +17,8 @@
*/
package org.apache.pig.test;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
@@ -37,12 +39,11 @@
private final Log log = LogFactory.getLog(getClass());
private static int LOOP_COUNT = 1024;
- private String initString = "mapreduce";
MiniCluster cluster = MiniCluster.buildCluster();
@Test
public void testAdd() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -64,7 +65,7 @@
@Test
public void testSubtract() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -85,7 +86,7 @@
@Test
public void testMultiply() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -107,7 +108,7 @@
@Test
public void testDivide() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 1; i < LOOP_COUNT; i++) {
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestLargeFile.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestLargeFile.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestLargeFile.java (original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestLargeFile.java Wed Feb 27
18:07:28 2008
@@ -18,6 +18,7 @@
package org.apache.pig.test;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
import org.apache.pig.PigServer;
import org.apache.pig.data.Tuple;
@@ -50,7 +51,6 @@
private long total = defaultBlockSize >> 1;
private int max_rand = 500;
- private String initString = "mapreduce";
// private double sum = 0.0, sumIn = 0.0;
MiniCluster cluster = MiniCluster.buildCluster();
@@ -89,7 +89,7 @@
dat.close();
try {
- pig = new PigServer(initString);
+ pig = new PigServer(MAPREDUCE);
}
catch (ExecException e) {
IOException ioe = new IOException("Failed to create Pig
server");
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestMapReduce.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestMapReduce.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestMapReduce.java (original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestMapReduce.java Wed Feb 27
18:07:28 2008
@@ -17,6 +17,7 @@
*/
package org.apache.pig.test;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
@@ -47,13 +48,12 @@
public class TestMapReduce extends TestCase {
- private String initString = "mapreduce";
MiniCluster cluster = MiniCluster.buildCluster();
@Test
public void testBigGroupAll() throws Throwable {
int LOOP_COUNT = 4*1024;
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", "txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < LOOP_COUNT; i++) {
@@ -120,7 +120,7 @@
}
@Test
public void testStoreFunction() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", ".txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < 10; i++) {
@@ -147,7 +147,7 @@
}
@Test
public void testQualifiedFuncions() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", ".txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < 1; i++) {
@@ -172,7 +172,7 @@
@Test
public void testDefinedFunctions() throws Throwable {
- PigServer pig = new PigServer(initString);
+ PigServer pig = new PigServer(MAPREDUCE);
File tmpFile = File.createTempFile("test", ".txt");
PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
for(int i = 0; i < 1; i++) {
@@ -199,7 +199,7 @@
@Test
public void testPigServer() throws Throwable {
System.out.println("creating pig server");
- PigContext pigContext = new PigContext(ExecType.MAPREDUCE);
+ PigContext pigContext = new PigContext(MAPREDUCE);
PigServer pig = new PigServer(pigContext);
System.out.println("testing capacity");
long capacity = pig.capacity();
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestOrderBy.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestOrderBy.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestOrderBy.java (original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestOrderBy.java Wed Feb 27
18:07:28 2008
@@ -29,9 +29,9 @@
import org.apache.pig.PigServer;
import org.apache.pig.data.Tuple;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
public class TestOrderBy extends TestCase {
- private String initString = "mapreduce";
private static final int DATALEN = 1024;
private String[][] DATA = new String[2][DATALEN];
MiniCluster cluster = MiniCluster.buildCluster();
@@ -45,7 +45,7 @@
DATA[0][i] = myFormatter.format(i);
DATA[1][i] = myFormatter.format(DATALEN - i - 1);
}
- pig = new PigServer(initString);
+ pig = new PigServer(MAPREDUCE);
}
protected void setUp() throws Exception {
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestPi.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestPi.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestPi.java (original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestPi.java Wed Feb 27
18:07:28 2008
@@ -18,6 +18,7 @@
package org.apache.pig.test;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
import org.apache.pig.PigServer;
import org.apache.pig.data.Tuple;
@@ -52,7 +53,6 @@
private long total = ((defaultBlockSize >> 20) / 10) << 20;
private int inCircle = 0;
- private String initString = "mapreduce";
MiniCluster cluster = MiniCluster.buildCluster();
private long totalLength = 0, totalLengthTest = 0;
@@ -99,7 +99,7 @@
dat.close();
try {
- pig = new PigServer(initString);
+ pig = new PigServer(MAPREDUCE);
}
catch (ExecException e) {
IOException ioe = new IOException("Failed to create Pig
Server");
Modified: incubator/pig/trunk/test/org/apache/pig/test/TestStore.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestStore.java?rev=631817&r1=631816&r2=631817&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestStore.java (original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestStore.java Wed Feb 27
18:07:28 2008
@@ -26,12 +26,12 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.backend.executionengine.ExecException;
+import static org.apache.pig.PigServer.ExecType.MAPREDUCE;
import junit.framework.TestCase;
public class TestStore extends TestCase {
- private String initString = "mapreduce";
private int LOOP_COUNT = 1024;
MiniCluster cluster = MiniCluster.buildCluster();
@@ -108,7 +108,7 @@
}
pw.close();
try {
- pig = new PigServer(initString);
+ pig = new PigServer(MAPREDUCE);
}
catch (ExecException e) {
IOException ioe = new IOException("Failed to create Pig
Server");
