You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2011/04/25 23:09:57 UTC
svn commit: r1096605 - in /pig/branches/branch-0.9: CHANGES.txt
src/org/apache/pig/ResourceSchema.java
test/org/apache/pig/test/TestResourceSchema.java
Author: daijy
Date: Mon Apr 25 21:09:56 2011
New Revision: 1096605
URL: http://svn.apache.org/viewvc?rev=1096605&view=rev
Log:
PIG-1976: One more TwoLevelAccess to remove
Modified:
pig/branches/branch-0.9/CHANGES.txt
pig/branches/branch-0.9/src/org/apache/pig/ResourceSchema.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestResourceSchema.java
Modified: pig/branches/branch-0.9/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/CHANGES.txt?rev=1096605&r1=1096604&r2=1096605&view=diff
==============================================================================
--- pig/branches/branch-0.9/CHANGES.txt (original)
+++ pig/branches/branch-0.9/CHANGES.txt Mon Apr 25 21:09:56 2011
@@ -168,6 +168,8 @@ PIG-1696: Performance: Use System.arrayc
BUG FIXES
+PIG-1976: One more TwoLevelAccess to remove (daijy)
+
PIG-1865: BinStorage/PigStorageSchema cannot load data from a different namenode (daijy)
PIG-1910: incorrect schema shown when project-star is used with other projections (daijy)
Modified: pig/branches/branch-0.9/src/org/apache/pig/ResourceSchema.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/src/org/apache/pig/ResourceSchema.java?rev=1096605&r1=1096604&r2=1096605&view=diff
==============================================================================
--- pig/branches/branch-0.9/src/org/apache/pig/ResourceSchema.java (original)
+++ pig/branches/branch-0.9/src/org/apache/pig/ResourceSchema.java Mon Apr 25 21:09:56 2011
@@ -88,21 +88,14 @@ public class ResourceSchema implements S
* Construct using a {@link org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema} as the template.
* @param fieldSchema fieldSchema to copy from
*/
- @SuppressWarnings("deprecation")
public ResourceFieldSchema(FieldSchema fieldSchema) {
type = fieldSchema.type;
name = fieldSchema.alias;
description = "autogenerated from Pig Field Schema";
Schema inner = fieldSchema.schema;
- if (type == DataType.BAG && fieldSchema.schema != null
- && !fieldSchema.schema.isTwoLevelAccessRequired()) {
- log.info("Insert two-level access to Resource Schema");
- FieldSchema fs = new FieldSchema("t", fieldSchema.schema);
- inner = new Schema(fs);
- }
// allow partial schema
- if ((type == DataType.BAG || type == DataType.TUPLE)
+ if ((type == DataType.BAG || type == DataType.TUPLE || type == DataType.MAP)
&& inner != null) {
schema = new ResourceSchema(inner);
} else {
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/TestResourceSchema.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/TestResourceSchema.java?rev=1096605&r1=1096604&r2=1096605&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/TestResourceSchema.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/TestResourceSchema.java Mon Apr 25 21:09:56 2011
@@ -25,6 +25,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import junit.framework.Assert;
+
import org.apache.pig.ResourceSchema;
import org.apache.pig.SortColInfo;
import org.apache.pig.SortInfo;
@@ -240,8 +242,12 @@ public class TestResourceSchema {
Schema.FieldSchema fld0 =
new Schema.FieldSchema("f0", level0, DataType.BAG);
Schema level1 = new Schema(fld0);
- Schema genSchema = Schema.getPigSchema(new ResourceSchema(level1));
- assertTrue(CheckTwoLevelAccess(genSchema));
+ try {
+ Schema.getPigSchema(new ResourceSchema(level1));
+ Assert.fail();
+ } catch(FrontendException e) {
+ assertTrue(e.getErrorCode()==2218);
+ }
}
/**
@@ -257,7 +263,11 @@ public class TestResourceSchema {
Schema.FieldSchema fld0 =
new Schema.FieldSchema("f0", level0, DataType.BAG);
Schema level1 = new Schema(fld0);
- Schema genSchema = Schema.getPigSchema(new ResourceSchema(level1));
- assertTrue(CheckTwoLevelAccess(genSchema));
+ try {
+ Schema.getPigSchema(new ResourceSchema(level1));
+ Assert.fail();
+ } catch (FrontendException e) {
+ assertTrue(e.getErrorCode()==2218);
+ }
}
}