You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ya...@apache.org on 2010/03/05 22:32:25 UTC
svn commit: r919628 - in /hadoop/pig/trunk/contrib/zebra: CHANGES.txt
src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java
Author: yanz
Date: Fri Mar 5 21:32:24 2010
New Revision: 919628
URL: http://svn.apache.org/viewvc?rev=919628&view=rev
Log:
PIG-1276: Pig resource schema interface changed, so Zebra needs to catch exception thrown from the new interfaces. (xuefuz via yanz)
Modified:
hadoop/pig/trunk/contrib/zebra/CHANGES.txt
hadoop/pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java
Modified: hadoop/pig/trunk/contrib/zebra/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/CHANGES.txt?rev=919628&r1=919627&r2=919628&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/CHANGES.txt (original)
+++ hadoop/pig/trunk/contrib/zebra/CHANGES.txt Fri Mar 5 21:32:24 2010
@@ -60,6 +60,8 @@
BUG FIXES
+ PIG-1276: Pig resource schema interface changed, so Zebra needs to catch exception thrown from the new interfaces. (xuefuz via yanz)
+
PIG-1256: Bag field should always contain a tuple type as the field schema in ResourceSchema object converted from Zebra Schema (xuefuz via yanz)
PIG-1227: Throw exception if column group meta file is missing for an unsorted table (yanz)
Modified: hadoop/pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java?rev=919628&r1=919627&r2=919628&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java Fri Mar 5 21:32:24 2010
@@ -18,6 +18,8 @@
package org.apache.hadoop.zebra.pig;
+import java.io.IOException;
+
import org.apache.hadoop.zebra.parser.ParseException;
import org.apache.hadoop.zebra.schema.ColumnType;
import org.apache.hadoop.zebra.schema.Schema.ColumnSchema;
@@ -136,7 +138,8 @@
return schema;
}
- public static ResourceSchema convertToResourceSchema(org.apache.hadoop.zebra.schema.Schema tSchema) {
+ public static ResourceSchema convertToResourceSchema(org.apache.hadoop.zebra.schema.Schema tSchema)
+ throws IOException {
if( tSchema == null )
return null;
@@ -154,8 +157,8 @@
return rSchema;
}
- public static ResourceFieldSchema convertToResourceFieldSchema(
- ColumnSchema cSchema) {
+ private static ResourceFieldSchema convertToResourceFieldSchema(
+ ColumnSchema cSchema) throws IOException {
ResourceFieldSchema field = new ResourceFieldSchema();
if( cSchema.getType() ==ColumnType.ANY && cSchema.getName().isEmpty() ) { // For anonymous column