svn commit: r1809778 - in /pig/trunk: CHANGES.txt src/org/apache/pig/builtin/BagToTuple.java test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java

[rohini]

Author: rohini
Date: Tue Sep 26 19:27:04 2017
New Revision: 1809778

URL: http://svn.apache.org/viewvc?rev=1809778&view=rev
Log:
PIG-5272: BagToTuple output schema is incorrect (juen1jp via rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/builtin/BagToTuple.java
    pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1809778&r1=1809777&r2=1809778&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Sep 26 19:27:04 2017
@@ -52,6 +52,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-5272: BagToTuple output schema is incorrect (juen1jp via rohini)
+
 PIG-5271: StackOverflowError when compiling in Tez mode (with union and 
replicated join) (knoguchi)
 
 PIG-5299: PartitionFilterOptimizer failing at compile time (knoguchi)

Modified: pig/trunk/src/org/apache/pig/builtin/BagToTuple.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/BagToTuple.java?rev=1809778&r1=1809777&r2=1809778&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/BagToTuple.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/BagToTuple.java Tue Sep 26 19:27:04 
2017
@@ -129,12 +129,8 @@ public class BagToTuple extends EvalFunc
                        }
 
                        // now for output schema
-                       Schema tupleOutputSchema = new Schema();
-                       for (int i = 0; i < firstFieldSchema.schema.size(); 
++i) {
-                               
tupleOutputSchema.add(firstFieldSchema.schema.getField(i));
-                       }
                        return new Schema(new 
Schema.FieldSchema(getSchemaName(this
-                                       .getClass().getName().toLowerCase(), 
inputSchema), tupleOutputSchema,
+                                       .getClass().getName().toLowerCase(), 
inputSchema), null,
                                        DataType.TUPLE));
                } catch (FrontendException e) {
                        e.printStackTrace();

Modified: pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java?rev=1809778&r1=1809777&r2=1809778&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java 
(original)
+++ pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java Tue 
Sep 26 19:27:04 2017
@@ -171,8 +171,7 @@ public class TestBuiltInBagToTupleOrStri
 
        @Test
        public void testOutputSchemaForBagToTupleUDF() throws Exception {
-               Schema expectedSch = Schema.generateNestedSchema(DataType.TUPLE,
-                               DataType.INTEGER, DataType.CHARARRAY);
+               Schema expectedSch = new Schema(new FieldSchema(null, 
DataType.TUPLE));
 
                FieldSchema tupSch = new FieldSchema(null, DataType.TUPLE);
                tupSch.schema = new Schema();
@@ -416,7 +415,7 @@ public class TestBuiltInBagToTupleOrStri
                pigServer.registerQuery("B = FOREACH A GENERATE 
BagToTuple(myBag) as myBag;");
            pigServer.registerQuery("STORE B INTO 'bar' USING mock.Storage();");
 
-           assertEquals(schema("myBag:(l:chararray)"), data.getSchema("bar"));
+           assertEquals(schema("myBag:()"), data.getSchema("bar"));
 
            List<Tuple> out = data.get("bar");
            assertEquals(tuple("a", "b","c"), out.get(0).get(0));