Author: pradeepkth
Date: Wed Jan 27 23:08:19 2010
New Revision: 903899

URL: http://svn.apache.org/viewvc?rev=903899&view=rev
Log:
PIG-1090: additional patch to setup UDFContext in committer and remove 
redundant call to setStoreLocation in JobControlCompiler (pradeepkth)

Modified:
    
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
    
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
    
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java

Modified: 
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java?rev=903899&r1=903898&r2=903899&view=diff
==============================================================================
--- 
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
 (original)
+++ 
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
 Wed Jan 27 23:08:19 2010
@@ -444,7 +444,6 @@
             for (POStore st: mapStores) {
                 storeLocations.add(st);
                 StoreFunc sFunc = st.getStoreFunc();
-                sFunc.setStoreLocation(st.getSFile().getFileName(), nwJob);
                 if (st.getSchema()!=null)
                     sFunc.checkSchema(new ResourceSchema(st.getSchema(), 
st.getSortInfo()));
             }
@@ -452,7 +451,6 @@
             for (POStore st: reduceStores) {
                 storeLocations.add(st);
                 StoreFunc sFunc = st.getStoreFunc();
-                sFunc.setStoreLocation(st.getSFile().getFileName(), nwJob);
                 if (st.getSchema()!=null)
                     sFunc.checkSchema(new ResourceSchema(st.getSchema(), 
st.getSortInfo()));
             }

Modified: 
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java?rev=903899&r1=903898&r2=903899&view=diff
==============================================================================
--- 
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
 (original)
+++ 
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
 Wed Jan 27 23:08:19 2010
@@ -120,6 +120,8 @@
     
     private TaskAttemptContext setUpContext(TaskAttemptContext context, 
             POStore store) throws IOException {
+        // Setup UDFContext so StoreFunc can make use of it
+        MapRedUtil.setupUDFContext(taskattemptcontext.getConfiguration());
         // make a copy of the context so that the actions after this call
         // do not end up updating the same context
         TaskAttemptContext contextCopy = new TaskAttemptContext(

Modified: 
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java?rev=903899&r1=903898&r2=903899&view=diff
==============================================================================
--- 
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java
 (original)
+++ 
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java
 Wed Jan 27 23:08:19 2010
@@ -65,7 +65,7 @@
      
     public RecordWriter<WritableComparable, Tuple> 
getRecordWriter(TaskAttemptContext taskattemptcontext)
                 throws IOException, InterruptedException {
-        // Setup UDFContext so in StoreFunc can make use of it
+        // Setup UDFContext so StoreFunc can make use of it
         MapRedUtil.setupUDFContext(taskattemptcontext.getConfiguration());
         List<POStore> mapStores = getStores(taskattemptcontext, 
                 JobControlCompiler.PIG_MAP_STORES);


Reply via email to