Author: daijy
Date: Mon Apr 12 19:00:44 2010
New Revision: 933364
URL: http://svn.apache.org/viewvc?rev=933364&view=rev
Log:
PIG-1330: Move pruned schema tracking logic from LoadFunc to core code
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/src/org/apache/pig/LoadMetadata.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java
Modified: hadoop/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=933364&r1=933363&r2=933364&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Mon Apr 12 19:00:44 2010
@@ -104,6 +104,8 @@ manner (rding via pradeepkth)
IMPROVEMENTS
+PIG-1330: Move pruned schema tracking logic from LoadFunc to core code (daijy)
+
PIG-1320: more documentation updates for Pig 0.7.0 (chandec via olgan)
PIG-1320: documentation updates for Pig 0.7.0 (chandec via olgan)
Modified: hadoop/pig/trunk/src/org/apache/pig/LoadMetadata.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/LoadMetadata.java?rev=933364&r1=933363&r2=933364&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/LoadMetadata.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/LoadMetadata.java Mon Apr 12 19:00:44
2010
@@ -39,7 +39,8 @@ public interface LoadMetadata {
* @return schema for the data to be loaded. This schema should represent
* all tuples of the returned data. If the schema is unknown or it is
* not possible to return a schema that represents all returned data,
- * then null should be returned.
+ * then null should be returned. The schema should not affected by
pushProjection, ie.
+ * getSchema should always return the original schema even after
pushProjection
* @throws IOException if an exception occurs while determining the schema
*/
ResourceSchema getSchema(String location, Job job) throws
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java?rev=933364&r1=933363&r2=933364&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java Mon Apr
12 19:00:44 2010
@@ -266,7 +266,7 @@ public class LOLoad extends RelationalOp
}
} else {
try {
- inputSchema = determineSchema();
+ inputSchema = getSchema();
} catch (IOException ioe) {
mProjectionMap = null;
return mProjectionMap;
