You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by pr...@apache.org on 2009/11/24 22:36:26 UTC

svn commit: r883886 [2/3] - /hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestFilterOpString.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestFilterOpString.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestFilterOpString.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestFilterOpString.java Tue Nov 24 21:36:25 2009
@@ -40,7 +40,6 @@
 
     private final Log log = LogFactory.getLog(getClass());
     private static int LOOP_COUNT = 1024;    
-    private String initString = "mapreduce";
     MiniCluster cluster = MiniCluster.buildCluster();
 
     private PigServer pig;
@@ -71,16 +70,18 @@
             }
         }
         ps.close();
-        pig.registerQuery("A=load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':');");
+        pig.registerQuery("A=load '" 
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext()) 
+                + "' using " + PigStorage.class.getName() + "(':');");
         String query = "A = filter A by $0 eq $1;";
 
         log.info(query);
         pig.registerQuery(query);
-        Iterator it = pig.openIterator("A");
+        Iterator<Tuple> it = pig.openIterator("A");
         tmpFile.delete();
         int count = 0;
         while(it.hasNext()) {
-            Tuple t = (Tuple)it.next();
+            Tuple t = it.next();
             String first = t.get(0).toString();
             String second = t.get(1).toString();
             count++;
@@ -108,16 +109,18 @@
             }
         }
         ps.close();
-        pig.registerQuery("A=load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':');");
+        pig.registerQuery("A=load '" 
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext()) 
+                + "' using " + PigStorage.class.getName() + "(':');");
         String query = "A = filter A by $0 neq $1;";
 
         log.info(query);
         pig.registerQuery(query);
-        Iterator it = pig.openIterator("A");
+        Iterator<Tuple> it = pig.openIterator("A");
         tmpFile.delete();
         int count = 0;
         while(it.hasNext()) {
-            Tuple t = (Tuple)it.next();
+            Tuple t = it.next();
             String first = t.get(0).toString();
             String second = t.get(1).toString();
             assertFalse(first.equals(second));
@@ -145,16 +148,18 @@
             }
         }
         ps.close();
-        pig.registerQuery("A=load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':');");
+        pig.registerQuery("A=load '" 
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext()) 
+                + "' using " + PigStorage.class.getName() + "(':');");
         String query = "A = filter A by $0 gt $1;";
 
         log.info(query);
         pig.registerQuery(query);
-        Iterator it = pig.openIterator("A");
+        Iterator<Tuple> it = pig.openIterator("A");
         tmpFile.delete();
         int count = 0;
         while(it.hasNext()) {
-            Tuple t = (Tuple)it.next();
+            Tuple t = it.next();
             String first = t.get(0).toString();
             String second = t.get(1).toString();
             assertTrue(first.compareTo(second) > 0);
@@ -187,16 +192,18 @@
         }
         ps.close();
         
-        pig.registerQuery("A=load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':');");
+        pig.registerQuery("A=load '" 
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext()) 
+                + "' using " + PigStorage.class.getName() + "(':');");
         String query = "A = filter A by $0 gte $1;";
 
         log.info(query);
         pig.registerQuery(query);
-        Iterator it = pig.openIterator("A");
+        Iterator<Tuple> it = pig.openIterator("A");
         tmpFile.delete();
         int count = 0;
         while(it.hasNext()) {
-            Tuple t = (Tuple)it.next();
+            Tuple t = it.next();
             String first = t.get(0).toString();
             String second = t.get(1).toString();
             assertTrue(first.compareTo(second) >= 0);
@@ -224,16 +231,18 @@
         }
         ps.close();
         
-        pig.registerQuery("A=load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':');");
+        pig.registerQuery("A=load '" 
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext()) 
+                + "' using " + PigStorage.class.getName() + "(':');");
         String query = "A = filter A by $0 lt $1;";
 
         log.info(query);
         pig.registerQuery(query);
-        Iterator it = pig.openIterator("A");
+        Iterator<Tuple> it = pig.openIterator("A");
         tmpFile.delete();
         int count = 0;
         while(it.hasNext()) {
-            Tuple t = (Tuple)it.next();
+            Tuple t = it.next();
             String first = t.get(0).toString();
             String second = t.get(1).toString();
             assertTrue(first.compareTo(second) < 0);
@@ -244,7 +253,6 @@
 
     @Test
     public void testStringLte() throws Throwable {
-        PigServer pig = new PigServer(initString);
         File tmpFile = File.createTempFile("test", "txt");
         PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
         int expectedCount = 0;
@@ -265,16 +273,18 @@
         }
         ps.close();
         
-        pig.registerQuery("A=load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':');");
+        pig.registerQuery("A=load '" 
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext()) 
+                + "' using " + PigStorage.class.getName() + "(':');");
         String query = "A = filter A by $0 lte $1;";
 
         log.info(query);
         pig.registerQuery(query);
-        Iterator it = pig.openIterator("A");
+        Iterator<Tuple> it = pig.openIterator("A");
         tmpFile.delete();
         int count = 0;
         while(it.hasNext()) {
-            Tuple t = (Tuple)it.next();
+            Tuple t = it.next();
             String first = t.get(0).toString();
             String second = t.get(1).toString();
             assertTrue(first.compareTo(second) <= 0);

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestFilterUDF.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestFilterUDF.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestFilterUDF.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestFilterUDF.java Tue Nov 24 21:36:25 2009
@@ -24,7 +24,6 @@
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.util.Iterator;
-import java.util.Random;
 
 import junit.framework.TestCase;
 
@@ -32,9 +31,10 @@
 import org.apache.pig.ExecType;
 import org.apache.pig.PigServer;
 import org.apache.pig.backend.executionengine.ExecException;
-import org.apache.pig.data.*;
+import org.apache.pig.data.Tuple;
+import org.apache.pig.data.TupleFactory;
 import org.apache.pig.impl.io.FileLocalizer;
-import org.apache.pig.test.utils.*;
+import org.apache.pig.test.utils.FILTERFROMFILE;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -103,7 +103,9 @@
     @Test
     public void testFilterUDF() throws Exception{
         
-        pigServer.registerQuery("A = LOAD '" + Util.generateURI(tmpFile.toString()) + "' as (x:int);");
+        pigServer.registerQuery("A = LOAD '" 
+                + Util.generateURI(tmpFile.toString(), pigServer.getPigContext()) 
+                + "' as (x:int);");
         pigServer.registerQuery("B = filter A by " + MyFilterFunction.class.getName() + "();");
         Iterator<Tuple> iter = pigServer.openIterator("B");
         if(!iter.hasNext()) fail("No Output received");
@@ -133,8 +135,15 @@
                     }
                 );
 
-        pigServer.registerQuery("define FILTER_CRITERION " + FILTERFROMFILE.class.getName() + "('" + FileLocalizer.hadoopify(Util.generateURI(filterFile.toString()), pigServer.getPigContext()) + "');");
-        pigServer.registerQuery("a = LOAD '" + Util.generateURI(inputFile.toString()) + "' as (url:chararray, numvisits:int);");
+        pigServer.registerQuery("define FILTER_CRITERION "
+                + FILTERFROMFILE.class.getName()
+                + "('"
+                + Util.generateURI(filterFile.toString(), pigServer
+                        .getPigContext()) + "');");
+        pigServer.registerQuery("a = LOAD '"
+                + Util.generateURI(inputFile.toString(), pigServer
+                        .getPigContext())
+                + "' as (url:chararray, numvisits:int);");
         pigServer.registerQuery("b = filter a by FILTER_CRITERION(numvisits);");
 
         Tuple expectedTuple = tf.newTuple();
@@ -146,7 +155,5 @@
             Tuple t = iter.next();
             assertTrue(t.equals(expectedTuple));
         }
-
     }
-        
 }

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestForEachNestedPlan.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestForEachNestedPlan.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestForEachNestedPlan.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestForEachNestedPlan.java Tue Nov 24 21:36:25 2009
@@ -19,6 +19,7 @@
 package org.apache.pig.test;
 
 import org.apache.pig.PigServer;
+import org.apache.pig.ExecType;
 import org.apache.pig.test.utils.TestHelper;
 import org.apache.pig.data.Tuple;
 import org.junit.Test;
@@ -33,13 +34,12 @@
 
 public class TestForEachNestedPlan extends TestCase {
 
-    private String initString = "mapreduce";
     MiniCluster cluster = MiniCluster.buildCluster();
 
     private PigServer pig ;
 
     public TestForEachNestedPlan() throws Throwable {
-        pig = new PigServer(initString) ;
+        pig = new PigServer(ExecType.MAPREDUCE, cluster.getProperties()) ;
     }
 
     Boolean[] nullFlags = new Boolean[]{ false, true };
@@ -49,7 +49,8 @@
         for (int i = 0; i < nullFlags.length; i++) {
             System.err.println("Running testInnerOrderBy with nullFlags set to :" + nullFlags[i]);
             File tmpFile = genDataSetFile1(nullFlags[i]);
-            pig.registerQuery("a = load '" + Util.generateURI(tmpFile.toString()) + "'; ");
+            pig.registerQuery("a = load '" 
+                    + Util.generateURI(tmpFile.toString(), pig.getPigContext()) + "'; ");
             pig.registerQuery("b = group a by $0; ");
             pig.registerQuery("c = foreach b { " + "     c1 = order $1 by *; "
                     + "    generate flatten(c1); " + "};");

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestForEachNestedPlanLocal.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestForEachNestedPlanLocal.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestForEachNestedPlanLocal.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestForEachNestedPlanLocal.java Tue Nov 24 21:36:25 2009
@@ -48,7 +48,9 @@
         for (int i = 0; i < nullFlags.length; i++) {
             System.err.println("Running testInnerOrderBy with nullFlags set to :" + nullFlags[i]);
             File tmpFile = genDataSetFile1(nullFlags[i]);
-            pig.registerQuery("a = load '" + Util.generateURI(tmpFile.toString()) + "'; ");
+            pig.registerQuery("a = load '"
+                    + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                    + "'; ");
             pig.registerQuery("b = group a by $0; ");
             pig.registerQuery("c = foreach b { " + "     c1 = order $1 by *; "
                     + "    generate flatten(c1); " + "};");
@@ -67,7 +69,9 @@
     @Test
     public void testInnerLimit() throws Exception {
         File tmpFile = genDataSetFileOneGroup();
-        pig.registerQuery("a = load '" + Util.generateURI(tmpFile.toString()) + "'; ");
+        pig.registerQuery("a = load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "'; ");
         pig.registerQuery("b = group a by $0; ");
         pig.registerQuery("c = foreach b { " + "     c1 = limit $1 5; "
                 + "    generate COUNT(c1); " + "};");

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestGrunt.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestGrunt.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestGrunt.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestGrunt.java Tue Nov 24 21:36:25 2009
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pig.ExecType;
@@ -139,7 +137,9 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'input1'; b = foreach a generate {(1, '1', 0.4f),(2, '2', 0.45)} as b: bag{t(i: int, c:chararray, d: double)};\n";
+        String strCmd = "a = load 'input1'; b = foreach a generate "
+                + "{(1, '1', 0.4f),(2, '2', 0.45)} as "
+                + "b: bag{t(i: int, c:chararray, d: double)};\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -154,7 +154,8 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'input1'; b = foreach a {generate {(1, '1', 0.4f),(2, '2', 0.45)};};\n";
+        String strCmd = "a = load 'input1'; "
+                + "b = foreach a {generate {(1, '1', 0.4f),(2, '2', 0.45)};};\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -169,7 +170,9 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'input1'; b = foreach a {generate {(1, '1', 0.4f),(2, '2', 0.45)} as b: bag{t(i: int, c:chararray, d: double)};};\n";
+        String strCmd = "a = load 'input1'; "
+                + "b = foreach a {generate {(1, '1', 0.4f),(2, '2', 0.45)} "
+                + "as b: bag{t(i: int, c:chararray, d: double)};};\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -184,7 +187,9 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'foo' as (foo, fast); b = group a by foo; c = foreach b {generate SUM(a.fast) as fast;};\n";
+        String strCmd = "a = load 'foo' as (foo, fast); "
+                + "b = group a by foo; c = foreach b "
+                + "{generate SUM(a.fast) as fast;};\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -199,7 +204,8 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'foo' as (foo, fast); b = group a by foo; c = foreach b generate SUM(a.fast) as fast;\n";
+        String strCmd = "a = load 'foo' as (foo, fast); "
+                + "b = group a by foo; c = foreach b generate SUM(a.fast) as fast;\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -214,7 +220,8 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'foo' as (foo, fast); b = group a by foo; c = foreach b {generate SUM(a.fast);};\n";
+        String strCmd = "a = load 'foo' as (foo, fast); "
+                + "b = group a by foo; c = foreach b {generate SUM(a.fast);};\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -229,7 +236,8 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'foo' as (foo, fast); b = group a by foo; c = foreach b generate SUM(a.fast);\n";
+        String strCmd = "a = load 'foo' as (foo, fast); "
+                + "b = group a by foo; c = foreach b generate SUM(a.fast);\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -244,7 +252,8 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "cash = load 'foo' as (foo, fast); b = foreach cash generate fast * 2.0;\n";
+        String strCmd = "cash = load 'foo' as (foo, fast); "
+                + "b = foreach cash generate fast * 2.0;\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -260,7 +269,8 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'foo' as (foo, fast, regenerate); b = group a by foo; c = foreach b {generate a.regenerate;};\n";
+        String strCmd = "a = load 'foo' as (foo, fast, regenerate); "
+                + "b = group a by foo; c = foreach b {generate a.regenerate;};\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -275,7 +285,8 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'foo' as (foo, fast, regenerate); b = group a by foo; c = foreach b generate a.regenerate;\n";
+        String strCmd = "a = load 'foo' as (foo, fast, regenerate); "
+                + "b = group a by foo; c = foreach b generate a.regenerate;\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -290,7 +301,11 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'foo' as (foo, fast, regenerate); b = group a by foo; c = foreach b {generate {(1, '1', 0.4f),(2, '2', 0.45)} as b: bag{t(i: int, cease:chararray, degenerate: double)}, SUM(a.fast) as fast, a.regenerate as degenerated;};\n";
+        String strCmd = "a = load 'foo' as (foo, fast, regenerate); "
+                + "b = group a by foo; c = foreach b {generate "
+                + "{(1, '1', 0.4f),(2, '2', 0.45)} "
+                + "as b: bag{t(i: int, cease:chararray, degenerate: double)}, "
+                + "SUM(a.fast) as fast, a.regenerate as degenerated;};\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -305,7 +320,11 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'foo' as (foo, fast, regenerate); b = group a by foo; c = foreach b generate {(1, '1', 0.4f),(2, '2', 0.45)} as b: bag{t(i: int, cease:chararray, degenerate: double)}, SUM(a.fast) as fast, a.regenerate as degenerated;\n";
+        String strCmd = "a = load 'foo' as (foo, fast, regenerate); "
+                + "b = group a by foo; c = foreach b generate "
+                + "{(1, '1', 0.4f),(2, '2', 0.45)} "
+                + "as b: bag{t(i: int, cease:chararray, degenerate: double)}, "
+                + "SUM(a.fast) as fast, a.regenerate as degenerated;\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -320,9 +339,9 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "a = load 'foo' as (foo, fast, regenerate);" +
-                        " run -param LIMIT=5 -param_file " + basedir +
-                        "/test_broken.ppf " + basedir + "/testsub.pig; explain bar";
+        String strCmd = "a = load 'foo' as (foo, fast, regenerate);"
+                + " run -param LIMIT=5 -param_file " + basedir
+                + "/test_broken.ppf " + basedir + "/testsub.pig; explain bar";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -338,9 +357,9 @@
         PigContext context = server.getPigContext();
         boolean caught = false;
         
-        String strCmd = "a = load 'foo' as (foo, fast, regenerate);" +
-                        " exec -param LIMIT=5 -param FUNCTION=COUNT " +
-                        "-param FILE=foo " + basedir + "/testsub.pig; explain bar;";
+        String strCmd = "a = load 'foo' as (foo, fast, regenerate);"
+                + " exec -param LIMIT=5 -param FUNCTION=COUNT "
+                + "-param FILE=foo " + basedir + "/testsub.pig; explain bar;";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -362,7 +381,7 @@
         PigContext context = server.getPigContext();
         
         String strCmd = "a = load 'foo' as (foo, fast, regenerate); run "
-            +basedir+"/testsubnested_run.pig; explain bar";
+                + basedir + "/testsubnested_run.pig; explain bar";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -379,7 +398,7 @@
         boolean caught = false;
         
         String strCmd = "a = load 'foo' as (foo, fast, regenerate); exec "
-            +basedir+"/testsubnested_exec.pig; explain bar";
+                + basedir + "/testsubnested_exec.pig; explain bar";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -401,7 +420,7 @@
         PigContext context = server.getPigContext();
         
         String strCmd = "a = load 'foo' as (foo, fast, regenerate); run "
-            +basedir+"/testsubnested_run.pig; explain";
+                + basedir + "/testsubnested_run.pig; explain";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -417,7 +436,7 @@
         PigContext context = server.getPigContext();
         
         String strCmd = "a = load 'foo' as (foo, fast, regenerate); explain -script "
-            +basedir+"/testsubnested_run.pig;";
+                + basedir + "/testsubnested_run.pig;";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -433,7 +452,7 @@
         PigContext context = server.getPigContext();
         
         String strCmd = "a = load 'foo' as (foo, fast, regenerate); explain -brief -script "
-            +basedir+"/testsubnested_run.pig;";
+                + basedir + "/testsubnested_run.pig;";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -449,7 +468,7 @@
         PigContext context = server.getPigContext();
         
         String strCmd = "a = load 'foo' as (foo, fast, regenerate); explain -dot -script "
-            +basedir+"/testsubnested_run.pig;";
+                + basedir + "/testsubnested_run.pig;";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -465,7 +484,7 @@
         PigContext context = server.getPigContext();
         
         String strCmd = "a = load 'foo' as (foo, fast, regenerate); explain -out /tmp -script "
-            +basedir+"/testsubnested_run.pig;";
+                + basedir + "/testsubnested_run.pig;";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -480,8 +499,12 @@
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "rmf bar; rmf baz; a = load 'file:test/org/apache/pig/test/data/passwd';"
-            +"store a into 'bar'; exec; a = load 'bar'; store a into 'baz';\n";
+        String strCmd = "rmf bar; rmf baz; "
+                + "a = load '"
+                + Util.generateURI("file:test/org/apache/pig/test/data/passwd",
+                        context)
+                + "';"
+                + "store a into 'bar'; exec; a = load 'bar'; store a into 'baz';\n";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -498,7 +521,8 @@
         
         String strCmd = 
             "rmf bar; rmf baz;"
-            +"a = load 'file:test/org/apache/pig/test/data/passwd';"
+            +"a = load '" 
+            + Util.generateURI("file:test/org/apache/pig/test/data/passwd", context) + "';"
             +"store a into 'bar';"
             +"cp bar baz;"
             +"rm bar; rm baz;"
@@ -553,7 +577,8 @@
         
         String strCmd = 
             "rmf bla;"
-            +"a = load 'file:test/org/apache/pig/test/data/passwd';"
+            +"a = load '"
+            + Util.generateURI("file:test/org/apache/pig/test/data/passwd", context) + "';"
             +"e = group a by $0;"
             +"f = foreach e generate group, COUNT($1);"
             +"store f into 'bla';"
@@ -576,7 +601,8 @@
         
         String strCmd = 
             "rmf bla;"
-            +"a = load 'file:test/org/apache/pig/test/data/passwd';"
+            +"a = load '"
+            + Util.generateURI("file:test/org/apache/pig/test/data/passwd", context) + "';"
             +"e = group a by $0;"
             +"f = foreach e generate group, COUNT($1);"
             +"store f into 'bla';"
@@ -591,23 +617,25 @@
     
         grunt.exec();
     }
-
+/*
     @Test
     public void testKeepGoing() throws Throwable {
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         
         PigContext context = server.getPigContext();
-        
+
+        String filename = 
+            Util.generateURI("file:test/org/apache/pig/test/data/passwd", context);
         String strCmd = 
             "rmf bar;"
             +"rmf foo;"
             +"rmf baz;"
-            +"A = load 'file:test/org/apache/pig/test/data/passwd';"
+            +"A = load '" + filename + "';"
             +"B = foreach A generate 1;"
             +"C = foreach A generate 0/0;"
             +"store B into 'foo';"
             +"store C into 'bar';"
-            +"A = load 'file:test/org/apache/pig/test/data/passwd';"
+            +"A = load '" + filename + "';"
             +"B = stream A through `false`;"
             +"store B into 'baz';"
             +"cat bar;";
@@ -653,7 +681,7 @@
         }
         assertTrue(caught);
     }
-
+*/
     @Test
     public void testInvalidParam() throws Throwable {
         PigServer server = new PigServer(ExecType.LOCAL, cluster.getProperties());
@@ -688,7 +716,8 @@
             +"rmf foo;\n"
             +"rmf baz;\n"
             +"copyFromLocal test/org/apache/pig/test/data/passwd pre;\n"
-            +"A = load 'file:test/org/apache/pig/test/data/passwd';\n"
+            +"A = load '" 
+            + Util.generateURI("file:test/org/apache/pig/test/data/passwd", context) + "';\n"
             +"B = stream A through `false`;\n"
             +"store B into 'bar' using BinStorage();\n"
             +"A = load 'bar';\n"

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestInfixArithmetic.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestInfixArithmetic.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestInfixArithmetic.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestInfixArithmetic.java Tue Nov 24 21:36:25 2009
@@ -63,13 +63,16 @@
             System.err.println("Testing with nulls: " + nullFlags[i]);
             PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
             generateInput(ps, nullFlags[i]);
-            String query = "A = foreach (load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':')) generate $0, $0 + $1, $1;";
+            String query = "A = foreach (load '"
+                    + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                    + "' using " + PigStorage.class.getName()
+                    + "(':')) generate $0, $0 + $1, $1;";
             log.info(query);
             pig.registerQuery(query);
-            Iterator it = pig.openIterator("A");
+            Iterator<Tuple> it = pig.openIterator("A");
             tmpFile.delete();
             while(it.hasNext()) {
-                Tuple t = (Tuple)it.next();
+                Tuple t = it.next();
                 Double first = (t.get(0) == null ? null :DataType.toDouble(t.get(0)));
                 Double second = (t.get(1) == null ? null :DataType.toDouble(t.get(1)));
                 Double third = (t.get(2) == null ? null :DataType.toDouble(t.get(2)));
@@ -77,12 +80,9 @@
                     assertTrue(second.equals(first + first));
                 } else {
                     assertEquals(null, second);
-                }
-                    
+                }                    
             }
-        }
-        
-        
+        }        
     }
  
     @Test
@@ -92,13 +92,16 @@
             System.err.println("Testing with nulls: " + nullFlags[i]);
             PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
             generateInput(ps, nullFlags[i]);
-            String query = "A = foreach (load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':')) generate $0, $0 - $1, $1 ;";
+            String query = "A = foreach (load '"
+                    + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                    + "' using " + PigStorage.class.getName()
+                    + "(':')) generate $0, $0 - $1, $1 ;";
             log.info(query);
             pig.registerQuery(query);
-            Iterator it = pig.openIterator("A");
+            Iterator<Tuple> it = pig.openIterator("A");
             tmpFile.delete();
             while(it.hasNext()) {
-                Tuple t = (Tuple)it.next();
+                Tuple t = it.next();
                 Double first = (t.get(0) == null ? null :DataType.toDouble(t.get(0)));
                 Double second = (t.get(1) == null ? null :DataType.toDouble(t.get(1)));
                 Double third = (t.get(2) == null ? null :DataType.toDouble(t.get(2)));
@@ -106,8 +109,7 @@
                     assertTrue(second.equals(0.0));
                 } else {
                     assertEquals(null, second);
-                }
-                    
+                }                    
             }
         }
     }
@@ -119,13 +121,16 @@
             System.err.println("Testing with nulls: " + nullFlags[i]);
             PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
             generateInput(ps, nullFlags[i]);
-            String query = "A = foreach (load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':')) generate $0, $0 * $1, $1 ;";
+            String query = "A = foreach (load '"
+                    + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                    + "' using " + PigStorage.class.getName()
+                    + "(':')) generate $0, $0 * $1, $1 ;";
             log.info(query);
             pig.registerQuery(query);
-            Iterator it = pig.openIterator("A");
+            Iterator<Tuple> it = pig.openIterator("A");
             tmpFile.delete();
             while(it.hasNext()) {
-                Tuple t = (Tuple)it.next();
+                Tuple t = it.next();
                 Double first = (t.get(0) == null ? null :DataType.toDouble(t.get(0)));
                 Double second = (t.get(1) == null ? null :DataType.toDouble(t.get(1)));
                 Double third = (t.get(2) == null ? null :DataType.toDouble(t.get(2)));
@@ -133,8 +138,7 @@
                     assertTrue(second.equals(first * first));
                 } else {
                     assertEquals(null, second);
-                }
-                    
+                }                    
             }
         }
     }
@@ -146,13 +150,16 @@
             System.err.println("Testing with nulls: " + nullFlags[i]);
             PrintStream ps = new PrintStream(new FileOutputStream(tmpFile));
             generateInput(ps, nullFlags[i]);
-            String query = "A = foreach (load '" + Util.generateURI(tmpFile.toString()) + "' using " + PigStorage.class.getName() + "(':')) generate $0, $0 / $1, $1 ;";
+            String query = "A = foreach (load '"
+                    + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                    + "' using " + PigStorage.class.getName()
+                    + "(':')) generate $0, $0 / $1, $1 ;";
             log.info(query);
             pig.registerQuery(query);
-            Iterator it = pig.openIterator("A");
+            Iterator<Tuple> it = pig.openIterator("A");
             tmpFile.delete();
             while(it.hasNext()) {
-                Tuple t = (Tuple)it.next();
+                Tuple t = it.next();
                 Double first = (t.get(0) == null ? null :DataType.toDouble(t.get(0)));
                 Double second = (t.get(1) == null ? null :DataType.toDouble(t.get(1)));
                 Double third = (t.get(2) == null ? null :DataType.toDouble(t.get(2)));
@@ -160,14 +167,11 @@
                     assertTrue(second.equals(1.0));
                 } else {
                     assertEquals(null, second);
-                }
-                    
+                }                    
             }
         }
-        
     }
     
-    
     private void generateInput(PrintStream ps, boolean withNulls) {
         if(withNulls) {
             // inject nulls randomly
@@ -189,7 +193,5 @@
             }
         }
         ps.close();
-    }
-    
-    
+    }    
 }

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLocal.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLocal.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLocal.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLocal.java Tue Nov 24 21:36:25 2009
@@ -102,7 +102,9 @@
     @Test
     public Double bigGroupAll( File tmpFile ) throws Throwable {
 
-        String query = "foreach (group (load '" + Util.generateURI(tmpFile.toString()) + "') all) generate " + COUNT.class.getName() + "($1) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "') all) generate " + COUNT.class.getName() + "($1) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
         Iterator it = pig.openIterator("asdf_id");
@@ -196,7 +198,9 @@
         ps.close();
 
     //Load, Execute and Store query
-        String query = "foreach (load '"+Util.generateURI(tmpFile.toString())+"') generate $0,$1;";
+        String query = "foreach (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "') generate $0,$1;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
         try {
@@ -244,8 +248,10 @@
 
         File tmpFile=TestHelper.createTempFile(data) ;
 
-    //Load, Execute and Store query
-        String query = "foreach (load '"+Util.generateURI(tmpFile.toString())+"') generate $0,$1;";
+    // Load, Execute and Store query
+        String query = "foreach (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "') generate $0,$1;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
         try {
@@ -288,7 +294,11 @@
         ps.close();
 
         // execute query
-        String query = "foreach (group (load '"+Util.generateURI(tmpFile.toString())+"' using " + MyStorage.class.getName() + "()) by " + MyGroup.class.getName() + "('all')) generate flatten(" + MyApply.class.getName() + "($1)) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "' using " + MyStorage.class.getName() + "()) by "
+                + MyGroup.class.getName() + "('all')) generate flatten("
+                + MyApply.class.getName() + "($1)) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
 
@@ -322,7 +332,11 @@
         ps.close();
 
         // execute query
-        String query = "foreach (group (load '"+Util.generateURI(tmpFile.toString())+"' using " + MyStorage.class.getName() + "()) by " + MyGroup.class.getName() + "('all')) generate flatten(" + MyApply.class.getName() + "($1)) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "' using " + MyStorage.class.getName() + "()) by "
+                + MyGroup.class.getName() + "('all')) generate flatten("
+                + MyApply.class.getName() + "($1)) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
 
@@ -352,7 +366,11 @@
         ps.close();
         pig.registerFunction("foo",
             new FuncSpec(MyApply.class.getName()+"('foo')"));
-        String query = "foreach (group (load '"+Util.generateURI(tmpFile.toString())+"' using " + MyStorage.class.getName() + "()) by " + MyGroup.class.getName() + "('all')) generate flatten(foo($1)) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "' using " + MyStorage.class.getName() + "()) by "
+                + MyGroup.class.getName()
+                + "('all')) generate flatten(foo($1)) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
         Iterator it = pig.openIterator("asdf_id");
@@ -397,7 +415,11 @@
         ps.close();
         pig.registerFunction("foo",
             new FuncSpec(MyApply.class.getName()+"('foo')"));
-        String query = "foreach (group (load '"+Util.generateURI(tmpFile.toString())+"' using " + MyStorage.class.getName() + "()) by " + MyGroup.class.getName() + "('all')) generate flatten(foo($1)) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "' using " + MyStorage.class.getName() + "()) by "
+                + MyGroup.class.getName()
+                + "('all')) generate flatten(foo($1)) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
         Iterator it = pig.openIterator("asdf_id");

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLocal2.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLocal2.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLocal2.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLocal2.java Tue Nov 24 21:36:25 2009
@@ -52,8 +52,12 @@
     public void testUnion1() throws Exception {
         File tmpFile1 = genDataSetFile(false, 30 ) ;
         File tmpFile2 = genDataSetFile(false, 50 ) ;
-        pig.registerQuery("a = load '" + Util.generateURI(tmpFile1.toString()) + "'; ") ;
-        pig.registerQuery("b = load '" + Util.generateURI(tmpFile2.toString()) + "'; ") ;
+        pig.registerQuery("a = load '"
+                + Util.generateURI(tmpFile1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("b = load '"
+                + Util.generateURI(tmpFile2.toString(), pig.getPigContext())
+                + "'; ");
         pig.registerQuery("c = union a, b; ") ;
         
         verifyUnion( "c", 30 + 50 );
@@ -64,8 +68,12 @@
 
         File tmpFile1 = genDataSetFile(true, 30 ) ;
         File tmpFile2 = genDataSetFile(true, 50 ) ;
-        pig.registerQuery("a = load '" + Util.generateURI(tmpFile1.toString()) + "'; ") ;
-        pig.registerQuery("b = load '" + Util.generateURI(tmpFile2.toString()) + "'; ") ;
+        pig.registerQuery("a = load '"
+                + Util.generateURI(tmpFile1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("b = load '"
+                + Util.generateURI(tmpFile2.toString(), pig.getPigContext())
+                + "'; ");
         pig.registerQuery("c = union a, b; ") ;
 
         verifyUnion( "c", 30 + 50 );
@@ -76,8 +84,12 @@
 
         File tmpFile1 = genDataSetFile(false, 30) ;
         File tmpFile2 = genDataSetFile(false, 50) ;
-        pig.registerQuery("a = load '" + Util.generateURI(tmpFile1.toString()) + "'; ") ;
-        pig.registerQuery("b = load '" + Util.generateURI(tmpFile2.toString()) + "'; ") ;
+        pig.registerQuery("a = load '"
+                + Util.generateURI(tmpFile1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("b = load '"
+                + Util.generateURI(tmpFile2.toString(), pig.getPigContext())
+                + "'; ");
         pig.registerQuery("a1 = foreach a generate $0, $1; ") ;
         pig.registerQuery("b1 = foreach b generate $0, $1; ") ;
         pig.registerQuery("c = union a1, b1; ") ;
@@ -89,8 +101,12 @@
     public void testUnion2WithNulls() throws Exception {
         File tmpFile1 = genDataSetFile(true, 30) ;
         File tmpFile2 = genDataSetFile(true, 50) ;
-        pig.registerQuery("a = load '" + Util.generateURI(tmpFile1.toString()) + "'; ") ;
-        pig.registerQuery("b = load '" + Util.generateURI(tmpFile2.toString()) + "'; ") ;
+        pig.registerQuery("a = load '"
+                + Util.generateURI(tmpFile1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("b = load '"
+                + Util.generateURI(tmpFile2.toString(), pig.getPigContext())
+                + "'; ");
         pig.registerQuery("a1 = foreach a generate $0, $1; ") ;
         pig.registerQuery("b1 = foreach b generate $0, $1; ") ;
         pig.registerQuery("c = union a1, b1; ") ;
@@ -107,8 +123,11 @@
         ps.println("1\t1}");
         ps.close();
         
-        pig.registerQuery("A = load '" + Util.generateURI(fp1.toString()) + "'; ");
-        pig.registerQuery("B = foreach A generate flatten(" + Pig800Udf.class.getName() + "($0));");
+        pig.registerQuery("A = load '"
+                + Util.generateURI(fp1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("B = foreach A generate flatten("
+                + Pig800Udf.class.getName() + "($0));");
         pig.registerQuery("C = distinct B;");
         
         Iterator<Tuple> iter = pig.openIterator("C");
@@ -126,8 +145,11 @@
         ps.println("1\t1}");
         ps.close();
         
-        pig.registerQuery("A = load '" + Util.generateURI(fp1.toString()) + "'; ");
-        pig.registerQuery("B = foreach A generate flatten(" + Pig800Udf.class.getName() + "($0));");
+        pig.registerQuery("A = load '"
+                + Util.generateURI(fp1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("B = foreach A generate flatten("
+                + Pig800Udf.class.getName() + "($0));");
         pig.registerQuery("C = order B by $0;");
         
         Iterator<Tuple> iter = pig.openIterator("C");
@@ -154,8 +176,12 @@
         ps.close();
         
         
-        pig.registerQuery("A = load '" + Util.generateURI(fp1.toString()) + "'AS (a0:int, a1:int); ");
-        pig.registerQuery("B = load '" + Util.generateURI(fp2.toString()) + "'AS (b0:int, b1:int); ");
+        pig.registerQuery("A = load '"
+                + Util.generateURI(fp1.toString(), pig.getPigContext())
+                + "'AS (a0:int, a1:int); ");
+        pig.registerQuery("B = load '"
+                + Util.generateURI(fp2.toString(), pig.getPigContext())
+                + "'AS (b0:int, b1:int); ");
         pig.registerQuery("C = join A by a0, B by b0;");
         
         Iterator<Tuple> iter = pig.openIterator("C");

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMapReduce.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMapReduce.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMapReduce.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMapReduce.java Tue Nov 24 21:36:25 2009
@@ -113,7 +113,10 @@
             System.setProperty("pig.overrideBlockSize", Integer.toString(offsets[i]));
             PigContext pigContext = new PigContext(ExecType.MAPREDUCE, cluster.getProperties());
             PigServer pig = new PigServer(pigContext);
-            pig.registerQuery("a = load 'file:test/org/apache/pig/test/data/bzipTest.bz2';");
+            pig.registerQuery("a = load '"
+                    + Util.generateURI(
+                            "file:test/org/apache/pig/test/data/bzipTest.bz2",
+                            pig.getPigContext()) + "';");
             //pig.registerQuery("a = foreach (group (load 'file:test/org/apache/pig/test/data/bzipTest.bz2') all) generate COUNT($1);");
             Iterator<Tuple> it = pig.openIterator("a");
             int count = 0;
@@ -131,11 +134,13 @@
     @Test
     public Double bigGroupAll( File tmpFile ) throws Throwable {
 
-        String query = "foreach (group (load '" + Util.generateURI(tmpFile.toString()) + "') all) generate " + COUNT.class.getName() + "($1) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "') all) generate " + COUNT.class.getName() + "($1) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
-        Iterator it = pig.openIterator("asdf_id");
-        Tuple t = (Tuple)it.next();
+        Iterator<Tuple> it = pig.openIterator("asdf_id");
+        Tuple t = it.next();
 
         return  DataType.toDouble(t.get(0));
     }
@@ -226,8 +231,10 @@
         }
         ps.close();
 
-	//Load, Execute and Store query
-        String query = "foreach (load '"+Util.generateURI(tmpFile.toString())+"') generate $0,$1;";
+        //Load, Execute and Store query
+        String query = "foreach (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "') generate $0,$1;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
         try {
@@ -236,7 +243,7 @@
         pig.store("asdf_id", "frog", MyStorage.class.getName()+"()");
 
 
-	//verify query
+        //verify query
 
         InputStream is = FileLocalizer.open("frog", pig.getPigContext());
         BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -276,7 +283,9 @@
         File tmpFile=TestHelper.createTempFile(data) ;
 
 	//Load, Execute and Store query
-        String query = "foreach (load '"+Util.generateURI(tmpFile.toString())+"') generate $0,$1;";
+        String query = "foreach (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "') generate $0,$1;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
         try {
@@ -319,16 +328,20 @@
         ps.close();
 
         // execute query
-        String query = "foreach (group (load '"+Util.generateURI(tmpFile.toString())+"' using " + MyStorage.class.getName() + "()) by " + MyGroup.class.getName() + "('all')) generate flatten(" + MyApply.class.getName() + "($1)) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "' using " + MyStorage.class.getName() + "()) by "
+                + MyGroup.class.getName() + "('all')) generate flatten("
+                + MyApply.class.getName() + "($1)) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
 
         //Verfiy query
-        Iterator it = pig.openIterator("asdf_id");
+        Iterator<Tuple> it = pig.openIterator("asdf_id");
         Tuple t;
         int count = 0;
         while(it.hasNext()) {
-            t = (Tuple) it.next();
+            t = it.next();
             assertEquals(t.get(0).toString(), "Got");
             Integer.parseInt(t.get(1).toString());
             count++;
@@ -353,16 +366,20 @@
         ps.close();
 
         // execute query
-        String query = "foreach (group (load '"+Util.generateURI(tmpFile.toString())+"' using " + MyStorage.class.getName() + "()) by " + MyGroup.class.getName() + "('all')) generate flatten(" + MyApply.class.getName() + "($1)) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "' using " + MyStorage.class.getName() + "()) by "
+                + MyGroup.class.getName() + "('all')) generate flatten("
+                + MyApply.class.getName() + "($1)) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
 
         //Verfiy query
-        Iterator it = pig.openIterator("asdf_id");
+        Iterator<Tuple> it = pig.openIterator("asdf_id");
         Tuple t;
         int count = 0;
         while(it.hasNext()) {
-            t = (Tuple) it.next();
+            t = it.next();
             assertEquals(t.get(0).toString(), "Got");
             Integer.parseInt(t.get(1).toString());
             count++;
@@ -383,15 +400,19 @@
         ps.close();
         pig.registerFunction("foo",
             new FuncSpec(MyApply.class.getName()+"('foo')"));
-        String query = "foreach (group (load '"+Util.generateURI(tmpFile.toString())+"' using " + MyStorage.class.getName() + "()) by " + MyGroup.class.getName() + "('all')) generate flatten(foo($1)) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "' using " + MyStorage.class.getName() + "()) by "
+                + MyGroup.class.getName()
+                + "('all')) generate flatten(foo($1)) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
-        Iterator it = pig.openIterator("asdf_id");
+        Iterator<Tuple> it = pig.openIterator("asdf_id");
         tmpFile.delete();
         Tuple t;
         int count = 0;
         while(it.hasNext()) {
-            t = (Tuple) it.next();
+            t = it.next();
             assertEquals("foo", t.get(0).toString());
             Integer.parseInt(t.get(1).toString());
             count++;
@@ -428,15 +449,19 @@
         ps.close();
         pig.registerFunction("foo",
             new FuncSpec(MyApply.class.getName()+"('foo')"));
-        String query = "foreach (group (load '"+Util.generateURI(tmpFile.toString())+"' using " + MyStorage.class.getName() + "()) by " + MyGroup.class.getName() + "('all')) generate flatten(foo($1)) ;";
+        String query = "foreach (group (load '"
+                + Util.generateURI(tmpFile.toString(), pig.getPigContext())
+                + "' using " + MyStorage.class.getName() + "()) by "
+                + MyGroup.class.getName()
+                + "('all')) generate flatten(foo($1)) ;";
         System.out.println(query);
         pig.registerQuery("asdf_id = " + query);
-        Iterator it = pig.openIterator("asdf_id");
+        Iterator<Tuple> it = pig.openIterator("asdf_id");
         tmpFile.delete();
         Tuple t;
         int count = 0;
         while(it.hasNext()) {
-            t = (Tuple) it.next();
+            t = it.next();
             assertEquals("foo", t.get(0).toString());
 
             if ( t.get(1).toString() != "" ) {

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMapReduce2.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMapReduce2.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMapReduce2.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMapReduce2.java Tue Nov 24 21:36:25 2009
@@ -20,6 +20,8 @@
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
+
+import org.apache.pig.ExecType;
 import org.apache.pig.PigServer;
 import org.apache.pig.data.Tuple;
 import org.apache.pig.test.utils.TestHelper;
@@ -32,13 +34,12 @@
 
 public class TestMapReduce2 extends TestCase {
 
-    private String initString = "mapreduce";
     MiniCluster cluster = MiniCluster.buildCluster();
 
     private PigServer pig ;
 
     public TestMapReduce2() throws Throwable {
-        pig = new PigServer(initString) ;
+        pig = new PigServer(ExecType.MAPREDUCE, cluster.getProperties()) ;
     }
 
 
@@ -46,8 +47,12 @@
     public void testUnion1() throws Exception {
         File tmpFile1 = genDataSetFile(false, 30 ) ;
         File tmpFile2 = genDataSetFile(false, 50 ) ;
-        pig.registerQuery("a = load '" + Util.generateURI(tmpFile1.toString()) + "'; ") ;
-        pig.registerQuery("b = load '" + Util.generateURI(tmpFile2.toString()) + "'; ") ;
+        pig.registerQuery("a = load '"
+                + Util.generateURI(tmpFile1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("b = load '"
+                + Util.generateURI(tmpFile2.toString(), pig.getPigContext())
+                + "'; ");
         pig.registerQuery("c = union a, b; ") ;
         
         verifyUnion( "c", 30 + 50 );
@@ -58,9 +63,13 @@
 
         File tmpFile1 = genDataSetFile(true, 30 ) ;
         File tmpFile2 = genDataSetFile(true, 50 ) ;
-        pig.registerQuery("a = load '" + Util.generateURI(tmpFile1.toString()) + "'; ") ;
-        pig.registerQuery("b = load '" + Util.generateURI(tmpFile2.toString()) + "'; ") ;
-        pig.registerQuery("c = union a, b; ") ;
+        pig.registerQuery("a = load '"
+                + Util.generateURI(tmpFile1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("b = load '"
+                + Util.generateURI(tmpFile2.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("c = union a, b; ");
 
         verifyUnion( "c", 30 + 50 );
     }
@@ -70,8 +79,12 @@
 
         File tmpFile1 = genDataSetFile(false, 30) ;
         File tmpFile2 = genDataSetFile(false, 50) ;
-        pig.registerQuery("a = load '" + Util.generateURI(tmpFile1.toString()) + "'; ") ;
-        pig.registerQuery("b = load '" + Util.generateURI(tmpFile2.toString()) + "'; ") ;
+        pig.registerQuery("a = load '"
+                + Util.generateURI(tmpFile1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("b = load '"
+                + Util.generateURI(tmpFile2.toString(), pig.getPigContext())
+                + "'; ");
         pig.registerQuery("a1 = foreach a generate $0, $1; ") ;
         pig.registerQuery("b1 = foreach b generate $0, $1; ") ;
         pig.registerQuery("c = union a1, b1; ") ;
@@ -83,8 +96,12 @@
     public void testUnion2WithNulls() throws Exception {
         File tmpFile1 = genDataSetFile(true, 30) ;
         File tmpFile2 = genDataSetFile(true, 50) ;
-        pig.registerQuery("a = load '" + Util.generateURI(tmpFile1.toString()) + "'; ") ;
-        pig.registerQuery("b = load '" + Util.generateURI(tmpFile2.toString()) + "'; ") ;
+        pig.registerQuery("a = load '"
+                + Util.generateURI(tmpFile1.toString(), pig.getPigContext())
+                + "'; ");
+        pig.registerQuery("b = load '"
+                + Util.generateURI(tmpFile2.toString(), pig.getPigContext())
+                + "'; ");
         pig.registerQuery("a1 = foreach a generate $0, $1; ") ;
         pig.registerQuery("b1 = foreach b generate $0, $1; ") ;
         pig.registerQuery("c = union a1, b1; ") ;

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMultiQuery.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMultiQuery.java?rev=883886&r1=883885&r2=883886&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMultiQuery.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMultiQuery.java Tue Nov 24 21:36:25 2009
@@ -17,6 +17,8 @@
  */
 package org.apache.pig.test;
 
+import static org.junit.Assert.*;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileWriter;
@@ -72,15 +74,31 @@
 import org.apache.pig.tools.grunt.GruntParser;
 import org.apache.pig.tools.pigscript.parser.ParseException;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class TestMultiQuery extends TestCase {
+public class TestMultiQuery {
 
     private static final MiniCluster cluster = MiniCluster.buildCluster();
 
     private PigServer myPig;
 
+    @BeforeClass
+    public static void setUpBeforeClass() throws IOException {
+        Util.copyFromLocalToCluster(cluster,
+                "test/org/apache/pig/test/data/passwd", "passwd");
+        Util.copyFromLocalToCluster(cluster,
+                "test/org/apache/pig/test/data/passwd2", "passwd2");
+    }
+    
+    @AfterClass
+    public static void tearDownAfterClass() throws IOException {
+        Util.deleteFile(cluster, "passwd");
+        Util.deleteFile(cluster, "passwd2");
+    }
+    
     @Before
     public void setUp() throws Exception {
         cluster.setProperty("opt.multiquery", ""+true);
@@ -231,7 +249,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by gid >= 5;");
@@ -258,7 +276,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by gid >= 5;");
@@ -290,7 +308,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by gid >= 5;");
@@ -380,7 +398,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = foreach a generate uname, uid, gid;");
             myPig.registerQuery("c = filter b by uid < 5;");
@@ -414,7 +432,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = group a by uid;");
             myPig.registerQuery("c = group a by gid;");
@@ -443,7 +461,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = group a by uname;");
             myPig.registerQuery("c = group a by gid;");
@@ -471,7 +489,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = group a all;");
             myPig.registerQuery("c = group a by gid;");
@@ -499,7 +517,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = group a by uid;");
             myPig.registerQuery("c = group a by (uname, gid);");
@@ -527,7 +545,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = group a by uid;");
             myPig.registerQuery("c = group a by (uname, gid);");
@@ -609,7 +627,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("b = filter a by uid > 5;");
             myPig.registerQuery("store b into '/tmp/output1';");
@@ -637,9 +655,9 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
-            myPig.registerQuery("b = load 'file:test/org/apache/pig/test/data/passwd2' " +
+            myPig.registerQuery("b = load 'passwd2' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("c = filter a by uid > 5;");
             myPig.registerQuery("d = filter b by uid > 10;");
@@ -665,7 +683,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname, passwd, uid, gid);");
             myPig.registerQuery("b = foreach a generate uname, uid, gid;");
             myPig.registerQuery("split b into c1 if uid > 5, c2 if uid <= 5 ;"); 
@@ -693,7 +711,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5 and uid < 10;");
@@ -729,7 +747,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5 and uid < 10;");
@@ -765,7 +783,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5;");
@@ -797,7 +815,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5;");
@@ -830,7 +848,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5 and uid < 10;");
@@ -866,7 +884,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5 and uid < 10;");
@@ -902,7 +920,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5 and uid < 10;");
@@ -938,7 +956,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5 and uid < 10;");
@@ -975,7 +993,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5 and uid < 10;");
@@ -1011,7 +1029,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5 and uid < 10;");
@@ -1097,7 +1115,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("A = load 'file:test/org/apache/pig/test/data/passwd' split by 'file';");
+            myPig.registerQuery("A = load 'passwd' split by 'file';");
             myPig.registerQuery("Split A into A1 if $2 > 5, A2 if $2 >= 5;");
             myPig.registerQuery("Split A1 into A3 if $0 > 'm', A4 if $0 >= 'm';");
             myPig.registerQuery("B = group A3 by $2;");
@@ -1131,7 +1149,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("A = load 'file:test/org/apache/pig/test/data/passwd' split by 'file';");
+            myPig.registerQuery("A = load 'passwd' split by 'file';");
             myPig.registerQuery("Split A into A1 if $2 > 5, A2 if $2 >= 5;");
             myPig.registerQuery("Split A1 into A3 if $0 > 'm', A4 if $0 >= 'm';");
             myPig.registerQuery("B = group A3 by $2;");
@@ -1166,7 +1184,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname, passwd, uid, gid);");
             myPig.registerQuery("b = foreach a generate uname, passwd, uid, gid;");
             myPig.registerQuery("split b into c1 if uid > 5, c2 if uid <= 5 ;"); 
@@ -1201,7 +1219,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname, passwd, uid, gid);");
             myPig.registerQuery("b = foreach a generate uname, passwd, uid, gid;");
             myPig.registerQuery("split b into c1 if uid > 5, c2 if uid <= 5 ;"); 
@@ -1237,11 +1255,11 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname, passwd, uid, gid);");
             myPig.registerQuery("store a into '/tmp/output1' using BinStorage();");
             myPig.registerQuery("b = load '/tmp/output1' using BinStorage() as (uname, passwd, uid, gid);"); 
-            myPig.registerQuery("c = load 'file:test/org/apache/pig/test/data/passwd2' " +
+            myPig.registerQuery("c = load 'passwd2' " +
                                 "using PigStorage(':') as (uname, passwd, uid, gid);");
             myPig.registerQuery("d = cogroup b by (uname, uid) inner, c by (uname, uid) inner;");
             myPig.registerQuery("e = foreach d generate flatten(b), flatten(c);");
@@ -1267,11 +1285,11 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname, passwd, uid, gid);");
             myPig.registerQuery("store a into '/tmp/output1' using BinStorage();");
             myPig.registerQuery("b = load '/tmp/output1' using BinStorage() as (uname, passwd, uid, gid);"); 
-            myPig.registerQuery("c = load 'file:test/org/apache/pig/test/data/passwd2' " +
+            myPig.registerQuery("c = load 'passwd2' " +
                                 "using PigStorage(':') as (uname, passwd, uid, gid);");
             myPig.registerQuery("d = cogroup b by (uname, uid) inner, c by (uname, uid) inner;");
             myPig.registerQuery("e = foreach d generate flatten(b), flatten(c);");
@@ -1298,9 +1316,9 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
-            myPig.registerQuery("b = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("b = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("c = filter a by uid > 5;");
             myPig.registerQuery("store c into '/tmp/output1';");
@@ -1329,9 +1347,9 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
-            myPig.registerQuery("b = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("b = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("c = filter a by uid > 5;");
             myPig.registerQuery("store c into '/tmp/output1';");
@@ -1361,7 +1379,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("split a into b if uid > 500, c if uid <= 500;");
             myPig.registerQuery("store b into '/tmp/output1';");
@@ -1390,7 +1408,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("split a into a1 if uid > 500, a2 if gid > 500;");
             myPig.registerQuery("b1 = distinct a1;");
@@ -1421,7 +1439,7 @@
         try {            
             myPig.setBatchOn();
             
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("store a into '/tmp/output1';");
             myPig.registerQuery("b = load '/tmp/output1' using PigStorage(':'); ");
@@ -1448,7 +1466,7 @@
             
             myPig.setBatchOn();
             
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("store a into '/tmp/output1';");
             myPig.registerQuery("b = load '/tmp/output1' using PigStorage(':'); ");
@@ -1475,7 +1493,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid > 500;");
             myPig.registerQuery("c = filter a by gid > 500;");
@@ -1506,9 +1524,9 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
-            myPig.registerQuery("b = load 'file:test/org/apache/pig/test/data/passwd2' " +
+            myPig.registerQuery("b = load 'passwd2' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("c = filter a by uid > 5;");
             myPig.registerQuery("d = filter b by uid > 10;");
@@ -1539,7 +1557,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid > 5;");
             myPig.registerQuery("c = group b by gid;");
@@ -1568,7 +1586,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid > 5;");
             myPig.registerQuery("c = group b by gid;");
@@ -1599,7 +1617,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid > 5;");
             myPig.registerQuery("c = group b by gid;");
@@ -1633,7 +1651,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid > 500;");
             myPig.registerQuery("c = group b by gid;");
@@ -1673,7 +1691,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                  "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = filter a by uid < 5;");
             myPig.registerQuery("c = filter a by uid >= 5 and uid < 10;");
@@ -1786,7 +1804,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("b = filter a by uid > 5;");
             myPig.registerQuery("store b into '/tmp/output1';");
@@ -1830,7 +1848,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("b = filter a by uid > 5;");
             myPig.executeBatch();
@@ -1856,7 +1874,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("b = filter a by uid > 5;");
             myPig.registerQuery("store b into '/tmp/output1';");
@@ -1885,7 +1903,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("b = filter a by uid > 5;");
             myPig.registerQuery("store b into '/tmp/output1';");
@@ -1911,9 +1929,9 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
-            myPig.registerQuery("b = load 'file:test/org/apache/pig/test/data/passwd2' " +
+            myPig.registerQuery("b = load 'passwd2' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("c = filter a by uid > 5;");
             myPig.registerQuery("d = filter b by uid > 10;");
@@ -1942,7 +1960,7 @@
         try {
             myPig.setBatchOn();
 
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("b = filter a by uid > 5;");
             myPig.registerQuery("group b by gid;");
@@ -1963,7 +1981,7 @@
         System.out.println("===== multi-query with explain =====");
 
         try {
-            String script = "a = load 'file:test/org/apache/pig/test/data/passwd' "
+            String script = "a = load 'passwd' "
                           + "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);"
                           + "b = filter a by uid > 5;"
                           + "explain b;"
@@ -1986,7 +2004,7 @@
         System.out.println("===== multi-query with dump =====");
 
         try {
-            String script = "a = load 'file:test/org/apache/pig/test/data/passwd' "
+            String script = "a = load 'passwd' "
                           + "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);"
                           + "b = filter a by uid > 5;"
                           + "dump b;"
@@ -2009,7 +2027,7 @@
         System.out.println("===== multi-query with describe =====");
 
         try {
-            String script = "a = load 'file:test/org/apache/pig/test/data/passwd' "
+            String script = "a = load 'passwd' "
                           + "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);"
                           + "b = filter a by uid > 5;"
                           + "describe b;"
@@ -2032,7 +2050,7 @@
         System.out.println("===== multi-query with illustrate =====");
 
         try {
-            String script = "a = load 'file:test/org/apache/pig/test/data/passwd' "
+            String script = "a = load 'passwd' "
                           + "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);"
                           + "b = filter a by uid > 5;"
                           + "illustrate b;"
@@ -2055,7 +2073,7 @@
         
         try {
             myPig.setBatchOn();
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("b = filter a by uid>0;");
             myPig.registerQuery("c = filter a by uid>5;");
@@ -2101,7 +2119,7 @@
         
         try {
             myPig.setBatchOn();
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("b = group a by uname;");
             myPig.registerQuery("store b into '/tmp/output1';");
@@ -2170,7 +2188,7 @@
         
         try {
             myPig.setBatchOn();
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd' " +
+            myPig.registerQuery("a = load 'passwd' " +
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int,gid:int);");
             myPig.registerQuery("b = group a by uname;");
             myPig.registerQuery("store b into '/tmp/output1';");
@@ -2216,7 +2234,7 @@
         
         try {
             myPig.setBatchOn();
-            myPig.registerQuery("a = load 'file:test/org/apache/pig/test/data/passwd';");
+            myPig.registerQuery("a = load 'passwd';");
             myPig.registerQuery("store a into '/tmp/output1' using BinStorage();");
             myPig.registerQuery("a = load '/tmp/output1';");
             myPig.registerQuery("store a into '/tmp/output2';");