You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by jc...@apache.org on 2012/07/19 00:08:47 UTC
svn commit: r1363146 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/parser/LogicalPlanBuilder.java
Author: jcoveney
Date: Wed Jul 18 22:08:47 2012
New Revision: 1363146
URL: http://svn.apache.org/viewvc?rev=1363146&view=rev
Log:
PIG-2825: StoreFunc signature setting in LogicalPlan broken (jcoveney)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1363146&r1=1363145&r2=1363146&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Jul 18 22:08:47 2012
@@ -204,6 +204,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-2825: StoreFunc signature setting in LogicalPlan broken (jcoveney)
+
PIG-2815: class loader management in PigContext (rangadi via jcoveney)
PIG-2813: Fix test regressions from PIG-2632 (jcoveney)
Modified: pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java?rev=1363146&r1=1363145&r2=1363146&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java (original)
+++ pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java Wed Jul 18 22:08:47 2012
@@ -20,7 +20,6 @@ package org.apache.pig.parser;
import java.io.IOException;
import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -718,7 +717,10 @@ public class LogicalPlanBuilder {
StoreFuncInterface stoFunc = (StoreFuncInterface)PigContext.instantiateFuncFromSpec(instantiatedFuncSpec);
String fileNameKey = inputAlias + "_" + (storeIndex++) ;
- stoFunc.setStoreFuncUDFContextSignature(fileNameKey);
+
+ String signature = inputAlias + "_" + newOperatorKey();
+ stoFunc.setStoreFuncUDFContextSignature(signature);
+
String absolutePath = fileNameMap.get(fileNameKey);
if (absolutePath == null) {
absolutePath = stoFunc.relToAbsPathForStoreLocation(
@@ -730,7 +732,8 @@ public class LogicalPlanBuilder {
fileNameMap.put(fileNameKey, absolutePath);
}
FileSpec fileSpec = new FileSpec(absolutePath, funcSpec);
- LOStore op = new LOStore(plan, fileSpec, stoFunc, inputAlias + "_" + newOperatorKey());
+
+ LOStore op = new LOStore(plan, fileSpec, stoFunc, signature);
return buildOp(loc, op, alias, inputAlias, null);
} catch(Exception ex) {
throw new ParserValidationException(intStream, loc, ex);