Author: daijy
Date: Fri Mar 5 07:18:07 2010
New Revision: 919319
URL: http://svn.apache.org/viewvc?rev=919319&view=rev
Log:
PIG-1261: PigStorageSchema broke after changes to ResourceSchema
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/src/org/apache/pig/ResourceSchema.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
Modified: hadoop/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=919319&r1=919318&r2=919319&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Fri Mar 5 07:18:07 2010
@@ -143,6 +143,9 @@
BUG FIXES
+PIG-1261: PigStorageSchema broke after changes to ResourceSchema (dvryaboy via
+daijy)
+
PIG-1053: Put pig.properties back into release distribution (gates).
PIG-1273: Skewed join throws error (rding)
Modified: hadoop/pig/trunk/src/org/apache/pig/ResourceSchema.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/ResourceSchema.java?rev=919319&r1=919318&r2=919319&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/ResourceSchema.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/ResourceSchema.java Fri Mar 5 07:18:07
2010
@@ -154,7 +154,7 @@
return getDescription(true);
}
- public String getCastString() {
+ public String calcCastString() {
return getDescription(false);
}
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java?rev=919319&r1=919318&r2=919319&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
Fri Mar 5 07:18:07 2010
@@ -101,7 +101,7 @@
public String name() {
if (resultType==DataType.BAG||resultType==DataType.TUPLE)
return "Cast" + "[" + DataType.findTypeName(resultType)+":"
- + fieldSchema.getCastString() + "]" + " - "
+ + fieldSchema.calcCastString() + "]" + " - "
+ mKey.toString();
else
return "Cast" + "[" + DataType.findTypeName(resultType) + "]" + "
- "
