svn commit: r1666531 - in /pig/trunk: CHANGES.txt test/org/apache/pig/test/TestBuiltin.java

[daijy]

Author: daijy
Date: Fri Mar 13 18:00:03 2015
New Revision: 1666531

URL: http://svn.apache.org/r1666531
Log:
PIG-4460: TestBuiltIn testValueListOutputSchemaComplexType and 
testValueSetOutputSchemaComplexType tests create bags whose inner schema is not 
a tuple

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/org/apache/pig/test/TestBuiltin.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1666531&r1=1666530&r2=1666531&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Mar 13 18:00:03 2015
@@ -54,6 +54,9 @@ PIG-4333: Split BigData tests into multi
  
 BUG FIXES
 
+PIG-4460: TestBuiltIn testValueListOutputSchemaComplexType and 
testValueSetOutputSchemaComplexType tests
+ create bags whose inner schema is not a tuple (erwaman via daijy)
+
 PIG-4448: AvroMapWrapper leaks Avro data types when the map values are complex 
avro records (rdsr via daijy)
 
 PIG-4453: Remove test-tez-local target (daijy)

Modified: pig/trunk/test/org/apache/pig/test/TestBuiltin.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestBuiltin.java?rev=1666531&r1=1666530&r2=1666531&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestBuiltin.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestBuiltin.java Fri Mar 13 18:00:03 2015
@@ -2956,12 +2956,13 @@ public class TestBuiltin {
     @Test
     public void testValueSetOutputSchemaComplexType() throws FrontendException 
{
         Schema inputSchema = new Schema();
-        Schema bagSchema = Schema.generateNestedSchema(DataType.BAG, 
DataType.CHARARRAY);
+        Schema tupleSchema = Schema.generateNestedSchema(DataType.TUPLE, 
DataType.CHARARRAY);
+        Schema bagSchema = new Schema(new FieldSchema(null, tupleSchema, 
DataType.BAG));
         FieldSchema mapSchema = new FieldSchema(null, bagSchema, DataType.MAP);
         inputSchema.add(mapSchema);
 
-        Schema tupleSchema = new Schema(new FieldSchema(null, bagSchema, 
DataType.TUPLE));
-        Schema expectedSchema = new Schema(new FieldSchema(null, tupleSchema, 
DataType.BAG));
+        Schema tupleOfBagSchema = new Schema(new FieldSchema(null, bagSchema, 
DataType.TUPLE));
+        Schema expectedSchema = new Schema(new FieldSchema(null, 
tupleOfBagSchema, DataType.BAG));
 
         VALUESET vs = new VALUESET();
         assertEquals(expectedSchema, vs.outputSchema(inputSchema));
@@ -3015,12 +3016,13 @@ public class TestBuiltin {
     @Test
     public void testValueListOutputSchemaComplexType() throws 
FrontendException {
         Schema inputSchema = new Schema();
-        Schema bagSchema = Schema.generateNestedSchema(DataType.BAG, 
DataType.CHARARRAY);
+        Schema tupleSchema = Schema.generateNestedSchema(DataType.TUPLE, 
DataType.CHARARRAY);
+        Schema bagSchema = new Schema(new FieldSchema(null, tupleSchema, 
DataType.BAG));
         FieldSchema mapSchema = new FieldSchema(null, bagSchema, DataType.MAP);
         inputSchema.add(mapSchema);
 
-        Schema tupleSchema = new Schema(new FieldSchema(null, bagSchema, 
DataType.TUPLE));
-        Schema expectedSchema = new Schema(new FieldSchema(null, tupleSchema, 
DataType.BAG));
+        Schema tupleOfBagSchema = new Schema(new FieldSchema(null, bagSchema, 
DataType.TUPLE));
+        Schema expectedSchema = new Schema(new FieldSchema(null, 
tupleOfBagSchema, DataType.BAG));
 
         VALUELIST vl = new VALUELIST();
         assertEquals(expectedSchema, vl.outputSchema(inputSchema));