Author: olga Date: Fri Oct 23 21:24:33 2009 New Revision: 829246 URL: http://svn.apache.org/viewvc?rev=829246&view=rev Log: PIG-1047: FINDBUGS: URF_UNREAD_FIELD: Unread field (olgan)
Modified: hadoop/pig/trunk/CHANGES.txt hadoop/pig/trunk/src/org/apache/pig/PigServer.java hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java 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/partitioners/WeightedRangePartitioner.java hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/streaming/HadoopExecutableManager.java hadoop/pig/trunk/src/org/apache/pig/builtin/BinStorage.java hadoop/pig/trunk/src/org/apache/pig/builtin/PigStorage.java hadoop/pig/trunk/src/org/apache/pig/builtin/Utf8StorageConverter.java hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOPrinter.java hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalPlanCloneHelper.java hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanPrinter.java hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RuleMatcher.java hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RulePlanPrinter.java hadoop/pig/trunk/src/org/apache/pig/pen/DerivedDataVisitor.java Modified: hadoop/pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/CHANGES.txt (original) +++ hadoop/pig/trunk/CHANGES.txt Fri Oct 23 21:24:33 2009 @@ -26,6 +26,8 @@ IMPROVEMENTS +PIG-1047: FINDBUGS: URF_UNREAD_FIELD: Unread field (olgan) + PIG-1032: FINDBUGS: DM_STRING_CTOR: Method invokes inefficient new String(String) constructor (olgan) Modified: hadoop/pig/trunk/src/org/apache/pig/PigServer.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/PigServer.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/PigServer.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/PigServer.java Fri Oct 23 21:24:33 2009 @@ -124,7 +124,6 @@ private static int scopeCounter = 0; private String scope = constructScope(); - private ArrayList<String> cachedScript = new ArrayList<String>(); private boolean aggregateWarning = true; private boolean isMultiQuery = true; Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java Fri Oct 23 21:24:33 2009 @@ -114,20 +114,16 @@ private byte mKeyType = 0; - private String chunkSize; - private CompilationMessageCollector messageCollector = null; public CombinerOptimizer(MROperPlan plan, String chunkSize) { super(plan, new DepthFirstWalker<MapReduceOper, MROperPlan>(plan)); - this.chunkSize = chunkSize; messageCollector = new CompilationMessageCollector() ; } public CombinerOptimizer(MROperPlan plan, String chunkSize, CompilationMessageCollector messageCollector) { super(plan, new DepthFirstWalker<MapReduceOper, MROperPlan>(plan)); - this.chunkSize = chunkSize; this.messageCollector = messageCollector ; } Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java Fri Oct 23 21:24:33 2009 @@ -216,11 +216,6 @@ } /** - * The map between MapReduceOpers and their corresponding Jobs - */ - Map<OperatorKey, Job> seen = new Hashtable<OperatorKey, Job>(); - - /** * Compiles all jobs that have no dependencies removes them from * the plan and returns. Should be called with the same plan until * exhausted. 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=829246&r1=829245&r2=829246&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 Fri Oct 23 21:24:33 2009 @@ -29,7 +29,6 @@ import java.util.Random; import java.util.Set; -import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.mapred.JobConf; import org.apache.pig.FuncSpec; @@ -128,9 +127,6 @@ * */ public class MRCompiler extends PhyPlanVisitor { - - private Log log = LogFactory.getLog(getClass()); - PigContext pigContext; //The plan that is being compiled @@ -2068,8 +2064,6 @@ } static class LastInputStreamingOptimizer extends MROpPlanVisitor { - - Log log = LogFactory.getLog(this.getClass()); String chunkSize; LastInputStreamingOptimizer(MROperPlan plan, String chunkSize) { super(plan, new DepthFirstWalker<MapReduceOper, MROperPlan>(plan)); 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=829246&r1=829245&r2=829246&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 Fri Oct 23 21:24:33 2009 @@ -60,9 +60,6 @@ */ public class MapReducePOStoreImpl extends POStoreImpl { - private PigContext pc; - private StoreFunc storer; - private FileSpec sFile; private Reporter reporter; private RecordWriter writer; private JobConf job; 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=829246&r1=829245&r2=829246&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 Fri Oct 23 21:24:33 2009 @@ -56,8 +56,6 @@ public class WeightedRangePartitioner implements Partitioner<PigNullableWritable, Writable> { PigNullableWritable[] quantiles; RawComparator<PigNullableWritable> comparator; - Integer numQuantiles; - DataBag samples; public static Map<PigNullableWritable,DiscreteProbabilitySampleGenerator> weightedParts = new HashMap<PigNullableWritable, DiscreteProbabilitySampleGenerator>(); JobConf job; Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java Fri Oct 23 21:24:33 2009 @@ -35,7 +35,6 @@ public class MRPrinter extends MROpPlanVisitor { private PrintStream mStream = null; - private int mIndent = 0; private boolean isVerbose = true; /** 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=829246&r1=829245&r2=829246&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 Fri Oct 23 21:24:33 2009 @@ -68,20 +68,14 @@ protected Map<LogicalOperator, PhysicalOperator> logToPhyMap; - Random r = new Random(); - protected Stack<PhysicalPlan> currentPlans; protected PhysicalPlan currentPlan; protected NodeIdGenerator nodeGen = NodeIdGenerator.getGenerator(); - private Log log = LogFactory.getLog(getClass()); - protected PigContext pc; - LoadFunc load; - public LogToPhyTranslationVisitor(LogicalPlan plan) { super(plan, new DependencyOrderWalker<LogicalOperator, LogicalPlan>( plan)); @@ -1540,7 +1534,6 @@ load.setResultType(loLoad.getType()); currentPlan.add(load); logToPhyMap.put(loLoad, load); - this.load = loLoad.getLoadFunc(); // Load is typically a root operator, but in the multiquery // case it might have a store as a predecessor. Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java Fri Oct 23 21:24:33 2009 @@ -51,8 +51,6 @@ int levelCntr = -1; - OutputStream printer; - PrintStream stream = System.out; boolean isVerbose = true; @@ -82,7 +80,6 @@ } public void print(OutputStream printer) throws VisitorException, IOException { - this.printer = printer; printer.write(depthFirstPP().getBytes()); } Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/streaming/HadoopExecutableManager.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/streaming/HadoopExecutableManager.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/streaming/HadoopExecutableManager.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/streaming/HadoopExecutableManager.java Fri Oct 23 21:24:33 2009 @@ -65,8 +65,6 @@ FSDataOutputStream errorStream; - boolean writeHeaderFooter = false; - public HadoopExecutableManager() {} public void configure(POStream stream) Modified: hadoop/pig/trunk/src/org/apache/pig/builtin/BinStorage.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/BinStorage.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/builtin/BinStorage.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/builtin/BinStorage.java Fri Oct 23 21:24:33 2009 @@ -51,7 +51,6 @@ public static final int RECORD_2 = 0x02; public static final int RECORD_3 = 0x03; - Iterator<Tuple> i = null; protected BufferedPositionedInputStream in = null; private static final Log mLog = LogFactory.getLog(BinStorage.class); private DataInputStream inData = null; 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=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/builtin/PigStorage.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/builtin/PigStorage.java Fri Oct 23 21:24:33 2009 @@ -54,16 +54,9 @@ private byte recordDel = '\n'; private byte fieldDel = '\t'; private ArrayList<Object> mProtoTuple = null; - private int os; - private static final int OS_UNIX = 0; - private static final int OS_WINDOWS = 1; private static final String UTF8 = "UTF-8"; - - public PigStorage() { - os = OS_UNIX; - if (System.getProperty("os.name").toUpperCase().startsWith("WINDOWS")) - os = OS_WINDOWS; - } + + public PigStorage() {} /** * Constructs a Pig loader that uses specified regex as a field delimiter. Modified: hadoop/pig/trunk/src/org/apache/pig/builtin/Utf8StorageConverter.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/Utf8StorageConverter.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/builtin/Utf8StorageConverter.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/builtin/Utf8StorageConverter.java Fri Oct 23 21:24:33 2009 @@ -53,8 +53,6 @@ private Integer mMaxInt = Integer.valueOf(Integer.MAX_VALUE); private Long mMaxLong = Long.valueOf(Long.MAX_VALUE); private TextDataParser dataParser = null; - - private PigLogger pigLogger = PhysicalOperator.getPigLogger(); public Utf8StorageConverter() { } Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOPrinter.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOPrinter.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOPrinter.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOPrinter.java Fri Oct 23 21:24:33 2009 @@ -45,7 +45,6 @@ private String LSep = "|\n|---"; private String USep = "| |\n| "; private int levelCntr = -1; - private OutputStream printer; private boolean isVerbose = true; /** @@ -72,7 +71,6 @@ } public void print(OutputStream printer) throws VisitorException, IOException { - this.printer = printer; printer.write(depthFirstLP().getBytes()); } Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalPlanCloneHelper.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalPlanCloneHelper.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalPlanCloneHelper.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalPlanCloneHelper.java Fri Oct 23 21:24:33 2009 @@ -36,14 +36,12 @@ public class LogicalPlanCloneHelper extends LOVisitor { public static Map<LogicalOperator, LogicalOperator> mOpToCloneMap; - private LogicalPlan mOriginalPlan; /** * @param plan logical plan to be cloned */ public LogicalPlanCloneHelper(LogicalPlan plan) throws CloneNotSupportedException { super(plan, new DependencyOrderWalker<LogicalOperator, LogicalPlan>(plan)); - mOriginalPlan = plan; //LOVisitor does not have a default constructor and super needs to be the first //statement in the constructor. As a result, mPlan and mCurrentWalker are being //re-initialized here @@ -59,7 +57,6 @@ Map<LogicalOperator, LogicalOperator> origCloneMap) throws CloneNotSupportedException { super(plan, new DependencyOrderWalker<LogicalOperator, LogicalPlan>(plan)); mOpToCloneMap = origCloneMap; - mOriginalPlan = plan; //LOVisitor does not have a default constructor and super needs to be the first //statement in the constructor. As a result, mPlan and mCurrentWalker are being //re-initialized here Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanPrinter.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanPrinter.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanPrinter.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanPrinter.java Fri Oct 23 21:24:33 2009 @@ -45,7 +45,6 @@ private String LSep = "|\n|---"; private String USep = "| |\n| "; private int levelCntr = -1; - private OutputStream printer; /** * @param ps PrintStream to output plan information to @@ -67,7 +66,6 @@ } public void print(OutputStream printer) throws VisitorException, IOException { - this.printer = printer; printer.write(depthFirst().getBytes()); } Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RuleMatcher.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RuleMatcher.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RuleMatcher.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RuleMatcher.java Fri Oct 23 21:24:33 2009 @@ -50,7 +50,6 @@ private List<List<O>> mMatches = new ArrayList<List<O>>(); private P mPlan; // for convenience. private int mNumCommonNodes = 0; - private List<RuleOperator> mCommonNodes = null; /** * Test a rule to see if it matches the current plan. Save all matched nodes using BFS @@ -63,7 +62,6 @@ try { commonNodeFinder.visit(); mNumCommonNodes = commonNodeFinder.getCount(); - mCommonNodes = commonNodeFinder.getCommonNodes(); } catch (VisitorException ve) { int errCode = 2125; String msg = "Internal error. Problem in computing common nodes in the Rule Plan."; Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RulePlanPrinter.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RulePlanPrinter.java?rev=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RulePlanPrinter.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RulePlanPrinter.java Fri Oct 23 21:24:33 2009 @@ -45,7 +45,6 @@ private String LSep = "|\n|---"; private String USep = "| |\n| "; private int levelCntr = -1; - private OutputStream printer; /** * @param ps PrintStream to output plan information to @@ -67,7 +66,6 @@ } public void print(OutputStream printer) throws VisitorException, IOException { - this.printer = printer; printer.write(depthFirst().getBytes()); } 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=829246&r1=829245&r2=829246&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/pen/DerivedDataVisitor.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/pen/DerivedDataVisitor.java Fri Oct 23 21:24:33 2009 @@ -71,7 +71,6 @@ public class DerivedDataVisitor extends LOVisitor { Map<LogicalOperator, DataBag> derivedData = new HashMap<LogicalOperator, DataBag>(); - PigContext pc; PhysicalPlan physPlan = null; Map<LOLoad, DataBag> baseData = null; @@ -89,7 +88,6 @@ PhysicalPlan physPlan) { super(plan, new DependencyOrderWalker<LogicalOperator, LogicalPlan>( plan)); - this.pc = pc; this.baseData = baseData; OpToEqClasses = new HashMap<LogicalOperator, Collection<IdentityHashSet<Tuple>>>(); @@ -111,7 +109,6 @@ super(op.getPlan(), new DependencyOrderLimitedWalker<LogicalOperator, LogicalPlan>( op, op.getPlan())); - this.pc = pc; this.baseData = baseData; OpToEqClasses = new HashMap<LogicalOperator, Collection<IdentityHashSet<Tuple>>>();