You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by xu...@apache.org on 2011/05/05 21:25:09 UTC
svn commit: r1099930 [2/2] - in /pig/branches/branch-0.9:
src/org/apache/pig/impl/logicalLayer/schema/ src/org/apache/pig/impl/util/
src/org/apache/pig/newplan/logical/
src/org/apache/pig/newplan/logical/relational/ src/org/apache/pig/parser/
src/org/a...
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/TestSchema.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/TestSchema.java?rev=1099930&r1=1099929&r2=1099930&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/TestSchema.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/TestSchema.java Thu May 5 19:25:08 2011
@@ -42,14 +42,12 @@ import java.util.Iterator;
import java.util.List;
import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.logicalLayer.schema.SchemaMergeException;
import org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema;
@@ -58,7 +56,7 @@ import org.apache.pig.newplan.logical.re
import org.apache.pig.newplan.logical.relational.LogicalSchema.MergeMode;
import org.junit.Test;
-public class TestSchema extends TestCase {
+public class TestSchema {
@Test
public void testSchemaEqual1() {
@@ -370,7 +368,7 @@ public class TestSchema extends TestCase
true,
false,
false) ;
- fail("Expect Error Here!") ;
+ Assert.fail("Expect Error Here!") ;
}
catch (SchemaMergeException sme) {
// good
@@ -515,7 +513,7 @@ public class TestSchema extends TestCase
true,
false,
false) ;
- fail("Expect error here!") ;
+ Assert.fail("Expect error here!") ;
} catch (SchemaMergeException e) {
// good
}
@@ -658,7 +656,7 @@ public class TestSchema extends TestCase
Iterator<Tuple> it = pigServer.openIterator("c");
while(it.hasNext()) {
Tuple t = it.next();
- assertEquals("{a: {(f1: chararray,f2: int)}}", t.get(0));
+ Assert.assertEquals("{a: {(f1: chararray,f2: int)}}", t.get(0));
}
cluster.shutDown();
}
@@ -672,7 +670,7 @@ public class TestSchema extends TestCase
s1.getField(0).schema.setTwoLevelAccessRequired(true);
s2.getField(0).schema.setTwoLevelAccessRequired(true);
Schema s3 = Schema.mergeSchema(s1, s2, true);
- assertEquals(s3.getField(0).schema.isTwoLevelAccessRequired(), true);
+ Assert.assertEquals(s3.getField(0).schema.isTwoLevelAccessRequired(), true);
}
@Test
@@ -684,41 +682,39 @@ public class TestSchema extends TestCase
s1.getField(0).schema.setTwoLevelAccessRequired(true);
s1.getField(0).schema.setTwoLevelAccessRequired(false);
Schema s3 = Schema.mergeSchema(s1, s2, true);
- assertEquals(s3, null);
+ Assert.assertEquals(s3, s2);
}
@Test
// See PIG-730
public void testMergeSchemaWithTwoLevelAccess3() throws Exception {
// Generate two schemas
- Schema s1 = Utils.getSchemaFromString("a:{t:(a0:int, a1:int)}");
- Schema s2 = Utils.getSchemaFromString("b:{t:(b0:int, b1:int)}");
- LogicalSchema ls1 = org.apache.pig.newplan.logical.Util.translateSchema(s1);
- LogicalSchema ls2 = org.apache.pig.newplan.logical.Util.translateSchema(s2);
+ LogicalSchema ls1 = Utils.parseSchema("a:{t:(a0:int, a1:int)}");
+ LogicalSchema ls2 = Utils.parseSchema("b:{t:(b0:int, b1:int)}");
LogicalSchema ls3 = LogicalSchema.merge(ls1, ls2, MergeMode.LoadForEach);
- assertTrue(org.apache.pig.newplan.logical.Util.translateSchema(ls3).toString().equals("{a: {t: (a0: int,a1: int)}}"));
+ Assert.assertTrue(org.apache.pig.newplan.logical.Util.translateSchema(ls3).toString().equals("{a: {(a0: int,a1: int)}}"));
}
@Test
public void testNewNormalNestedMerge1() throws Exception {
- LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:bytearray, b1:(b11:int, b12:float), c1:long"));
- LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a2:bytearray, b2:(b21:double, b22:long), c2:int"));
LogicalSchema mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.Union);
- LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:bytearray, b1:(), c1:long"));
expected.getField(1).schema = new LogicalSchema();
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.LoadForEach);
- expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ expected = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:bytearray, b1:(b11:int, b12:float), c1:long"));
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
mergedSchema = LogicalSchema.merge(b, a, LogicalSchema.MergeMode.LoadForEach);
- expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ expected = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a2:bytearray, b2:(b21:double, b22:long), c2:int"));
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
}
@@ -727,144 +723,137 @@ public class TestSchema extends TestCase
@Test
public void testNewNormalNestedMerge2() throws Exception {
- LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:(a11:chararray, a12:float), b1:(b11:chararray, b12:float), c1:long"));
- LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a2:bytearray, b2:(b21:double, b22:long), c2:chararray"));
LogicalSchema mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.Union);
- LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:(a11:chararray, a12:float), b1:(), c1:chararray"));
expected.getField(1).schema = new LogicalSchema();
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.LoadForEach);
- expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ expected = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:(a11:chararray, a12:float), b1:(b11:chararray, b12:float), c1:long"));
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
mergedSchema = LogicalSchema.merge(b, a, LogicalSchema.MergeMode.LoadForEach);
- expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ expected = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a2:(a11:chararray, a12:float), b2:(b21:double, b22:long), c2:chararray"));
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
}
@Test
public void testNewMergeNullSchemas() throws Throwable {
- LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
- "a1:bytearray, b1:(b11:int, b12:float), c1:long"));
- LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
- "a2:bytearray, b2:(), c2:int"));
+ LogicalSchema a = Utils.parseSchema( "a1:bytearray, b1:(b11:int, b12:float), c1:long" );
+ LogicalSchema b = Utils.parseSchema( "a2:bytearray, b2:(), c2:int" );
LogicalSchema mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.Union);
- LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
- "a1:bytearray, b1:(), c1:long"));
+ LogicalSchema expected = Utils.parseSchema( "a1:bytearray, b1:(), c1:long" );
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.LoadForEach);
- expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
- "a1:bytearray, b1:(b11:int, b12:float), c1:long"));
+ expected = Utils.parseSchema( "a1:bytearray, b1:(b11:int, b12:float), c1:long" );
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
mergedSchema = LogicalSchema.merge(b, a, LogicalSchema.MergeMode.LoadForEach);
- expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
- "a2:bytearray, b2:(b11:int,b12:float), c2:int"));
+ expected = Utils.parseSchema( "a2:bytearray, b2:(b11:int,b12:float), c2:int" );
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
}
@Test
public void testNewMergeDifferentSize1() throws Throwable {
- LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
- "a1:bytearray, b1:long, c1:long"));
- LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
- "a2:bytearray, b2:long"));
+ LogicalSchema a = Utils.parseSchema( "a1:bytearray, b1:long, c1:long" );
+ LogicalSchema b = Utils.parseSchema( "a2:bytearray, b2:long" );
LogicalSchema mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.Union);
- assertTrue(mergedSchema==null);
+ Assert.assertTrue(mergedSchema==null);
try {
LogicalSchema.merge(a, b, LogicalSchema.MergeMode.LoadForEach);
- fail();
+ Assert.fail();
} catch (FrontendException e) {
- assertTrue(e.getErrorCode()==1031);
+ Assert.assertTrue(e.getErrorCode()==1031);
}
}
@Test
public void testNewMergeDifferentSize2() throws Throwable {
- LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:bytearray, b1:(b11:int, b12:float, b13:float), c1:long"));
- LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a2:bytearray, b2:(b21:double, b22:long), c2:int"));
LogicalSchema mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.Union);
- LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:bytearray, b1:(), c1:long"));
expected.getField(1).schema = new LogicalSchema();
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
try {
LogicalSchema.merge(a, b, LogicalSchema.MergeMode.LoadForEach);
- fail();
+ Assert.fail();
} catch (FrontendException e) {
- assertTrue(e.getErrorCode()==1031);
+ Assert.assertTrue(e.getErrorCode()==1031);
}
}
@Test
public void testNewMergeMismatchType1() throws Throwable {
- LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:chararray, b1:long, c1:long"));
- LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a2:bytearray, b2:(b21:double, b22:long), c2:int"));
LogicalSchema mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.Union);
- LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:chararray, b1:bytearray, c1:long"));
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
try {
LogicalSchema.merge(a, b, LogicalSchema.MergeMode.LoadForEach);
- fail();
+ Assert.fail();
} catch (FrontendException e) {
- assertTrue(e.getErrorCode()==1031);
+ Assert.assertTrue(e.getErrorCode()==1031);
}
try {
LogicalSchema.merge(b, a, LogicalSchema.MergeMode.LoadForEach);
- fail();
+ Assert.fail();
} catch (FrontendException e) {
- assertTrue(e.getErrorCode()==1031);
+ Assert.assertTrue(e.getErrorCode()==1031);
}
}
@Test
public void testNewMergeMismatchType2() throws Throwable {
- LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema a = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:chararray, b1:(b11:double, b12:(b121:int)), c1:long"));
- LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema b = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a2:bytearray, b2:(b21:double, b22:long), c2:int"));
LogicalSchema mergedSchema = LogicalSchema.merge(a, b, LogicalSchema.MergeMode.Union);
- LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
+ LogicalSchema expected = org.apache.pig.newplan.logical.Util.translateSchema(Utils.getSchemaFromString(
"a1:chararray, b1:(), c1:long"));
expected.getField(1).schema = new LogicalSchema();
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
try {
LogicalSchema.merge(a, b, LogicalSchema.MergeMode.LoadForEach);
- fail();
+ Assert.fail();
} catch (FrontendException e) {
- assertTrue(e.getErrorCode()==1031);
+ Assert.assertTrue(e.getErrorCode()==1031);
}
try {
LogicalSchema.merge(b, a, LogicalSchema.MergeMode.LoadForEach);
- fail();
+ Assert.fail();
} catch (FrontendException e) {
- assertTrue(e.getErrorCode()==1031);
+ Assert.assertTrue(e.getErrorCode()==1031);
}
}
}
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/TestScriptUDF.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/TestScriptUDF.java?rev=1099930&r1=1099929&r2=1099930&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/TestScriptUDF.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/TestScriptUDF.java Thu May 5 19:25:08 2011
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Random;
+import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.pig.ExecType;
@@ -36,7 +37,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
-public class TestScriptUDF extends TestCase {
+public class TestScriptUDF{
static MiniCluster cluster = MiniCluster.buildCluster();
private PigServer pigServer;
@@ -44,7 +45,6 @@ public class TestScriptUDF extends TestC
BagFactory mBf = BagFactory.getInstance();
@Before
- @Override
public void setUp() throws Exception{
FileLocalizer.setR(new Random());
pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
@@ -82,36 +82,36 @@ public class TestScriptUDF extends TestC
pigServer.registerQuery("C = foreach A generate square(a0);");
Iterator<Tuple> iter = pigServer.openIterator("B");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Tuple t = iter.next();
- assertTrue(t.toString().equals("(1)"));
+ Assert.assertTrue(t.toString().equals("(1)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(4)"));
+ Assert.assertTrue(t.toString().equals("(4)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(9)"));
+ Assert.assertTrue(t.toString().equals("(9)"));
iter = pigServer.openIterator("C");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(1)"));
+ Assert.assertTrue(t.toString().equals("(1)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(4)"));
+ Assert.assertTrue(t.toString().equals("(4)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(9)"));
+ Assert.assertTrue(t.toString().equals("(9)"));
}
@Test
@@ -141,20 +141,20 @@ public class TestScriptUDF extends TestC
pigServer.registerQuery("B = foreach A generate myfuncs.helloworld(), myfuncs.complex($0);");
Iterator<Tuple> iter = pigServer.openIterator("B");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Tuple t = iter.next();
- assertEquals(((Tuple)t.get(1)).get(1), 3);
+ Assert.assertEquals(((Tuple)t.get(1)).get(1), 3);
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertEquals(((Tuple)t.get(1)).get(1), 3);
+ Assert.assertEquals(((Tuple)t.get(1)).get(1), 3);
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertEquals(((Tuple)t.get(1)).get(1), 5);
+ Assert.assertEquals(((Tuple)t.get(1)).get(1), 5);
}
@@ -188,38 +188,38 @@ public class TestScriptUDF extends TestC
pigServer.registerQuery("C = foreach A generate square(a1);");
Iterator<Tuple> iter = pigServer.openIterator("B");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Tuple t = iter.next();
- assertTrue(t.toString().equals("(1)"));
+ Assert.assertTrue(t.toString().equals("(1)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(4)"));
+ Assert.assertTrue(t.toString().equals("(4)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(9)"));
+ Assert.assertTrue(t.toString().equals("(9)"));
// The same python function will operate on double and try to get square of double
// Since these are small double numbers we do not need to use delta to test the results
iter = pigServer.openIterator("C");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(9.0)"));
+ Assert.assertTrue(t.toString().equals("(9.0)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(16.0)"));
+ Assert.assertTrue(t.toString().equals("(16.0)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(25.0)"));
+ Assert.assertTrue(t.toString().equals("(25.0)"));
}
// See PIG-928
@@ -245,32 +245,32 @@ public class TestScriptUDF extends TestC
pigServer.registerQuery("B = foreach A generate pig.concat(a0);");
Iterator<Tuple> iter = pigServer.openIterator("B");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Tuple t = iter.next();
// We need to check whether this is a DataByteArray or fail otherwise
if(!(t.get(0) instanceof DataByteArray)) {
- fail("Default return type should be bytearray");
+ Assert.fail("Default return type should be bytearray");
}
- assertTrue(t.get(0).toString().trim().equals("hellohello"));
+ Assert.assertTrue(t.get(0).toString().trim().equals("hellohello"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.get(0).toString().trim().equals("pigpig"));
+ Assert.assertTrue(t.get(0).toString().trim().equals("pigpig"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.get(0).toString().trim().equals("worldworld"));
+ Assert.assertTrue(t.get(0).toString().trim().equals("worldworld"));
}
@Test
public void testPythonScriptUDFBagInput() throws Exception{
String[] script = {
"#!/usr/bin/python",
- "@outputSchema(\"bag:{(y:{t:(word:chararray)}}\")",
+ "@outputSchema(\"bag:{(y:{t:(word:chararray)})}\")",
"def collect(bag):" ,
"\toutBag = []",
"\tfor word in bag:",
@@ -296,7 +296,7 @@ public class TestScriptUDF extends TestC
pigServer.registerQuery("C = foreach B generate pig.collect(A);");
Iterator<Tuple> iter = pigServer.openIterator("C");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Tuple t = iter.next();
DataBag bag;
@@ -315,9 +315,9 @@ public class TestScriptUDF extends TestC
tup.append("program");
bag.add(tup);
- assertTrue(t.get(0).toString().equals(bag.toString()));
+ Assert.assertTrue(t.get(0).toString().equals(bag.toString()));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
bag = BagFactory.getInstance().newDefaultBag();
@@ -330,14 +330,14 @@ public class TestScriptUDF extends TestC
tup.append("hadoop");
bag.add(tup);
- assertTrue(t.get(0).toString().equals(bag.toString()));
+ Assert.assertTrue(t.get(0).toString().equals(bag.toString()));
}
@Test
public void testPythonScriptUDFMapInput() throws Exception{
String[] script = {
"#!/usr/bin/python",
- "@outputSchema(\"bag:{(y:{t:(word:chararray)}}\")",
+ "@outputSchema(\"bag:{(y:{t:(word:chararray)})}\")",
"def maptobag(map):" ,
"\toutBag = []",
"\tfor k, v in map.iteritems():",
@@ -359,7 +359,7 @@ public class TestScriptUDF extends TestC
pigServer.registerQuery("B = foreach A generate pig.maptobag(a0);");
Iterator<Tuple> iter = pigServer.openIterator("B");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Tuple t = iter.next();
DataBag bag;
@@ -373,21 +373,21 @@ public class TestScriptUDF extends TestC
tup.append(2);
tup.append("world");
bag.add(tup);
- assertTrue(t.get(0).toString().equals(bag.toString()));
+ Assert.assertTrue(t.get(0).toString().equals(bag.toString()));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
tup = TupleFactory.getInstance().newTuple();
tup.append(3);
tup.append("pig");
- assertTrue(t.toString().contains(tup.toString()));
+ Assert.assertTrue(t.toString().contains(tup.toString()));
tup = TupleFactory.getInstance().newTuple();
tup.append(4);
tup.append("rocks");
- assertTrue(t.toString().contains(tup.toString()));
+ Assert.assertTrue(t.toString().contains(tup.toString()));
- assertFalse(iter.hasNext());
+ Assert.assertFalse(iter.hasNext());
}
@@ -415,18 +415,18 @@ public class TestScriptUDF extends TestC
pigServer.registerQuery("B = foreach A generate pig.maptomapint(a0);");
Iterator<Tuple> iter = pigServer.openIterator("B");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Tuple t = iter.next();
- assertEquals(5, ((Map<?,?>)t.get(0)).get("1"));
- assertEquals(5, ((Map<?,?>)t.get(0)).get("2"));
+ Assert.assertEquals(5, ((Map<?,?>)t.get(0)).get("1"));
+ Assert.assertEquals(5, ((Map<?,?>)t.get(0)).get("2"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertEquals(3, ((Map<?,?>)t.get(0)).get("3"));
- assertEquals(5, ((Map<?,?>)t.get(0)).get("4"));
+ Assert.assertEquals(3, ((Map<?,?>)t.get(0)).get("3"));
+ Assert.assertEquals(5, ((Map<?,?>)t.get(0)).get("4"));
- assertFalse(iter.hasNext());
+ Assert.assertFalse(iter.hasNext());
}
@@ -434,7 +434,7 @@ public class TestScriptUDF extends TestC
public void testPythonScriptUDFNullInputOutput() throws Exception {
String[] script = {
"#!/usr/bin/python",
- "@outputSchema(\"bag:{(y:{t:(word:chararray)}}\")",
+ "@outputSchema(\"bag:{(y:{t:(word:chararray)})}\")",
"def multStr(cnt, str):" ,
"\tif cnt != None and str != None:",
"\t\treturn cnt * str",
@@ -455,16 +455,16 @@ public class TestScriptUDF extends TestC
pigServer.registerQuery("B = foreach A generate pig.multStr(a0, a1);");
Iterator<Tuple> iter = pigServer.openIterator("B");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Tuple t = iter.next();
- assertTrue(t.get(0).toString().equals("hellohellohello"));
+ Assert.assertTrue(t.get(0).toString().equals("hellohellohello"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
// UDF takes null and returns null
- assertTrue(t.get(0) == null);
+ Assert.assertTrue(t.get(0) == null);
}
@@ -492,22 +492,22 @@ public class TestScriptUDF extends TestC
pigServer.registerQuery("B = foreach A generate pig.square(a0);");
Iterator<Tuple> iter = pigServer.openIterator("B");
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Tuple t = iter.next();
- assertTrue(t.toString().equals("(1)"));
+ Assert.assertTrue(t.toString().equals("(1)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(4)"));
+ Assert.assertTrue(t.toString().equals("(4)"));
- assertTrue(iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
t = iter.next();
- assertTrue(t.toString().equals("(9)"));
+ Assert.assertTrue(t.toString().equals("(9)"));
- assertFalse(iter.hasNext());
+ Assert.assertFalse(iter.hasNext());
}
}
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/TestStore.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/TestStore.java?rev=1099930&r1=1099929&r2=1099930&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/TestStore.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/TestStore.java Thu May 5 19:25:08 2011
@@ -60,6 +60,7 @@ import org.apache.pig.impl.logicalLayer.
import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanValidationException;
+import org.apache.pig.impl.util.Utils;
import org.apache.pig.newplan.Operator;
import org.apache.pig.newplan.logical.relational.LOStore;
import org.apache.pig.newplan.logical.relational.LogicalPlan;
@@ -320,7 +321,7 @@ public class TestStore extends junit.fra
ResourceSchema rs = new BinStorage().getSchema(outputFileName,
new Job(ConfigurationUtil.toConfiguration(pig.getPigContext().
getProperties())));
- Schema expectedSchema = Util.getSchemaFromString(
+ Schema expectedSchema = Utils.getSchemaFromString(
"c:chararray,i:int,d:double");
Assert.assertTrue("Checking binstorage getSchema output", Schema.equals(
expectedSchema, Schema.getPigSchema(rs), true, true));
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java?rev=1099930&r1=1099929&r2=1099930&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java Thu May 5 19:25:08 2011
@@ -46,7 +46,6 @@ import org.apache.pig.EvalFunc;
import org.apache.pig.ExecType;
import org.apache.pig.FuncSpec;
import org.apache.pig.PigServer;
-import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.builtin.PigStorage;
import org.apache.pig.data.DataBag;
import org.apache.pig.data.DataByteArray;
@@ -64,6 +63,7 @@ import org.apache.pig.impl.plan.Compilat
import org.apache.pig.impl.plan.CompilationMessageCollector.Message;
import org.apache.pig.impl.plan.CompilationMessageCollector.MessageType;
import org.apache.pig.impl.util.MultiMap;
+import org.apache.pig.impl.util.Utils;
import org.apache.pig.newplan.DependencyOrderWalker;
import org.apache.pig.newplan.Operator;
import org.apache.pig.newplan.OperatorPlan;
@@ -3755,7 +3755,7 @@ public class TestTypeCheckingValidatorNe
String expectedSchemaString = "mygroup: chararray,A::name: chararray,A::age: int," +
"A::gpa: float,B::name: chararray,B::age: int," +
"B::registration: chararray,B::contributions: float";
- Schema expectedSchema = org.apache.pig.test.Util.getSchemaFromString(expectedSchemaString);
+ Schema expectedSchema = Utils.getSchemaFromString(expectedSchemaString);
Schema foreachSch = org.apache.pig.newplan.logical.Util.translateSchema(foreach.getSchema());
assertTrue(Schema.equals(foreachSch, expectedSchema, false, true));
@@ -4079,7 +4079,7 @@ public class TestTypeCheckingValidatorNe
Util.registerMultiLineQuery(pig, query);
Schema expectedSch =
- Util.getSchemaFromString("mx: double");
+ Utils.getSchemaFromString("mx: double");
Schema sch = pig.dumpSchema("d");
assertEquals("Checking expected schema", expectedSch, sch);
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/TestUnionOnSchema.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/TestUnionOnSchema.java?rev=1099930&r1=1099929&r2=1099930&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/TestUnionOnSchema.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/TestUnionOnSchema.java Thu May 5 19:25:08 2011
@@ -27,14 +27,14 @@ import java.io.PrintWriter;
import java.util.Iterator;
import java.util.List;
+import junit.framework.Assert;
+
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.lib.FieldSelectionMapReduce;
import org.apache.pig.EvalFunc;
import org.apache.pig.ExecType;
import org.apache.pig.PigException;
import org.apache.pig.PigServer;
-import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
@@ -44,15 +44,13 @@ import org.apache.pig.impl.logicalLayer.
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema;
import org.apache.pig.impl.util.LogUtils;
+import org.apache.pig.impl.util.Utils;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-
-
-
public class TestUnionOnSchema {
static MiniCluster cluster ;
private static final String EMPTY_DIR = "emptydir";
@@ -122,7 +120,7 @@ public class TestUnionOnSchema {
+ "u = union onschema l1, l2;"
;
Util.registerMultiLineQuery(pig, query);
- Schema expectedSch = Util.getSchemaFromString("i: int, j: int");
+ Schema expectedSch = Utils.getSchemaFromString("i: int, j: int");
Schema sch = pig.dumpSchema("u");
assertEquals("Checking expected schema",sch, expectedSch);
Iterator<Tuple> it = pig.openIterator("u");
@@ -157,7 +155,7 @@ public class TestUnionOnSchema {
Util.registerMultiLineQuery(pig, query);
Schema sch = pig.dumpSchema("fil");
- Schema expectedSch = Util.getSchemaFromString("i: int, x: int, j: int");
+ Schema expectedSch = Utils.getSchemaFromString("i: int, x: int, j: int");
assertEquals("Checking expected schema",sch, expectedSch);
@@ -192,7 +190,7 @@ public class TestUnionOnSchema {
Util.registerMultiLineQuery(pig, query);
Schema sch = pig.dumpSchema("fil");
- Schema expectedSch = Util.getSchemaFromString("i: int, x: int, y: int");
+ Schema expectedSch = Utils.getSchemaFromString("i: int, x: int, y: int");
assertEquals("Checking expected schema",sch, expectedSch);
@@ -252,7 +250,7 @@ public class TestUnionOnSchema {
String query = query_prefix + "u = union onschema f, l2; " ;
Util.registerMultiLineQuery(pig, query);
Schema sch = pig.dumpSchema("u");
- Schema expectedSch = Util.getSchemaFromString("i: int, j: int");
+ Schema expectedSch = Utils.getSchemaFromString("i: int, j: int");
assertEquals("Checking expected schema",sch, expectedSch);
Iterator<Tuple> it = pig.openIterator("u");
@@ -270,7 +268,7 @@ public class TestUnionOnSchema {
query = query_prefix + "u = union onschema l2, f; " ;
Util.registerMultiLineQuery(pig, query);
sch = pig.dumpSchema("u");
- expectedSch = Util.getSchemaFromString("i: int, j: int");
+ expectedSch = Utils.getSchemaFromString("i: int, j: int");
assertEquals("Checking expected schema",sch, expectedSch);
it = pig.openIterator("u");
Util.checkQueryOutputsAfterSort(it, expectedRes);
@@ -298,7 +296,7 @@ public class TestUnionOnSchema {
Schema sch = pig.dumpSchema("u");
Schema expectedSch =
- Util.getSchemaFromString("gkey: int, l1::i: int, l1::j: int, l2::i: int, l2::x: chararray");
+ Utils.getSchemaFromString("gkey: int, l1::i: int, l1::j: int, l2::i: int, l2::x: chararray");
assertEquals("Checking expected schema",sch, expectedSch);
Iterator<Tuple> it = pig.openIterator("u");
@@ -334,7 +332,7 @@ public class TestUnionOnSchema {
Schema sch = pig.dumpSchema("u");
Schema expectedSch =
- Util.getSchemaFromString("gkey: int, l1::i: int, l1::j: int, l2::i: int, l2::x: chararray");
+ Utils.getSchemaFromString("gkey: int, l1::i: int, l1::j: int, l2::i: int, l2::x: chararray");
assertEquals("Checking expected schema",sch, expectedSch);
Iterator<Tuple> it = pig.openIterator("u");
@@ -677,7 +675,7 @@ public class TestUnionOnSchema {
private void checkSchemaEquals(String query, String schemaStr) throws IOException, ParseException {
- Schema expectedSch = Util.getSchemaFromString(schemaStr);
+ Schema expectedSch = Utils.getSchemaFromString(schemaStr);
checkSchemaEquals(query, expectedSch);
}
@@ -700,9 +698,8 @@ public class TestUnionOnSchema {
Util.registerMultiLineQuery(pig, query);
Schema sch = pig.dumpSchema("u");
- Schema expectedSch =
- Util.getSchemaFromString("i: int, cj: chararray, uo: Tuple(), j: chararray");
- assertEquals("Checking expected schema",sch, expectedSch);
+ String expectedSch = "{i: int,cj: chararray,uo: (),j: chararray}";
+ Assert.assertTrue( expectedSch.equals( sch.toString() ) );
Iterator<Tuple> it = pig.openIterator("u");
@@ -746,7 +743,7 @@ public class TestUnionOnSchema {
Util.registerMultiLineQuery(pig, query);
Schema sch = pig.dumpSchema("u");
Schema expectedSch =
- Util.getSchemaFromString("i: int, mx: long");
+ Utils.getSchemaFromString("i: int, mx: long");
assertEquals("Checking expected schema",sch, expectedSch);
// verify schema for reverse order of relations as well
@@ -754,7 +751,7 @@ public class TestUnionOnSchema {
Util.registerMultiLineQuery(pig, query);
sch = pig.dumpSchema("u");
expectedSch =
- Util.getSchemaFromString("i: int, mx: long");
+ Utils.getSchemaFromString("i: int, mx: long");
assertEquals("Checking expected schema",sch, expectedSch);
@@ -800,7 +797,7 @@ public class TestUnionOnSchema {
Util.registerMultiLineQuery(pig, query);
Schema sch = pig.dumpSchema("u");
Schema expectedSch =
- Util.getSchemaFromString("i: int, mx: long");
+ Utils.getSchemaFromString("i: int, mx: long");
assertEquals("Checking expected schema",sch, expectedSch);
// verify schema for reverse order of relations as well
@@ -808,7 +805,7 @@ public class TestUnionOnSchema {
Util.registerMultiLineQuery(pig, query);
sch = pig.dumpSchema("u");
expectedSch =
- Util.getSchemaFromString("i: int, mx: long");
+ Utils.getSchemaFromString("i: int, mx: long");
assertEquals("Checking expected schema",sch, expectedSch);
@@ -865,7 +862,7 @@ public class TestUnionOnSchema {
Schema sch = pig.dumpSchema("u");
Schema expectedSch =
- Util.getSchemaFromString("gp: int,c::gp: int,i: int,j: int");
+ Utils.getSchemaFromString("gp: int,c::gp: int,i: int,j: int");
assertEquals("Checking expected schema",sch, expectedSch);
@@ -874,7 +871,7 @@ public class TestUnionOnSchema {
sch = pig.dumpSchema("u");
expectedSch =
- Util.getSchemaFromString("i: int,j: int, gp: int,c::gp: int");
+ Utils.getSchemaFromString("i: int,j: int, gp: int,c::gp: int");
assertEquals("Checking expected schema",sch, expectedSch);
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/Util.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/Util.java?rev=1099930&r1=1099929&r2=1099930&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/Util.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/Util.java Thu May 5 19:25:08 2011
@@ -21,7 +21,6 @@ import static java.util.regex.Matcher.qu
import static org.junit.Assert.fail;
import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -77,9 +76,6 @@ import org.apache.pig.data.TupleFactory;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
-import org.apache.pig.impl.logicalLayer.parser.QueryParser;
-import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.CompilationMessageCollector;
import org.apache.pig.impl.util.LogUtils;
import org.apache.pig.newplan.logical.optimizer.LogicalPlanPrinter;
@@ -96,6 +92,7 @@ import org.apache.pig.newplan.logical.vi
import org.apache.pig.newplan.logical.visitor.StoreAliasSetter;
import org.apache.pig.newplan.logical.visitor.TypeCheckingRelVisitor;
import org.apache.pig.newplan.logical.visitor.UnionOnSchemaSetter;
+import org.apache.pig.parser.ParserException;
import org.apache.pig.parser.QueryParserDriver;
import org.apache.pig.tools.grunt.GruntParser;
@@ -618,25 +615,13 @@ public class Util {
}
}
- public static Schema getSchemaFromString(String schemaString) throws ParseException {
- return Util.getSchemaFromString(schemaString, DataType.BYTEARRAY);
- }
-
- static Schema getSchemaFromString(String schemaString, byte defaultType) throws ParseException {
- ByteArrayInputStream stream = new ByteArrayInputStream(schemaString.getBytes()) ;
- QueryParser queryParser = new QueryParser(stream) ;
- Schema schema = queryParser.TupleSchema() ;
- Schema.setSchemaDefaultType(schema, defaultType);
- return schema;
- }
-
- public static Object getPigConstant(String pigConstantAsString) throws ParseException {
- ByteArrayInputStream stream = new ByteArrayInputStream(pigConstantAsString.getBytes()) ;
- QueryParser queryParser = new QueryParser(stream) ;
- return queryParser.Datum();
+ public static Object getPigConstant(String pigConstantAsString) throws ParserException {
+ QueryParserDriver queryParser = new QueryParserDriver( new PigContext(),
+ "util", new HashMap<String, String>() ) ;
+ return queryParser.parseConstant(pigConstantAsString);
}
- public static List<Tuple> getTuplesFromConstantTupleStrings(String[] tupleConstants) throws ParseException {
+ public static List<Tuple> getTuplesFromConstantTupleStrings(String[] tupleConstants) throws ParserException {
List<Tuple> result = new ArrayList<Tuple>(tupleConstants.length);
for(int i = 0; i < tupleConstants.length; i++) {
result.add((Tuple) getPigConstant(tupleConstants[i]));
@@ -645,7 +630,7 @@ public class Util {
}
public static List<Tuple> getTuplesFromConstantTupleStringAsByteArray(String[] tupleConstants)
- throws ParseException, ExecException{
+ throws ParserException, ExecException {
List<Tuple> tuples = getTuplesFromConstantTupleStrings(tupleConstants);
for(Tuple t : tuples){
for(int i=0; i<t.size(); i++){