You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by jc...@apache.org on 2012/10/08 20:03:33 UTC
svn commit: r1395698 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/data/BinInterSedes.java
test/org/apache/pig/builtin/mock/TestMockStorage.java
test/org/apache/pig/test/TestOrderBy.java
test/org/apache/pig/test/TestPigServer.java
Author: jcoveney
Date: Mon Oct 8 18:03:33 2012
New Revision: 1395698
URL: http://svn.apache.org/viewvc?rev=1395698&view=rev
Log:
PIG-2961: BinInterSedesRawComparator broken by TUPLE_number patch (jcoveney)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/data/BinInterSedes.java
pig/trunk/test/org/apache/pig/builtin/mock/TestMockStorage.java
pig/trunk/test/org/apache/pig/test/TestOrderBy.java
pig/trunk/test/org/apache/pig/test/TestPigServer.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1395698&r1=1395697&r2=1395698&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Oct 8 18:03:33 2012
@@ -289,6 +289,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-2961: BinInterSedesRawComparator broken by TUPLE_number patch (jcoveney)
+
PIG-2932: Setting high default_parallel causes IOException in local mode (cheolsoo via gates)
PIG-2737: [piggybank] TestIndexedStorage is failing, should be refactored (jcoveney)
Modified: pig/trunk/src/org/apache/pig/data/BinInterSedes.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/data/BinInterSedes.java?rev=1395698&r1=1395697&r2=1395698&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/data/BinInterSedes.java (original)
+++ pig/trunk/src/org/apache/pig/data/BinInterSedes.java Mon Oct 8 18:03:33 2012
@@ -1146,6 +1146,16 @@ public class BinInterSedes implements In
case BinInterSedes.SMALLCHARARRAY:
case BinInterSedes.CHARARRAY:
return DataType.CHARARRAY;
+ case BinInterSedes.TUPLE_0:
+ case BinInterSedes.TUPLE_1:
+ case BinInterSedes.TUPLE_2:
+ case BinInterSedes.TUPLE_3:
+ case BinInterSedes.TUPLE_4:
+ case BinInterSedes.TUPLE_5:
+ case BinInterSedes.TUPLE_6:
+ case BinInterSedes.TUPLE_7:
+ case BinInterSedes.TUPLE_8:
+ case BinInterSedes.TUPLE_9:
case BinInterSedes.TUPLE:
case BinInterSedes.TINYTUPLE:
case BinInterSedes.SMALLTUPLE:
Modified: pig/trunk/test/org/apache/pig/builtin/mock/TestMockStorage.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/builtin/mock/TestMockStorage.java?rev=1395698&r1=1395697&r2=1395698&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/builtin/mock/TestMockStorage.java (original)
+++ pig/trunk/test/org/apache/pig/builtin/mock/TestMockStorage.java Mon Oct 8 18:03:33 2012
@@ -1,7 +1,11 @@
package org.apache.pig.builtin.mock;
-import static junit.framework.Assert.*;
-import static org.apache.pig.builtin.mock.Storage.*;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+import static org.apache.pig.builtin.mock.Storage.resetData;
+import static org.apache.pig.builtin.mock.Storage.schema;
+import static org.apache.pig.builtin.mock.Storage.tuple;
import java.util.HashSet;
import java.util.List;
@@ -13,7 +17,6 @@ import org.apache.pig.backend.executione
import org.apache.pig.backend.executionengine.ExecJob.JOB_STATUS;
import org.apache.pig.builtin.mock.Storage.Data;
import org.apache.pig.data.Tuple;
-import org.apache.pig.impl.util.Utils;
import org.junit.Test;
public class TestMockStorage {
Modified: pig/trunk/test/org/apache/pig/test/TestOrderBy.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestOrderBy.java?rev=1395698&r1=1395697&r2=1395698&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestOrderBy.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestOrderBy.java Mon Oct 8 18:03:33 2012
@@ -17,6 +17,9 @@
*/
package org.apache.pig.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -26,24 +29,18 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-@RunWith(JUnit4.class)
-public class TestOrderBy extends TestCase {
+public class TestOrderBy {
private static final int DATALEN = 1024;
private String[][] DATA = new String[2][DATALEN];
static MiniCluster cluster = MiniCluster.buildCluster();
Modified: pig/trunk/test/org/apache/pig/test/TestPigServer.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPigServer.java?rev=1395698&r1=1395697&r2=1395698&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPigServer.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPigServer.java Mon Oct 8 18:03:33 2012
@@ -18,7 +18,9 @@
package org.apache.pig.test;
-import static org.junit.Assert.assertEquals;
+import static junit.framework.Assert.assertEquals;
+import static org.apache.pig.builtin.mock.Storage.resetData;
+import static org.apache.pig.builtin.mock.Storage.tuple;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -45,6 +47,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
+import org.apache.pig.builtin.mock.Storage.Data;
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.PigContext;
@@ -669,4 +672,25 @@ public class TestPigServer {
propertyFile.delete();
}
+
+ @Test
+ public void testSecondarySort() throws Exception {
+ PigServer pigServer = new PigServer(ExecType.LOCAL);
+ Data data = resetData(pigServer);
+
+ data.set("foo",
+ tuple("a", 1, "b"),
+ tuple("b", 2, "c"),
+ tuple("c", 3, "d")
+ );
+
+ pigServer.registerQuery("A = LOAD 'foo' USING mock.Storage() AS (f1:chararray,f2:int,f3:chararray);");
+ pigServer.registerQuery("B = order A by f1,f2,f3 DESC;");
+ pigServer.registerQuery("STORE B INTO 'bar' USING mock.Storage();");
+
+ List<Tuple> out = data.get("bar");
+ assertEquals(tuple("a", 1, "b"), out.get(0));
+ assertEquals(tuple("b", 2, "c"), out.get(1));
+ assertEquals(tuple("c", 3, "d"), out.get(2));
+ }
}