You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2010/03/11 19:33:27 UTC

svn commit: r921974 - in /hadoop/pig/trunk: ./ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/ src/org/apache/pig/backend/hadoop/executionengine/physicalLa...

Author: daijy
Date: Thu Mar 11 18:33:26 2010
New Revision: 921974

URL: http://svn.apache.org/viewvc?rev=921974&view=rev
Log:
PIG-1262: Additional findbugs and javac warnings

Modified:
    hadoop/pig/trunk/CHANGES.txt
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSplit.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/WeightedRangePartitioner.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java
    hadoop/pig/trunk/src/org/apache/pig/builtin/PigStorage.java
    hadoop/pig/trunk/src/org/apache/pig/impl/io/ReadToEndLoader.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
    hadoop/pig/trunk/src/org/apache/pig/impl/util/LogUtils.java
    hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java
    hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java
    hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplit.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=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Thu Mar 11 18:33:26 2010
@@ -66,6 +66,8 @@ manner (rding via pradeepkth)
 
 IMPROVEMENTS
 
+PIG-1262: Additional findbugs and javac warnings (daijy)
+
 PIG-1248: [piggybank] some useful String functions (dvryaboy)
 
 PIG-1251: Move SortInfo calculation earlier in compilation (ashutoshc)

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java Thu Mar 11 18:33:26 2010
@@ -2063,7 +2063,7 @@ public class MRCompiler extends PhyPlanV
                     if(val<=0)
                         val = pigContext.defaultParallel;
                     if (val<=0)
-                        val = ((JobConf)((HExecutionEngine)eng).getJobConf()).getNumReduceTasks();
+                        val = ((HExecutionEngine)eng).getJobConf().getNumReduceTasks();
                     if (val<=0)
                         val = 1;
                 } catch (Exception e) {

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java Thu Mar 11 18:33:26 2010
@@ -69,7 +69,7 @@ public class MapReducePOStoreImpl extend
         PigOutputFormat.setLocation(context, store);
         OutputFormat outputFormat = null;
         try {
-            outputFormat = (OutputFormat)storeFunc.getOutputFormat();
+            outputFormat = storeFunc.getOutputFormat();
 
             // create a new record writer
             writer = outputFormat.getRecordWriter(context);

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java Thu Mar 11 18:33:26 2010
@@ -21,7 +21,6 @@ import org.apache.pig.backend.hadoop.exe
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.expressionOperators.*;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.*;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POSplit;
-import org.apache.pig.pen.physicalOperators.*;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
 import org.apache.pig.impl.plan.DependencyOrderWalker;
@@ -297,8 +296,4 @@ public class PhyPlanSetter extends PhyPl
         preCombinerLocalRearrange.setParentPlan(parent);
     }
 
-    @Override
-    public void visitCross(POCross cross) {
-        cross.setParentPlan(parent);
-    }
 }

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java Thu Mar 11 18:33:26 2010
@@ -55,16 +55,6 @@ public class PigOutputCommitter extends 
     List<Pair<OutputCommitter, POStore>> reduceOutputCommitters;
     
     /**
-     * Store(s) in the map
-     */
-    List<POStore> mapStores;
-    
-    /**
-     * Store(s) in the reduce
-     */
-    List<POStore> reduceStores;
-    
-    /**
      * @param context
      * @throws IOException
      */

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSplit.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSplit.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSplit.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSplit.java Thu Mar 11 18:33:26 2010
@@ -123,6 +123,7 @@ public class PigSplit extends InputSplit
         return wrappedSplit.getLength();
     }
     
+    @SuppressWarnings("unchecked")
     public void readFields(DataInput is) throws IOException {
         splitIndex = is.readInt();
         inputIndex = is.readInt();
@@ -130,8 +131,7 @@ public class PigSplit extends InputSplit
         String splitClassName = is.readUTF();
         try {
             Class splitClass = conf.getClassByName(splitClassName);
-            wrappedSplit = (InputSplit) 
-            ReflectionUtils.newInstance(splitClass, conf);
+            wrappedSplit = (InputSplit)ReflectionUtils.newInstance(splitClass, conf);
             SerializationFactory sf = new SerializationFactory(conf);
             // The correct call sequence for Deserializer is, we shall open, then deserialize, but we shall not close
             Deserializer d = sf.getDeserializer(splitClass);
@@ -143,6 +143,7 @@ public class PigSplit extends InputSplit
         
     }
 
+    @SuppressWarnings("unchecked")
     public void write(DataOutput os) throws IOException {
         os.writeInt(splitIndex);
         os.writeInt(inputIndex);

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java Thu Mar 11 18:33:26 2010
@@ -360,7 +360,7 @@ public class SecondaryKeyOptimizer exten
                 if (!found)
                 {
                     int errorCode = 2214;
-                    new VisitorException("Cannot find POLocalRearrange to set secondary plan", errorCode);
+                    throw new VisitorException("Cannot find POLocalRearrange to set secondary plan", errorCode);
                 }
             }
             POPackage pack = (POPackage) root;

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/WeightedRangePartitioner.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/WeightedRangePartitioner.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/WeightedRangePartitioner.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/WeightedRangePartitioner.java Thu Mar 11 18:33:26 2010
@@ -59,7 +59,7 @@ public class WeightedRangePartitioner ex
                                       implements Configurable {
     PigNullableWritable[] quantiles;
     RawComparator<PigNullableWritable> comparator;
-    public static Map<PigNullableWritable,DiscreteProbabilitySampleGenerator> weightedParts 
+    final public static Map<PigNullableWritable,DiscreteProbabilitySampleGenerator> weightedParts 
         = new HashMap<PigNullableWritable, DiscreteProbabilitySampleGenerator>();
     
     private static final Log log = LogFactory.getLog(WeightedRangePartitioner.class);

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=921974&r1=921973&r2=921974&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 Thu Mar 11 18:33:26 2010
@@ -666,9 +666,9 @@ public class POCast extends ExpressionOp
             Result res = in.getNext(b);
             if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
                 if (((Boolean) res.result) == true)
-                    res.result = new String("1");
+                    res.result = "1";
                 else
-                    res.result = new String("1");
+                    res.result = "0";
             }
             return res;
         }
@@ -676,7 +676,7 @@ public class POCast extends ExpressionOp
             Integer dummyI = null;
             Result res = in.getNext(dummyI);
             if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
-                res.result = new String(((Integer) res.result).toString());
+                res.result = ((Integer) res.result).toString();
             }
             return res;
         }
@@ -686,7 +686,7 @@ public class POCast extends ExpressionOp
             Result res = in.getNext(d);
             if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
                 // res.result = DataType.toInteger(res.result);
-                res.result = new String(((Double) res.result).toString());
+                res.result = ((Double) res.result).toString();
             }
             return res;
         }
@@ -696,7 +696,7 @@ public class POCast extends ExpressionOp
             Long l = null;
             Result res = in.getNext(l);
             if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
-                res.result = new String(((Long) res.result).toString());
+                res.result = ((Long) res.result).toString();
             }
             return res;
         }
@@ -705,7 +705,7 @@ public class POCast extends ExpressionOp
             Float f = null;
             Result res = in.getNext(f);
             if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
-                res.result = new String(((Float) res.result).toString());
+                res.result = ((Float) res.result).toString();
             }
             return res;
         }

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java Thu Mar 11 18:33:26 2010
@@ -22,8 +22,6 @@ import java.util.List;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.PhysicalOperator;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.expressionOperators.*;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.*;
-import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POSplit;
-import org.apache.pig.pen.physicalOperators.*;
 import org.apache.pig.impl.plan.PlanVisitor;
 import org.apache.pig.impl.plan.PlanWalker;
 import org.apache.pig.impl.plan.VisitorException;
@@ -128,6 +126,18 @@ public class PhyPlanVisitor extends Plan
 	public void visitDistinct(PODistinct distinct) throws VisitorException {
         //do nothing		
 	}
+	
+    public void visitPenCross(org.apache.pig.pen.physicalOperators.POCross cross) throws VisitorException {
+        //do nothing
+    }
+    
+    public void visitPenCogroup(org.apache.pig.pen.physicalOperators.POCogroup cogroup) throws VisitorException {
+        //do nothing
+    }
+    
+    public void visitPenSplit(org.apache.pig.pen.physicalOperators.POSplit split) throws VisitorException {
+        //do nothing
+    }
 
 	public void visitRead(PORead read) throws VisitorException {
         //do nothing		
@@ -265,16 +275,6 @@ public class PhyPlanVisitor extends Plan
         
     }
 
-    public void visitCogroup(POCogroup cogroup) {
-	// TODO Auto-generated method stub
-	
-    }
-
-    public void visitSplit(org.apache.pig.pen.physicalOperators.POSplit split) {
-	// TODO Auto-generated method stub
-	
-    }
-
 	public void visitSkewedJoin(POSkewedJoin sk) throws VisitorException {
 
 	}
@@ -320,10 +320,5 @@ public class PhyPlanVisitor extends Plan
         
     }
 
-    public void visitCross(POCross cross) {
-        // TODO Auto-generated method stub
-        
-    }
-
 
 }

Modified: hadoop/pig/trunk/src/org/apache/pig/builtin/PigStorage.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/PigStorage.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/builtin/PigStorage.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/builtin/PigStorage.java Thu Mar 11 18:33:26 2010
@@ -139,6 +139,7 @@ LoadPushDown {
 
     protected ByteArrayOutputStream mOut = new ByteArrayOutputStream(BUFFER_SIZE);
 
+    @SuppressWarnings("unchecked")
     @Override
     public void putNext(Tuple f) throws IOException {
         // I have to convert integer fields to string, and then to bytes.
@@ -200,8 +201,6 @@ LoadPushDown {
             {
                 if (rf.getIndex()!=-1)
                     mRequiredColumns[rf.getIndex()] = true;
-                else
-                    mRequiredColumns[rf.getIndex()] = false;
             }
             Properties p = UDFContext.getUDFContext().getUDFProperties(this.getClass());
             try {

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/io/ReadToEndLoader.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/io/ReadToEndLoader.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/io/ReadToEndLoader.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/io/ReadToEndLoader.java Thu Mar 11 18:33:26 2010
@@ -136,6 +136,7 @@ public class ReadToEndLoader extends Loa
         init();
     }
     
+    @SuppressWarnings("unchecked")
     private void init() throws IOException {
         // make a copy so that if the underlying InputFormat writes to the
         // conf, we don't affect the caller's copy

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java Thu Mar 11 18:33:26 2010
@@ -680,7 +680,7 @@ public class Schema implements Serializa
     public FieldSchema getField(String alias) throws FrontendException {
         FieldSchema fs = mAliases.get(alias);
         if(null == fs) {
-            String cocoPrefix = new String("::" + alias);
+            String cocoPrefix = "::" + alias;
             Map<String, Integer> aliasMatches = new HashMap<String, Integer>();
             //build the map of aliases that have cocoPrefix as the suffix
             for(String key: mAliases.keySet()) {
@@ -806,7 +806,7 @@ public class Schema implements Serializa
                         if (aliases != null) {
                             List<String> listAliases = new ArrayList<String>();
                             for(String alias: aliases) {
-                                listAliases.add(new String(alias));
+                                listAliases.add(alias);
                             }
                             for(String alias: listAliases) {
                                 log.debug("Removing alias " + alias + " from multimap");

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/util/LogUtils.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/util/LogUtils.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/util/LogUtils.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/util/LogUtils.java Thu Mar 11 18:33:26 2010
@@ -146,7 +146,6 @@ public class LogUtils {
             }
             fos.write(bs.toString().getBytes("UTF-8"));
             fos.write(marker.getBytes("UTF-8"));
-            fos.close();
             if(displayFooter) {
                 if(verbose) {
                     System.err.println("Details also at logfile: " + logFileName);
@@ -157,6 +156,11 @@ public class LogUtils {
         } catch (IOException ioe) {
             log.warn("Could not write to log file: " + logFileName + " :" + ioe.getMessage());
             log.error(bs.toString());
+        } finally {
+            try {
+                fos.close();
+            } catch (IOException e) {
+            }
         }
     }
     
@@ -189,10 +193,14 @@ public class LogUtils {
                     fos.write((message + "\n\n").getBytes("UTF-8"));
                 }
             }
-            fos.close();
         } catch (IOException ioe) {
             log.warn("Could not write to log file: " + logFileName + " :" + ioe.getMessage());
             log.error(message);
+        } finally {
+            try {
+                fos.close();
+            } catch (IOException e) {
+            }
         }
     }
 

Modified: hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java Thu Mar 11 18:33:26 2010
@@ -80,7 +80,7 @@ public class POCogroup extends PhysicalO
     @Override
     public void visit(PhyPlanVisitor v) throws VisitorException {
 	// TODO Auto-generated method stub
-	v.visitCogroup(this);
+	v.visitPenCogroup(this);
 
     }
 

Modified: hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java Thu Mar 11 18:33:26 2010
@@ -69,7 +69,7 @@ public class POCross extends PhysicalOpe
     @Override
     public void visit(PhyPlanVisitor v) throws VisitorException {
         // TODO Auto-generated method stub
-        v.visitCross(this);
+        v.visitPenCross(this);
 
     }
     

Modified: hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplit.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplit.java?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplit.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplit.java Thu Mar 11 18:33:26 2010
@@ -84,7 +84,7 @@ public class POSplit extends PhysicalOpe
 
     @Override
     public void visit(PhyPlanVisitor v) throws VisitorException {
-	v.visitSplit(this);
+	v.visitPenSplit(this);
     }
 
     @Override

Modified: hadoop/pig/trunk/test/findbugsExcludeFile.xml
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/findbugsExcludeFile.xml?rev=921974&r1=921973&r2=921974&view=diff
==============================================================================
--- hadoop/pig/trunk/test/findbugsExcludeFile.xml (original)
+++ hadoop/pig/trunk/test/findbugsExcludeFile.xml Thu Mar 11 18:33:26 2010
@@ -334,4 +334,77 @@
         <Method name = "bytesToBoolean" />
         <Bug pattern="NP_BOOLEAN_RETURN_NULL" />
     </Match>
+    <Match>
+        <Class name="org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigMapReduce" />
+        <Field name = "sJobContext" />
+        <Bug pattern="MS_CANNOT_BE_FINAL" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.partitioners.WeightedRangePartitioner" />
+        <Method name = "setConf" />
+        <Bug pattern="REC_CATCH_EXCEPTION" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POSort$UDFSortComparator" />
+        <Bug pattern="SE_INNER_CLASS" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POSort$SortComparator" />
+        <Bug pattern="SE_INNER_CLASS" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.data.DataByteArray" />
+        <Method name = "equals" />
+        <Bug pattern="EQ_UNUSUAL" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.data.DefaultAbstractBag" />
+        <Method name = "equals" />
+        <Bug pattern="EQ_UNUSUAL" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.data.DefaultTuple" />
+        <Method name = "equals" />
+        <Bug pattern="EQ_UNUSUAL" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.data.NonSpillableDataBag" />
+        <Method name = "equals" />
+        <Bug pattern="EQ_UNUSUAL" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.data.SingleTupleBag" />
+        <Method name = "equals" />
+        <Bug pattern="EQ_ALWAYS_TRUE" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.data.SortedDataBag$DefaultComparator" />
+        <Method name = "equals" />
+        <Bug pattern="EQ_ALWAYS_FALSE" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.data.SortedDataBag" />
+        <Method name = "equals" />
+        <Bug pattern="EQ_ALWAYS_FALSE" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.impl.io.PigNullableWritable" />
+        <Method name = "equals" />
+        <Bug pattern="EQ_UNUSUAL" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.impl.logicalLayer.schema.Schema" />
+        <Method name = "equals" />
+        <Bug pattern="NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE" />
+    </Match>
+    <Match>
+        <Class name="org.apache.pig.impl.logicalLayer.schema.Schema$FieldSchema" />
+        <Method name = "equals" />
+        <Bug pattern="NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE" />
+    </Match>
+    <Match>
+        <Class name="org.apache.tools.bzip2r.BZip2Constants" />
+        <Field name = "rNums" />
+        <Bug pattern="MS_OOI_PKGPROTECT" />
+    </Match>
 </FindBugsFilter>