svn commit: r1773277 - in /pig/branches/branch-0.16: CHANGES.txt test/org/apache/pig/impl/builtin/TestHiveUDTF.java

[daijy]

Author: daijy
Date: Thu Dec  8 18:12:17 2016
New Revision: 1773277

URL: http://svn.apache.org/viewvc?rev=1773277&view=rev
Log:
PIG-5074: Build broken when hadoopversion=20 in branch 0.16

Modified:
    pig/branches/branch-0.16/CHANGES.txt
    pig/branches/branch-0.16/test/org/apache/pig/impl/builtin/TestHiveUDTF.java

Modified: pig/branches/branch-0.16/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/branches/branch-0.16/CHANGES.txt?rev=1773277&r1=1773276&r2=1773277&view=diff
==============================================================================
--- pig/branches/branch-0.16/CHANGES.txt (original)
+++ pig/branches/branch-0.16/CHANGES.txt Thu Dec  8 18:12:17 2016
@@ -32,6 +32,8 @@ OPTIMIZATIONS
 
 BUG FIXES
 
+PIG-5074: Build broken when hadoopversion=20 in branch 0.16 (szita via daijy)
+
 PIG-5064: NPE in TestScriptUDF#testPythonBuiltinModuleImport1 when JAVA_HOME 
is not set (water via daijy)
 
 PIG-5048: HiveUDTF fail if it is the first expression in projection (nkollar 
via daijy)

Modified: 
pig/branches/branch-0.16/test/org/apache/pig/impl/builtin/TestHiveUDTF.java
URL: 
http://svn.apache.org/viewvc/pig/branches/branch-0.16/test/org/apache/pig/impl/builtin/TestHiveUDTF.java?rev=1773277&r1=1773276&r2=1773277&view=diff
==============================================================================
--- pig/branches/branch-0.16/test/org/apache/pig/impl/builtin/TestHiveUDTF.java 
(original)
+++ pig/branches/branch-0.16/test/org/apache/pig/impl/builtin/TestHiveUDTF.java 
Thu Dec  8 18:12:17 2016
@@ -17,7 +17,6 @@
  */
 package org.apache.pig.impl.builtin;
 
-import org.apache.commons.collections4.IteratorUtils;
 import org.apache.pig.ExecType;
 import org.apache.pig.PigServer;
 import org.apache.pig.backend.executionengine.ExecException;
@@ -32,6 +31,8 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 import static org.apache.pig.builtin.mock.Storage.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -63,7 +64,7 @@ public class TestHiveUDTF {
         pigServer.registerQuery("B = foreach A generate posexplode(a0);");
 
         Iterator<Tuple> result = pigServer.openIterator("B");
-        List<Tuple> out = IteratorUtils.toList(result);
+        List<Tuple> out = Lists.newArrayList(result);
 
         assertEquals(2, out.size());
         assertTrue("Result doesn't contain the HiveUDTF output",
@@ -85,7 +86,7 @@ public class TestHiveUDTF {
         pigServer.registerQuery("B = foreach A generate a0, posexplode(a0);");
 
         Iterator<Tuple> result = pigServer.openIterator("B");
-        List<Tuple> out = IteratorUtils.toList(result);
+        List<Tuple> out = Lists.newArrayList(result);
 
         assertEquals(2, out.size());
         assertTrue("Result doesn't contain the HiveUDTF output",
@@ -107,7 +108,7 @@ public class TestHiveUDTF {
         pigServer.registerQuery("b = foreach a generate 
flatten(COUNT2(name));");
 
         Iterator<Tuple> result = pigServer.openIterator("b");
-        List<Tuple> out = IteratorUtils.toList(result);
+        List<Tuple> out = Lists.newArrayList(result);
 
         assertEquals(2, out.size());
         assertEquals(tuple(3), out.get(0));