Author: olga Date: Thu Oct 15 21:04:45 2009 New Revision: 825659 URL: http://svn.apache.org/viewvc?rev=825659&view=rev Log: PIG-1018: FINDBUGS: NM_FIELD_NAMING_CONVENTION: Field names should start with a lower case letter (olgan)
Removed: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/util/operatorHelper.java Modified: hadoop/pig/trunk/CHANGES.txt hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java hadoop/pig/trunk/src/org/apache/pig/pen/DerivedDataVisitor.java hadoop/pig/trunk/src/org/apache/pig/pen/EquivalenceClasses.java hadoop/pig/trunk/src/org/apache/pig/pen/ExampleGenerator.java hadoop/pig/trunk/src/org/apache/pig/pen/util/DisplayExamples.java hadoop/pig/trunk/test/findbugsExcludeFile.xml Modified: hadoop/pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=825659&r1=825658&r2=825659&view=diff ============================================================================== --- hadoop/pig/trunk/CHANGES.txt (original) +++ hadoop/pig/trunk/CHANGES.txt Thu Oct 15 21:04:45 2009 @@ -26,6 +26,9 @@ IMPROVEMENTS +PIG-1018: FINDBUGS: NM_FIELD_NAMING_CONVENTION: Field names should start with +a lower case letter (olgan) + PIG-1023: FINDBUGS: exclude CN_IDIOM_NO_SUPER_CALL (olgan) PIG-1019: added findbugs exclusion file (olgan) Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java?rev=825659&r1=825658&r2=825659&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java Thu Oct 15 21:04:45 2009 @@ -66,7 +66,7 @@ public class LogToPhyTranslationVisitor extends LOVisitor { - protected Map<LogicalOperator, PhysicalOperator> LogToPhyMap; + protected Map<LogicalOperator, PhysicalOperator> logToPhyMap; Random r = new Random(); @@ -88,7 +88,7 @@ currentPlans = new Stack<PhysicalPlan>(); currentPlan = new PhysicalPlan(); - LogToPhyMap = new HashMap<LogicalOperator, PhysicalOperator>(); + logToPhyMap = new HashMap<LogicalOperator, PhysicalOperator>(); } public void setPigContext(PigContext pc) { @@ -107,19 +107,19 @@ scope, nodeGen.getNextNodeId(scope)), op .getRequestedParallelism()); exprOp.setOperandType(op.getLhsOperand().getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { // currentExprPlan.connect(from, exprOp); currentPlan.connect(from, exprOp); @@ -138,19 +138,19 @@ scope, nodeGen.getNextNodeId(scope)), op .getRequestedParallelism()); exprOp.setOperandType(op.getLhsOperand().getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -168,18 +168,18 @@ scope, nodeGen.getNextNodeId(scope)), op .getRequestedParallelism()); exprOp.setOperandType(op.getLhsOperand().getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -197,18 +197,18 @@ scope, nodeGen.getNextNodeId(scope)), op .getRequestedParallelism()); exprOp.setOperandType(op.getLhsOperand().getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -226,18 +226,18 @@ scope, nodeGen.getNextNodeId(scope)), op .getRequestedParallelism()); exprOp.setOperandType(op.getLhsOperand().getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -255,18 +255,18 @@ scope, nodeGen.getNextNodeId(scope)), op .getRequestedParallelism()); exprOp.setOperandType(op.getLhsOperand().getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -283,18 +283,18 @@ BinaryComparisonOperator exprOp = new PORegexp(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); - exprOp.setLhs((ExpressionOperator)LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator)LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator)logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator)logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -311,18 +311,18 @@ BinaryExpressionOperator exprOp = new Add(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); exprOp.setResultType(op.getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -339,18 +339,18 @@ BinaryExpressionOperator exprOp = new Subtract(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); exprOp.setResultType(op.getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -367,18 +367,18 @@ BinaryExpressionOperator exprOp = new Multiply(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); exprOp.setResultType(op.getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -395,18 +395,18 @@ BinaryExpressionOperator exprOp = new Divide(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); exprOp.setResultType(op.getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -423,18 +423,18 @@ BinaryExpressionOperator exprOp = new Mod(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); exprOp.setResultType(op.getType()); - exprOp.setLhs((ExpressionOperator) LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator) LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator) logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator) logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if (predecessors == null) return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -449,17 +449,17 @@ public void visit(LOAnd op) throws VisitorException { String scope = op.getOperatorKey().scope; BinaryComparisonOperator exprOp = new POAnd(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); - exprOp.setLhs((ExpressionOperator)LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator)LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator)logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator)logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if(predecessors == null) return; for(LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -474,17 +474,17 @@ public void visit(LOOr op) throws VisitorException { String scope = op.getOperatorKey().scope; BinaryComparisonOperator exprOp = new POOr(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); - exprOp.setLhs((ExpressionOperator)LogToPhyMap.get(op.getLhsOperand())); - exprOp.setRhs((ExpressionOperator)LogToPhyMap.get(op.getRhsOperand())); + exprOp.setLhs((ExpressionOperator)logToPhyMap.get(op.getLhsOperand())); + exprOp.setRhs((ExpressionOperator)logToPhyMap.get(op.getRhsOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if(predecessors == null) return; for(LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -499,15 +499,15 @@ public void visit(LONot op) throws VisitorException { String scope = op.getOperatorKey().scope; UnaryComparisonOperator exprOp = new PONot(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); - exprOp.setExpr((ExpressionOperator)LogToPhyMap.get(op.getOperand())); + exprOp.setExpr((ExpressionOperator)logToPhyMap.get(op.getOperand())); LogicalPlan lp = op.getPlan(); currentPlan.add(exprOp); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); if(predecessors == null) return; - PhysicalOperator from = LogToPhyMap.get(predecessors.get(0)); + PhysicalOperator from = logToPhyMap.get(predecessors.get(0)); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -538,7 +538,7 @@ List<Boolean> flattenLst = Arrays.asList(true, true); for (LogicalOperator op : inputs) { - List<PhysicalOperator> pop = Arrays.asList(LogToPhyMap.get(op)); + List<PhysicalOperator> pop = Arrays.asList(logToPhyMap.get(op)); PhysicalPlan fep1 = new PhysicalPlan(); ConstantExpression ce1 = new ConstantExpression(new OperatorKey(scope, nodeGen.getNextNodeId(scope)),cs.getRequestedParallelism()); ce1.setValue(inputs.size()); @@ -575,7 +575,7 @@ POForEach fe = new POForEach(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), cs.getRequestedParallelism(), fePlans, flattenLst ); currentPlan.add(fe); - currentPlan.connect(LogToPhyMap.get(op), fe); + currentPlan.connect(logToPhyMap.get(op), fe); POLocalRearrange physOp = new POLocalRearrange(new OperatorKey( scope, nodeGen.getNextNodeId(scope)), cs @@ -640,7 +640,7 @@ String msg = "Invalid physical operators in the physical plan" ; throw new LogicalToPhysicalTranslatorException(msg, errCode, PigException.BUG, e1); } - LogToPhyMap.put(cs, fe); + logToPhyMap.put(cs, fe); } @Override @@ -713,7 +713,7 @@ currentPlan.add(physOp); try { - currentPlan.connect(LogToPhyMap.get(op), physOp); + currentPlan.connect(logToPhyMap.get(op), physOp); currentPlan.connect(physOp, poGlobal); } catch (PlanException e) { int errCode = 2015; @@ -726,7 +726,7 @@ poPackage.setResultType(DataType.TUPLE); poPackage.setNumInps(count); poPackage.setInner(cg.getInner()); - LogToPhyMap.put(cg, poPackage); + logToPhyMap.put(cg, poPackage); } @Override @@ -750,7 +750,7 @@ List<List<Byte>> keyTypes = new ArrayList<List<Byte>>(); for (LogicalOperator op : inputs) { - PhysicalOperator physOp = LogToPhyMap.get(op); + PhysicalOperator physOp = logToPhyMap.get(op); inp.add(physOp); List<LogicalPlan> plans = (List<LogicalPlan>) loj.getJoinPlans().get(op); List<PhysicalPlan> exprPlans = new ArrayList<PhysicalPlan>(); @@ -791,14 +791,14 @@ for (LogicalOperator op : inputs) { try { - currentPlan.connect(LogToPhyMap.get(op), skj); + currentPlan.connect(logToPhyMap.get(op), skj); } catch (PlanException e) { int errCode = 2015; String msg = "Invalid physical operators in the physical plan" ; throw new LogicalToPhysicalTranslatorException(msg, errCode, PigException.BUG, e); } } - LogToPhyMap.put(loj, skj); + logToPhyMap.put(loj, skj); } else if(loj.getJoinType() == LOJoin.JOINTYPE.REPLICATED) { @@ -817,14 +817,14 @@ currentPlan.add(pfrj); for (LogicalOperator op : inputs) { try { - currentPlan.connect(LogToPhyMap.get(op), pfrj); + currentPlan.connect(logToPhyMap.get(op), pfrj); } catch (PlanException e) { int errCode = 2015; String msg = "Invalid physical operators in the physical plan" ; throw new LogicalToPhysicalTranslatorException(msg, errCode, PigException.BUG, e); } } - LogToPhyMap.put(loj, pfrj); + logToPhyMap.put(loj, pfrj); } else if (loj.getJoinType() == LOJoin.JOINTYPE.MERGE && validateMergeJoin(loj)) { @@ -844,14 +844,14 @@ for (LogicalOperator op : inputs) { try { - currentPlan.connect(LogToPhyMap.get(op), smj); + currentPlan.connect(logToPhyMap.get(op), smj); } catch (PlanException e) { int errCode = 2015; String msg = "Invalid physical operators in the physical plan" ; throw new LogicalToPhysicalTranslatorException(msg, errCode, PigException.BUG, e); } } - LogToPhyMap.put(loj, smj); + logToPhyMap.put(loj, smj); return; } else if (loj.getJoinType() == LOJoin.JOINTYPE.REGULAR){ @@ -914,7 +914,7 @@ currentPlan.add(physOp); try { - currentPlan.connect(LogToPhyMap.get(op), physOp); + currentPlan.connect(logToPhyMap.get(op), physOp); currentPlan.connect(physOp, poGlobal); } catch (PlanException e) { int errCode = 2015; @@ -967,7 +967,7 @@ loj.getRequestedParallelism(), fePlans, flattenLst ); currentPlan.add(fe); currentPlan.connect(poPackage, fe); - LogToPhyMap.put(loj, fe); + logToPhyMap.put(loj, fe); }catch (PlanException e1) { int errCode = 2015; String msg = "Invalid physical operators in the physical plan" ; @@ -1106,7 +1106,7 @@ .getNextNodeId(scope)), filter.getRequestedParallelism()); poFilter.setResultType(filter.getType()); currentPlan.add(poFilter); - LogToPhyMap.put(filter, poFilter); + logToPhyMap.put(filter, poFilter); currentPlans.push(currentPlan); currentPlan = new PhysicalPlan(); @@ -1124,7 +1124,7 @@ PhysicalOperator from; if(op != null) { - from = LogToPhyMap.get(op.get(0)); + from = logToPhyMap.get(op.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Filter." ; @@ -1147,13 +1147,13 @@ .getNextNodeId(scope)), stream.getExecutableManager(), stream.getStreamingCommand(), this.pc.getProperties()); currentPlan.add(poStream); - LogToPhyMap.put(stream, poStream); + logToPhyMap.put(stream, poStream); List<LogicalOperator> op = stream.getPlan().getPredecessors(stream); PhysicalOperator from; if(op != null) { - from = LogToPhyMap.get(op.get(0)); + from = logToPhyMap.get(op.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Stream." ; @@ -1185,7 +1185,7 @@ exprOp.setStar(op.isStar()); exprOp.setOverloaded(op.getOverloaded()); LogicalPlan lp = op.getPlan(); - LogToPhyMap.put(op, exprOp); + logToPhyMap.put(op, exprOp); currentPlan.add(exprOp); List<LogicalOperator> predecessors = lp.getPredecessors(op); @@ -1195,7 +1195,7 @@ return; for (LogicalOperator lo : predecessors) { - PhysicalOperator from = LogToPhyMap.get(lo); + PhysicalOperator from = logToPhyMap.get(lo); try { currentPlan.connect(from, exprOp); } catch (PlanException e) { @@ -1231,7 +1231,7 @@ .getNextNodeId(scope)), g.getRequestedParallelism(), innerPlans, g.getFlatten()); poFE.setResultType(g.getType()); - LogToPhyMap.put(g, poFE); + logToPhyMap.put(g, poFE); currentPlan.add(poFE); // generate cannot have multiple inputs @@ -1241,7 +1241,7 @@ if (op == null) return; - PhysicalOperator from = LogToPhyMap.get(op.get(0)); + PhysicalOperator from = logToPhyMap.get(op.get(0)); try { currentPlan.connect(from, poFE); } catch (PlanException e) { @@ -1287,13 +1287,13 @@ } sort.setLimit(s.getLimit()); // sort.setRequestedParallelism(s.getType()); - LogToPhyMap.put(s, sort); + logToPhyMap.put(s, sort); currentPlan.add(sort); List<LogicalOperator> op = s.getPlan().getPredecessors(s); PhysicalOperator from; if(op != null) { - from = LogToPhyMap.get(op.get(0)); + from = logToPhyMap.get(op.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Sort." ; @@ -1321,14 +1321,14 @@ PhysicalOperator physOp = new PODistinct(new OperatorKey(scope, nodeGen .getNextNodeId(scope)), op.getRequestedParallelism()); physOp.setResultType(op.getType()); - LogToPhyMap.put(op, physOp); + logToPhyMap.put(op, physOp); currentPlan.add(physOp); // Distinct will only have a single input List<LogicalOperator> inputs = op.getPlan().getPredecessors(op); PhysicalOperator from; if(inputs != null) { - from = LogToPhyMap.get(inputs.get(0)); + from = logToPhyMap.get(inputs.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Distinct." ; @@ -1371,7 +1371,7 @@ } ((POSplit)physOp).setSplitStore(splStrFile); - LogToPhyMap.put(split, physOp); + logToPhyMap.put(split, physOp); currentPlan.add(physOp); @@ -1379,7 +1379,7 @@ PhysicalOperator from; if(op != null) { - from = LogToPhyMap.get(op.get(0)); + from = logToPhyMap.get(op.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Split." ; @@ -1400,7 +1400,7 @@ String scope = split.getOperatorKey().scope; PhysicalOperator physOp = new POFilter(new OperatorKey(scope, nodeGen .getNextNodeId(scope)), split.getRequestedParallelism()); - LogToPhyMap.put(split, physOp); + logToPhyMap.put(split, physOp); currentPlan.add(physOp); currentPlans.push(currentPlan); @@ -1419,7 +1419,7 @@ PhysicalOperator from; if(op != null) { - from = LogToPhyMap.get(op.get(0)); + from = logToPhyMap.get(op.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Split Output." ; @@ -1454,7 +1454,7 @@ List<org.apache.pig.impl.logicalLayer.ExpressionOperator> fromList = func.getArguments(); if(fromList!=null){ for (LogicalOperator op : fromList) { - PhysicalOperator from = LogToPhyMap.get(op); + PhysicalOperator from = logToPhyMap.get(op); try { currentPlan.connect(from, p); } catch (PlanException e) { @@ -1464,7 +1464,7 @@ } } } - LogToPhyMap.put(func, p); + logToPhyMap.put(func, p); } @@ -1477,7 +1477,7 @@ load.setPc(pc); load.setResultType(loLoad.getType()); currentPlan.add(load); - LogToPhyMap.put(loLoad, load); + logToPhyMap.put(loLoad, load); this.load = loLoad.getLoadFunc(); // Load is typically a root operator, but in the multiquery @@ -1486,7 +1486,7 @@ PhysicalOperator from; if(op != null) { - from = LogToPhyMap.get(op.get(0)); + from = logToPhyMap.get(op.get(0)); try { currentPlan.connect(from, load); @@ -1525,7 +1525,7 @@ PhysicalOperator from; if(op != null) { - from = LogToPhyMap.get(op.get(0)); + from = logToPhyMap.get(op.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Store." ; @@ -1539,7 +1539,7 @@ String msg = "Invalid physical operators in the physical plan" ; throw new LogicalToPhysicalTranslatorException(msg, errCode, PigException.BUG, e); } - LogToPhyMap.put(loStore, store); + logToPhyMap.put(loStore, store); } @Override @@ -1551,7 +1551,7 @@ ce.setResultType(op.getType()); //this operator doesn't have any predecessors currentPlan.add(ce); - LogToPhyMap.put(op, ce); + logToPhyMap.put(op, ce); } @Override @@ -1559,15 +1559,15 @@ String scope = op.getOperatorKey().scope; ExpressionOperator physOp = new POBinCond(new OperatorKey(scope, nodeGen.getNextNodeId(scope)), op.getRequestedParallelism()); - LogToPhyMap.put(op, physOp); + logToPhyMap.put(op, physOp); POBinCond phy = (POBinCond) physOp; - ExpressionOperator cond = (ExpressionOperator) LogToPhyMap.get(op + ExpressionOperator cond = (ExpressionOperator) logToPhyMap.get(op .getCond()); phy.setCond(cond); - ExpressionOperator lhs = (ExpressionOperator) LogToPhyMap.get(op + ExpressionOperator lhs = (ExpressionOperator) logToPhyMap.get(op .getLhsOp()); phy.setLhs(lhs); - ExpressionOperator rhs = (ExpressionOperator) LogToPhyMap.get(op + ExpressionOperator rhs = (ExpressionOperator) logToPhyMap.get(op .getRhsOp()); phy.setRhs(rhs); phy.setResultType(op.getType()); @@ -1576,7 +1576,7 @@ List<LogicalOperator> ops = op.getPlan().getPredecessors(op); for (LogicalOperator l : ops) { - ExpressionOperator from = (ExpressionOperator) LogToPhyMap.get(l); + ExpressionOperator from = (ExpressionOperator) logToPhyMap.get(l); try { currentPlan.connect(from, physOp); } catch (PlanException e) { @@ -1596,13 +1596,13 @@ null); currentPlan.add(physOp); - LogToPhyMap.put(op, physOp); + logToPhyMap.put(op, physOp); List<LogicalOperator> inputs = op.getPlan().getPredecessors(op); ExpressionOperator from; if(inputs != null) { - from = (ExpressionOperator)LogToPhyMap.get(inputs.get(0)); + from = (ExpressionOperator)logToPhyMap.get(inputs.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Negative." ; @@ -1631,7 +1631,7 @@ ExpressionOperator from; if(inputs != null) { - from = (ExpressionOperator)LogToPhyMap.get(inputs.get(0)); + from = (ExpressionOperator)logToPhyMap.get(inputs.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Null." ; @@ -1642,7 +1642,7 @@ physOp.setOperandType(op.getOperand().getType()); currentPlan.add(physOp); - LogToPhyMap.put(op, physOp); + logToPhyMap.put(op, physOp); ((POIsNull) physOp).setExpr(from); @@ -1665,9 +1665,9 @@ physOp.setResultType(op.getType()); currentPlan.add(physOp); - LogToPhyMap.put(op, physOp); + logToPhyMap.put(op, physOp); - ExpressionOperator from = (ExpressionOperator) LogToPhyMap.get(op + ExpressionOperator from = (ExpressionOperator) logToPhyMap.get(op .getMap()); try { currentPlan.connect(from, physOp); @@ -1686,8 +1686,8 @@ .getNextNodeId(scope)), op.getRequestedParallelism()); currentPlan.add(physOp); - LogToPhyMap.put(op, physOp); - ExpressionOperator from = (ExpressionOperator) LogToPhyMap.get(op + logToPhyMap.put(op, physOp); + ExpressionOperator from = (ExpressionOperator) logToPhyMap.get(op .getExpression()); physOp.setResultType(op.getType()); FuncSpec lfSpec = op.getLoadFuncSpec(); @@ -1711,13 +1711,13 @@ poLimit.setResultType(limit.getType()); poLimit.setLimit(limit.getLimit()); currentPlan.add(poLimit); - LogToPhyMap.put(limit, poLimit); + logToPhyMap.put(limit, poLimit); List<LogicalOperator> op = limit.getPlan().getPredecessors(limit); PhysicalOperator from; if(op != null) { - from = LogToPhyMap.get(op.get(0)); + from = logToPhyMap.get(op.get(0)); } else { int errCode = 2051; String msg = "Did not find a predecessor for Limit." ; @@ -1739,11 +1739,11 @@ .getNextNodeId(scope)), op.getRequestedParallelism()); currentPlan.add(physOp); physOp.setResultType(op.getType()); - LogToPhyMap.put(op, physOp); + logToPhyMap.put(op, physOp); List<LogicalOperator> ops = op.getInputs(); for (LogicalOperator l : ops) { - PhysicalOperator from = LogToPhyMap.get(l); + PhysicalOperator from = logToPhyMap.get(l); try { currentPlan.connect(from, physOp); } catch (PlanException e) { Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java?rev=825659&r1=825658&r2=825659&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java Thu Oct 15 21:04:45 2009 @@ -69,7 +69,7 @@ //This holds the outputs given out by the input expressions of any datatype protected Object [] bags = null; - //This is the template whcih contains tuples and is flattened out in CreateTuple() to generate the final output + //This is the template whcih contains tuples and is flattened out in createTuple() to generate the final output protected Object[] data = null; // store result types of the plan leaves @@ -333,8 +333,8 @@ } if(reporter!=null) reporter.progress(); - //CreateTuple(data); - res.result = CreateTuple(data); + //createTuple(data); + res.result = createTuple(data); res.returnStatus = POStatus.STATUS_OK; return res; } else { @@ -344,7 +344,7 @@ if(its[index] != null && isToBeFlattenedArray[index]) { if(its[index].hasNext()) { data[index] = its[index].next(); - res.result = CreateTuple(data); + res.result = createTuple(data); res.returnStatus = POStatus.STATUS_OK; return res; } @@ -370,7 +370,7 @@ * @param data array that is the template for the final flattened tuple * @return the final flattened tuple */ - protected Tuple CreateTuple(Object[] data) throws ExecException { + protected Tuple createTuple(Object[] data) throws ExecException { Tuple out = mTupleFactory.newTuple(); for(int i = 0; i < data.length; ++i) { Object in = data[i]; Modified: hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java?rev=825659&r1=825658&r2=825659&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java Thu Oct 15 21:04:45 2009 @@ -68,7 +68,7 @@ } public Map<LogicalOperator, PhysicalOperator> getLogToPhyMap() { - return LogToPhyMap; + return logToPhyMap; } @Override @@ -123,7 +123,7 @@ currentPlan.add(physOp); try { - currentPlan.connect(LogToPhyMap.get(lo), physOp); + currentPlan.connect(logToPhyMap.get(lo), physOp); currentPlan.connect(physOp, poc); } catch (PlanException e) { log.error("Invalid physical operators in the physical plan" @@ -132,7 +132,7 @@ } } - LogToPhyMap.put(cg, poc); + logToPhyMap.put(cg, poc); } @Override @@ -192,7 +192,7 @@ currentPlan.add(physOp); try { - currentPlan.connect(LogToPhyMap.get(lo), physOp); + currentPlan.connect(logToPhyMap.get(lo), physOp); currentPlan.connect(physOp, poc); } catch (PlanException e) { log.error("Invalid physical operators in the physical plan" @@ -239,7 +239,7 @@ fe.setResultType(DataType.BAG); currentPlan.add(fe); - LogToPhyMap.put(join, fe); + logToPhyMap.put(join, fe); try { currentPlan.connect(poc, fe); } catch (PlanException e) { @@ -255,10 +255,10 @@ PhysicalOperator physOp = new POSplit(new OperatorKey(scope, nodeGen .getNextNodeId(scope)), split.getRequestedParallelism()); - LogToPhyMap.put(split, physOp); + logToPhyMap.put(split, physOp); currentPlan.add(physOp); - PhysicalOperator from = LogToPhyMap.get(split.getPlan() + PhysicalOperator from = logToPhyMap.get(split.getPlan() .getPredecessors(split).get(0)); try { currentPlan.connect(from, physOp); @@ -273,7 +273,7 @@ String scope = split.getOperatorKey().scope; PhysicalOperator physOp = new POSplitOutput(new OperatorKey(scope, nodeGen .getNextNodeId(scope)), split.getRequestedParallelism()); - LogToPhyMap.put(split, physOp); + logToPhyMap.put(split, physOp); currentPlan.add(physOp); currentPlans.push(currentPlan); @@ -287,7 +287,7 @@ ((POSplitOutput) physOp).setPlan((PhysicalPlan) currentPlan); currentPlan = currentPlans.pop(); currentPlan.add(physOp); - PhysicalOperator from = LogToPhyMap.get(split.getPlan() + PhysicalOperator from = logToPhyMap.get(split.getPlan() .getPredecessors(split).get(0)); try { currentPlan.connect(from, physOp); @@ -304,11 +304,11 @@ .getNextNodeId(scope)), stream.getExecutableManager(), stream.getStreamingCommand(), pc.getProperties()); currentPlan.add(poStream); - LogToPhyMap.put(stream, poStream); + logToPhyMap.put(stream, poStream); List<LogicalOperator> op = stream.getPlan().getPredecessors(stream); - PhysicalOperator from = LogToPhyMap.get(op.get(0)); + PhysicalOperator from = logToPhyMap.get(op.get(0)); try { currentPlan.connect(from, poStream); } catch (PlanException e) { @@ -323,12 +323,12 @@ String scope = cross.getOperatorKey().scope; POCross pocross = new POCross(new OperatorKey(scope, nodeGen.getNextNodeId(scope))); - LogToPhyMap.put(cross, pocross); + logToPhyMap.put(cross, pocross); currentPlan.add(pocross); for(LogicalOperator in : cross.getInputs()) { - PhysicalOperator from = LogToPhyMap.get(in); + PhysicalOperator from = logToPhyMap.get(in); try { currentPlan.connect(from, pocross); } catch (PlanException e) { @@ -363,7 +363,7 @@ } //store.setPc(pc); currentPlan.add(store); - PhysicalOperator from = LogToPhyMap.get(loStore + PhysicalOperator from = logToPhyMap.get(loStore .getPlan().getPredecessors(loStore).get(0)); POCounter counter = new POCounter(new OperatorKey(scope, nodeGen.getNextNodeId(scope))); @@ -376,7 +376,7 @@ String msg = "Invalid physical operators in the physical plan" ; throw new LogicalToPhysicalTranslatorException(msg, errCode, PigException.BUG, e); } - LogToPhyMap.put(loStore, store); + logToPhyMap.put(loStore, store); } Modified: hadoop/pig/trunk/src/org/apache/pig/pen/DerivedDataVisitor.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/DerivedDataVisitor.java?rev=825659&r1=825658&r2=825659&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/pen/DerivedDataVisitor.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/pen/DerivedDataVisitor.java Thu Oct 15 21:04:45 2009 @@ -190,7 +190,7 @@ try { Collection<IdentityHashSet<Tuple>> eq = EquivalenceClasses - .GetEquivalenceClasses(cg, derivedData); + .getEquivalenceClasses(cg, derivedData); EqClasses.addAll(eq); OpToEqClasses.put(cg, eq); } catch (ExecException e) { @@ -241,7 +241,7 @@ derivedData.put(load, baseData.get(load)); Collection<IdentityHashSet<Tuple>> eq = EquivalenceClasses - .GetEquivalenceClasses(load, derivedData); + .getEquivalenceClasses(load, derivedData); EqClasses.addAll(eq); OpToEqClasses.put(load, eq); @@ -366,7 +366,7 @@ try { Collection<IdentityHashSet<Tuple>> eq = EquivalenceClasses - .GetEquivalenceClasses(op, derivedData); + .getEquivalenceClasses(op, derivedData); EqClasses.addAll(eq); OpToEqClasses.put(op, eq); } catch (ExecException e) { Modified: hadoop/pig/trunk/src/org/apache/pig/pen/EquivalenceClasses.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/EquivalenceClasses.java?rev=825659&r1=825658&r2=825659&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/pen/EquivalenceClasses.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/pen/EquivalenceClasses.java Thu Oct 15 21:04:45 2009 @@ -40,27 +40,27 @@ //These methods are used to generate equivalence classes given the operator name and the output from the operator //For example, it gives out 2 eq. classes for filter, one that passes the filter and one that doesn't public class EquivalenceClasses { - public static Collection<IdentityHashSet<Tuple>> GetEquivalenceClasses( + public static Collection<IdentityHashSet<Tuple>> getEquivalenceClasses( LogicalOperator op, Map<LogicalOperator, DataBag> derivedData) throws ExecException { if (op instanceof LOCogroup) - return GetEquivalenceClasses((LOCogroup) op, derivedData); + return getEquivalenceClasses((LOCogroup) op, derivedData); else if (op instanceof LOForEach) - return GetEquivalenceClasses((LOForEach) op, derivedData); + return getEquivalenceClasses((LOForEach) op, derivedData); else if (op instanceof LOFilter) - return GetEquivalenceClasses((LOFilter) op, derivedData); + return getEquivalenceClasses((LOFilter) op, derivedData); else if (op instanceof LOSort) - return GetEquivalenceClasses((LOSort) op, derivedData); + return getEquivalenceClasses((LOSort) op, derivedData); else if (op instanceof LOSplit) - return GetEquivalenceClasses((LOSplit) op, derivedData); + return getEquivalenceClasses((LOSplit) op, derivedData); else if (op instanceof LOUnion) - return GetEquivalenceClasses((LOUnion) op, derivedData); + return getEquivalenceClasses((LOUnion) op, derivedData); else if (op instanceof LOLoad) - return GetEquivalenceClasses((LOLoad) op, derivedData); + return getEquivalenceClasses((LOLoad) op, derivedData); throw new RuntimeException("Unrecognized logical operator."); } - static Collection<IdentityHashSet<Tuple>> GetEquivalenceClasses(LOLoad op, + static Collection<IdentityHashSet<Tuple>> getEquivalenceClasses(LOLoad op, Map<LogicalOperator, DataBag> derivedData) { // Since its a load, all the tuples belong to a single equivalence class Collection<IdentityHashSet<Tuple>> equivClasses = new LinkedList<IdentityHashSet<Tuple>>(); @@ -79,7 +79,7 @@ return equivClasses; } - static Collection<IdentityHashSet<Tuple>> GetEquivalenceClasses( + static Collection<IdentityHashSet<Tuple>> getEquivalenceClasses( LOCogroup op, Map<LogicalOperator, DataBag> derivedData) throws ExecException { Collection<IdentityHashSet<Tuple>> equivClasses = new LinkedList<IdentityHashSet<Tuple>>(); @@ -112,7 +112,7 @@ return equivClasses; } - static Collection<IdentityHashSet<Tuple>> GetEquivalenceClasses( + static Collection<IdentityHashSet<Tuple>> getEquivalenceClasses( LOForEach op, Map<LogicalOperator, DataBag> derivedData) { Collection<IdentityHashSet<Tuple>> equivClasses = new LinkedList<IdentityHashSet<Tuple>>(); @@ -126,7 +126,7 @@ return equivClasses; } - static Collection<IdentityHashSet<Tuple>> GetEquivalenceClasses( + static Collection<IdentityHashSet<Tuple>> getEquivalenceClasses( LOFilter op, Map<LogicalOperator, DataBag> derivedData) { Collection<IdentityHashSet<Tuple>> equivClasses = new LinkedList<IdentityHashSet<Tuple>>(); @@ -155,7 +155,7 @@ } - static Collection<IdentityHashSet<Tuple>> GetEquivalenceClasses(LOSort op, + static Collection<IdentityHashSet<Tuple>> getEquivalenceClasses(LOSort op, Map<LogicalOperator, DataBag> derivedData) { //We don't create any eq. class for sort IdentityHashSet<Tuple> temp = new IdentityHashSet<Tuple>(); @@ -164,13 +164,13 @@ return output; } - static Collection<IdentityHashSet<Tuple>> GetEquivalenceClasses(LOSplit op, + static Collection<IdentityHashSet<Tuple>> getEquivalenceClasses(LOSplit op, Map<LogicalOperator, DataBag> derivedData) { throw new RuntimeException( "LOSplit not supported yet in example generator."); } - static Collection<IdentityHashSet<Tuple>> GetEquivalenceClasses(LOUnion op, + static Collection<IdentityHashSet<Tuple>> getEquivalenceClasses(LOUnion op, Map<LogicalOperator, DataBag> derivedData) { // make one equivalence class per input relation Modified: hadoop/pig/trunk/src/org/apache/pig/pen/ExampleGenerator.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/ExampleGenerator.java?rev=825659&r1=825658&r2=825659&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/pen/ExampleGenerator.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/pen/ExampleGenerator.java Thu Oct 15 21:04:45 2009 @@ -139,9 +139,9 @@ + e.getMessage()); } - // DisplayExamples.PrintSimple(plan.getLeaves().get(0), + // DisplayExamples.printSimple(plan.getLeaves().get(0), // derivedData.derivedData); - System.out.println(DisplayExamples.PrintTabular(plan, + System.out.println(DisplayExamples.printTabular(plan, derivedData.derivedData)); return derivedData.derivedData; } @@ -232,4 +232,4 @@ return plan; } -} \ No newline at end of file +} Modified: hadoop/pig/trunk/src/org/apache/pig/pen/util/DisplayExamples.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/util/DisplayExamples.java?rev=825659&r1=825658&r2=825659&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/pen/util/DisplayExamples.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/pen/util/DisplayExamples.java Thu Oct 15 21:04:45 2009 @@ -35,10 +35,10 @@ //Class containing some generic printing methods to print example data in a simple/tabular form public class DisplayExamples { - public static StringBuffer Result = new StringBuffer(); + //public static StringBuffer result = new StringBuffer(); public static final int MAX_DATAATOM_LENGTH = 25; - static void PrintMetrics( + static void printMetrics( LogicalOperator op, Map<LogicalOperator, DataBag> derivedData, Map<LogicalOperator, Collection<IdentityHashSet<Tuple>>> OperatorToEqClasses) { @@ -61,27 +61,27 @@ OperatorToEqClasses, true) + "\n"); } - public static String PrintTabular(LogicalPlan lp, + public static String printTabular(LogicalPlan lp, Map<LogicalOperator, DataBag> exampleData) { StringBuffer output = new StringBuffer(); LogicalOperator currentOp = lp.getLeaves().get(0); - PrintTabular(currentOp, exampleData, output); + printTabular(currentOp, exampleData, output); return output.toString(); } - static void PrintTabular(LogicalOperator op, + static void printTabular(LogicalOperator op, Map<LogicalOperator, DataBag> exampleData, StringBuffer output) { DataBag bag = exampleData.get(op); List<LogicalOperator> inputs = op.getPlan().getPredecessors(op); if (inputs != null) { // to avoid an exception when op == LOLoad for (LogicalOperator Op : inputs) { - PrintTabular(Op, exampleData, output); + printTabular(Op, exampleData, output); } } if (op.getAlias() != null) { - // PrintTable(op, bag, output); + // printTable(op, bag, output); try { DisplayTable(MakeArray(op, bag), op, bag, output); } catch (FrontendException e) { @@ -95,18 +95,18 @@ } - public static void PrintSimple(LogicalOperator op, + public static void printSimple(LogicalOperator op, Map<LogicalOperator, DataBag> exampleData) { DataBag bag = exampleData.get(op); List<LogicalOperator> inputs = op.getPlan().getPredecessors(op); if (inputs != null) { for (LogicalOperator lOp : inputs) { - PrintSimple(lOp, exampleData); + printSimple(lOp, exampleData); } } if (op.getAlias() != null) { - // PrintTable(op, bag, output); + // printTable(op, bag, output); // DisplayTable(MakeArray(op, bag), op, bag, output); System.out.println(op.getAlias() + " : " + bag); } Modified: hadoop/pig/trunk/test/findbugsExcludeFile.xml URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/findbugsExcludeFile.xml?rev=825659&r1=825658&r2=825659&view=diff ============================================================================== --- hadoop/pig/trunk/test/findbugsExcludeFile.xml (original) +++ hadoop/pig/trunk/test/findbugsExcludeFile.xml Thu Oct 15 21:04:45 2009 @@ -13,7 +13,10 @@ <Class name="org.apache.pig.tools.parameters.JavaCharStream" /> </Match> <Match> - <Class name="org.apache.pig.tools.parameters.Token*" /> + <Class name="org.apache.pig.tools.parameters.Token" /> + </Match> + <Match> + <Class name="org.apache.pig.tools.parameters.TokenMgrError" /> </Match> <Match> <Class name="org.apache.pig.tools.parameters.ParamLoader" /> @@ -69,4 +72,11 @@ <Bug pattern="CN_IDIOM_NO_SUPER_CALL" /> </Match> + <Match> + <Class name="org.apache.pig.impl.util.WrappedIOException" /> + <Bug pattern="NM_CLASS_NOT_EXCEPTION" /> + </Match> + + + </FindBugsFilter>