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 2009/10/23 22:41:34 UTC
svn commit: r829218 - in /hadoop/pig/trunk: ./ src/org/apache/pig/
src/org/apache/pig/backend/hadoop/executionengine/
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/pla...
Author: daijy
Date: Fri Oct 23 20:41:31 2009
New Revision: 829218
URL: http://svn.apache.org/viewvc?rev=829218&view=rev
Log:
PIG-1042: javac warnings: unchecked
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/HExecutionEngine.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/NoopFilterRemover.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.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/PigTupleRawComparator.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SliceWrapper.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/POPrinter.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POSplitOutput.java
hadoop/pig/trunk/src/org/apache/pig/builtin/MapSize.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/data/DataType.java
hadoop/pig/trunk/src/org/apache/pig/data/DefaultAbstractBag.java
hadoop/pig/trunk/src/org/apache/pig/data/DefaultTuple.java
hadoop/pig/trunk/src/org/apache/pig/data/DefaultTupleFactory.java
hadoop/pig/trunk/src/org/apache/pig/data/DistinctDataBag.java
hadoop/pig/trunk/src/org/apache/pig/data/NonSpillableDataBag.java
hadoop/pig/trunk/src/org/apache/pig/data/SortedDataBag.java
hadoop/pig/trunk/src/org/apache/pig/data/TargetedTuple.java
hadoop/pig/trunk/src/org/apache/pig/impl/PigContext.java
hadoop/pig/trunk/src/org/apache/pig/impl/io/PigNullableWritable.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOPrinter.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOVisitor.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/LogicalOptimizer.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/PushDownForeachFlatten.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalker.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalkerWOSeenChk.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/DepthFirstWalker.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/DotPlanDumper.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/Operator.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/OperatorPlan.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanDumper.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanPrinter.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/ReverseDependencyOrderWalker.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/PlanOptimizer.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/RulePlanPrinter.java
hadoop/pig/trunk/src/org/apache/pig/impl/util/IdentityHashSet.java
hadoop/pig/trunk/src/org/apache/pig/impl/util/TupleFormat.java
hadoop/pig/trunk/src/org/apache/pig/pen/util/DependencyOrderLimitedWalker.java
hadoop/pig/trunk/src/org/apache/pig/pen/util/ExampleTuple.java
hadoop/pig/trunk/src/org/apache/pig/pen/util/PreOrderDepthFirstWalker.java
hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletor.java
hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletorAliases.java
Modified: hadoop/pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Fri Oct 23 20:41:31 2009
@@ -78,6 +78,8 @@
PIG-1041: javac warnings: cast, fallthrough, serial (daijy)
+PIG-1042: javac warnings: unchecked (daijy)
+
OPTIMIZATIONS
BUG FIXES
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=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/PigServer.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/PigServer.java Fri Oct 23 20:41:31 2009
@@ -789,6 +789,7 @@
return compileLp(alias, true);
}
+ @SuppressWarnings("unchecked")
private LogicalPlan compileLp(
String alias,
boolean optimize) throws FrontendException {
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java Fri Oct 23 20:41:31 2009
@@ -319,6 +319,7 @@
throw new UnsupportedOperationException();
}
+ @SuppressWarnings("unchecked")
private void setSSHFactory(){
Properties properties = this.pigContext.getProperties();
String g = properties.getProperty("ssh.gateway");
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -278,6 +278,7 @@
* @return Job corresponding to mro
* @throws JobCreationException
*/
+ @SuppressWarnings("unchecked")
private Job getJob(MapReduceOper mro, Configuration conf, PigContext pigContext) throws JobCreationException{
JobConf jobConf = new JobConf(conf);
ArrayList<Pair<FileSpec, Boolean>> inp = new ArrayList<Pair<FileSpec, Boolean>>();
@@ -545,7 +546,7 @@
}
Job job = new Job(jobConf);
- jobStoreMap.put(job,new Pair(storeLocations, tmpLocation));
+ jobStoreMap.put(job,new Pair<List<POStore>, Path>(storeLocations, tmpLocation));
return job;
} catch (JobCreationException jce) {
throw jce;
@@ -565,6 +566,7 @@
}
public static class PigWritableComparator extends WritableComparator {
+ @SuppressWarnings("unchecked")
protected PigWritableComparator(Class c) {
super(c);
}
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -1526,6 +1526,8 @@
}
}
+ @SuppressWarnings("unchecked")
+ // Suppress the type conversion warning for Pair. There is no way to create a generic array
private Pair<Integer, Byte>[] getSortCols(List<PhysicalPlan> plans) throws PlanException, ExecException {
if(plans!=null){
Pair[] ret = new Pair[plans.size()];
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -79,6 +79,7 @@
}
@Override
+ @SuppressWarnings({"unchecked"})
public StoreFunc createStoreFunc(FileSpec sFile, Schema schema)
throws IOException {
@@ -144,7 +145,6 @@
// return an output collector using the writer we just created.
return new StoreFuncAdaptor(new OutputCollector()
{
- @SuppressWarnings({"unchecked"})
public void collect(Object key, Object value) throws IOException {
writer.write(key,value);
}
@@ -182,6 +182,8 @@
* to be used in the map reduce case. It will allow to use an output
* collector instead of an output stream to write tuples.
*/
+ //We intentionally skip type checking in backend for performance reasons
+ @SuppressWarnings("unchecked")
private class StoreFuncAdaptor implements StoreFunc {
private OutputCollector collector;
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopFilterRemover.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopFilterRemover.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopFilterRemover.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopFilterRemover.java Fri Oct 23 20:41:31 2009
@@ -85,7 +85,7 @@
if (value instanceof Boolean) {
Boolean filterValue = (Boolean)value;
if (filterValue) {
- removalQ.add(new Pair(fl, mCurrentWalker.getPlan()));
+ removalQ.add(new Pair<POFilter, PhysicalPlan>(fl, mCurrentWalker.getPlan()));
}
}
}
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java Fri Oct 23 20:41:31 2009
@@ -91,6 +91,7 @@
* Configures the Reduce plan, the POPackage operator
* and the reporter thread
*/
+ @SuppressWarnings("unchecked")
@Override
public void configure(JobConf jConf) {
super.configure(jConf);
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java Fri Oct 23 20:41:31 2009
@@ -139,6 +139,7 @@
* Configures the mapper with the map plan and the
* reproter thread
*/
+ @SuppressWarnings("unchecked")
@Override
public void configure(JobConf job) {
super.configure(job);
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java Fri Oct 23 20:41:31 2009
@@ -270,6 +270,7 @@
* Configures the Reduce plan, the POPackage operator
* and the reporter thread
*/
+ @SuppressWarnings("unchecked")
@Override
public void configure(JobConf jConf) {
super.configure(jConf);
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=829218&r1=829217&r2=829218&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 Fri Oct 23 20:41:31 2009
@@ -74,6 +74,7 @@
public PigSplit() {
}
+ @SuppressWarnings("unchecked")
public PigSplit(PigContext pigContext, FileSystem fs, Path path,
String parser, List<OperatorKey> targetOps, long start, long length) {
this.fs = fs;
@@ -138,12 +139,13 @@
return locations;
}
+ @SuppressWarnings("unchecked")
public void readFields(DataInput is) throws IOException {
file = new Path(is.readUTF());
start = is.readLong();
length = is.readLong();
pigContext = (PigContext) readObject(is);
- targetOps = (ArrayList<OperatorKey>) readObject(is);
+ targetOps = (ArrayList) readObject(is);
parser = is.readUTF();
}
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleRawComparator.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleRawComparator.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleRawComparator.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleRawComparator.java Fri Oct 23 20:41:31 2009
@@ -43,6 +43,7 @@
private boolean mWholeTuple;
private TupleFactory mFact;
+ @SuppressWarnings("unchecked")
public PigTupleRawComparator() {
super(TupleFactory.getInstance().tupleClass());
}
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SliceWrapper.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SliceWrapper.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SliceWrapper.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SliceWrapper.java Fri Oct 23 20:41:31 2009
@@ -117,6 +117,7 @@
return lastConf;
}
+ @SuppressWarnings("unchecked")
public RecordReader<Text, Tuple> makeReader(JobConf job) throws IOException {
lastConf = job;
DataStorage store = new HDataStorage(ConfigurationUtil.toProperties(job));
@@ -165,6 +166,7 @@
};
}
+ @SuppressWarnings("unchecked")
public void readFields(DataInput is) throws IOException {
execType = (ExecType) readObject(is);
targetOps = (ArrayList<OperatorKey>) readObject(is);
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -23,6 +23,8 @@
import java.io.PrintStream;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MapReduceOper;
+import org.apache.pig.backend.hadoop.executionengine.physicalLayer.PhysicalOperator;
+import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PlanPrinter;
import org.apache.pig.impl.plan.DepthFirstWalker;
import org.apache.pig.impl.plan.VisitorException;
@@ -57,21 +59,21 @@
mStream.println("MapReduce node " + mr.getOperatorKey().toString());
if (mr.mapPlan != null && mr.mapPlan.size() > 0) {
mStream.println("Map Plan");
- PlanPrinter printer = new PlanPrinter(mr.mapPlan, mStream);
+ PlanPrinter<PhysicalOperator, PhysicalPlan> printer = new PlanPrinter<PhysicalOperator, PhysicalPlan>(mr.mapPlan, mStream);
printer.setVerbose(isVerbose);
printer.visit();
mStream.println("--------");
}
if (mr.combinePlan != null && mr.combinePlan.size() > 0) {
mStream.println("Combine Plan");
- PlanPrinter printer = new PlanPrinter(mr.combinePlan, mStream);
+ PlanPrinter<PhysicalOperator, PhysicalPlan> printer = new PlanPrinter<PhysicalOperator, PhysicalPlan>(mr.combinePlan, mStream);
printer.setVerbose(isVerbose);
printer.visit();
mStream.println("--------");
}
if (mr.reducePlan != null && mr.reducePlan.size() > 0) {
mStream.println("Reduce Plan");
- PlanPrinter printer = new PlanPrinter(mr.reducePlan, mStream);
+ PlanPrinter<PhysicalOperator, PhysicalPlan> printer = new PlanPrinter<PhysicalOperator, PhysicalPlan>(mr.reducePlan, mStream);
printer.setVerbose(isVerbose);
printer.visit();
mStream.println("--------");
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -1230,6 +1230,7 @@
}
}
+ @SuppressWarnings("unchecked")
@Override
public void visit(LOProject op) throws VisitorException {
String scope = op.getOperatorKey().scope;
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POPrinter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POPrinter.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POPrinter.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POPrinter.java Fri Oct 23 20:41:31 2009
@@ -27,7 +27,7 @@
public class POPrinter extends PhyPlanVisitor {
public POPrinter(PrintStream ps, PhysicalPlan pp) {
- super(pp, new DependencyOrderWalker(pp));
+ super(pp, new DependencyOrderWalker<PhysicalOperator, PhysicalPlan>(pp));
}
// TODO FIX
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java Fri Oct 23 20:41:31 2009
@@ -111,6 +111,7 @@
}
}
+ @SuppressWarnings("unchecked")
private Result doComparison(Result left, Result right) {
if (trueRef == null) initializeRefs();
if (left.returnStatus != POStatus.STATUS_OK) return left;
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java Fri Oct 23 20:41:31 2009
@@ -111,6 +111,7 @@
}
}
+ @SuppressWarnings("unchecked")
private Result doComparison(Result left, Result right) {
if (trueRef == null) initializeRefs();
if (left.returnStatus != POStatus.STATUS_OK) return left;
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java Fri Oct 23 20:41:31 2009
@@ -111,6 +111,7 @@
}
}
+ @SuppressWarnings("unchecked")
private Result doComparison(Result left, Result right) {
if (trueRef == null) initializeRefs();
if (left.returnStatus != POStatus.STATUS_OK) return left;
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java Fri Oct 23 20:41:31 2009
@@ -111,6 +111,7 @@
}
}
+ @SuppressWarnings("unchecked")
private Result doComparison(Result left, Result right) {
if (trueRef == null) initializeRefs();
if (left.returnStatus != POStatus.STATUS_OK) return left;
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java Fri Oct 23 20:41:31 2009
@@ -111,6 +111,7 @@
}
}
+ @SuppressWarnings("unchecked")
private Result doComparison(Result left, Result right) {
if (trueRef == null) initializeRefs();
if (left.returnStatus != POStatus.STATUS_OK) return left;
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java Fri Oct 23 20:41:31 2009
@@ -111,6 +111,7 @@
}
}
+ @SuppressWarnings("unchecked")
private Result doComparison(Result left, Result right) {
if (trueRef == null) initializeRefs();
if (left.returnStatus != POStatus.STATUS_OK) return left;
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java Fri Oct 23 20:41:31 2009
@@ -39,6 +39,8 @@
import org.apache.pig.impl.plan.NodeIdGenerator;
import org.apache.pig.impl.plan.VisitorException;
+//We intentionally skip type checking in backend for performance reasons
+@SuppressWarnings("unchecked")
public class POUserComparisonFunc extends ExpressionOperator {
/**
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -92,6 +92,7 @@
breadthFirst(leaves, seen);
}
+ @SuppressWarnings("unchecked")
private void breadthFirst(Collection<O> predecessors, Set<O> seen)
throws VisitorException {
++levelCntr;
@@ -113,6 +114,7 @@
}
}
+ @SuppressWarnings("unchecked")
protected String depthFirstPP() throws VisitorException {
StringBuilder sb = new StringBuilder();
List<O> leaves = mPlan.getLeaves();
@@ -147,6 +149,7 @@
return sb.toString();
}
+ @SuppressWarnings("unchecked")
private String depthFirst(O node) throws VisitorException {
StringBuilder sb = new StringBuilder(node.name() + "\n");
if (isVerbose) {
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java Fri Oct 23 20:41:31 2009
@@ -60,6 +60,9 @@
* each Hashtable for the key and also with the value for the fragment input.
* It then returns tuples returned by this foreach operator.
*/
+
+//We intentionally skip type checking in backend for performance reasons
+@SuppressWarnings("unchecked")
public class POFRJoin extends PhysicalOperator {
/**
*
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=829218&r1=829217&r2=829218&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 Fri Oct 23 20:41:31 2009
@@ -47,6 +47,8 @@
import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.pen.util.ExampleTuple;
+//We intentionally skip type checking in backend for performance reasons
+@SuppressWarnings("unchecked")
public class POForEach extends PhysicalOperator {
/**
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java Fri Oct 23 20:41:31 2009
@@ -34,6 +34,9 @@
* getNext methods have to be implemented
*
*/
+
+//We intentionally skip type checking in backend for performance reasons
+@SuppressWarnings("unchecked")
public class POGlobalRearrange extends PhysicalOperator {
/**
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java Fri Oct 23 20:41:31 2009
@@ -37,6 +37,9 @@
* that in getNext(), it knows that "input" has already been
* attached by its input operator which SHOULD be POJoinPackage
*/
+
+//We intentionally skip type checking in backend for performance reasons
+@SuppressWarnings("unchecked")
public class POOptimizedForEach extends POForEach {
/**
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java Fri Oct 23 20:41:31 2009
@@ -56,6 +56,9 @@
*
*
*/
+
+//We intentionally skip type checking in backend for performance reasons
+@SuppressWarnings("unchecked")
public class POSort extends PhysicalOperator {
/**
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java Fri Oct 23 20:41:31 2009
@@ -46,6 +46,9 @@
*
*
*/
+
+//We intentionally skip type checking in backend for performance reasons
+@SuppressWarnings("unchecked")
public class POCogroup extends PhysicalOperator {
private static final long serialVersionUID = 1L;
Tuple[] data = null;
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POSplitOutput.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POSplitOutput.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POSplitOutput.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POSplitOutput.java Fri Oct 23 20:41:31 2009
@@ -68,6 +68,7 @@
}
+ @SuppressWarnings("unchecked")
public Result getNext(Tuple t) throws ExecException {
if(it == null) {
PhysicalOperator op = getInputs().get(0);
Modified: hadoop/pig/trunk/src/org/apache/pig/builtin/MapSize.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/MapSize.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/builtin/MapSize.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/builtin/MapSize.java Fri Oct 23 20:41:31 2009
@@ -33,6 +33,7 @@
*/
public class MapSize extends EvalFunc<Long> {
+ @SuppressWarnings("unchecked")
@Override
public Long exec(Tuple input) throws IOException {
try {
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -170,6 +170,7 @@
mOut = os;
}
+ @SuppressWarnings("unchecked")
private void putField(Object field) throws IOException {
//string constants for each delimiter
String tupleBeginDelim = "(";
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -204,6 +204,7 @@
}
}
+ @SuppressWarnings("unchecked")
public Map<String, Object> bytesToMap(byte[] b) throws IOException {
if(b == null)
return null;
Modified: hadoop/pig/trunk/src/org/apache/pig/data/DataType.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/DataType.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/DataType.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/DataType.java Fri Oct 23 20:41:31 2009
@@ -296,6 +296,7 @@
* @param o2 Second object
* @return -1 if o1 is less, 0 if they are equal, 1 if o2 is less.
*/
+ @SuppressWarnings("unchecked")
public static int compare(Object o1, Object o2) {
byte dt1 = findType(o1);
byte dt2 = findType(o2);
@@ -765,6 +766,7 @@
* @return The object as a Map.
* @throws ExecException if the type can't be forced to a Double.
*/
+ @SuppressWarnings("unchecked")
public static Map<String, Object> toMap(Object o) throws ExecException {
if (o == null) return null;
Modified: hadoop/pig/trunk/src/org/apache/pig/data/DefaultAbstractBag.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/DefaultAbstractBag.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/DefaultAbstractBag.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/DefaultAbstractBag.java Fri Oct 23 20:41:31 2009
@@ -163,6 +163,7 @@
* This method is potentially very expensive since it may require a
* sort of the bag; don't call it unless you have to.
*/
+ @SuppressWarnings("unchecked")
public int compareTo(Object other) {
if (this == other)
return 0;
Modified: hadoop/pig/trunk/src/org/apache/pig/data/DefaultTuple.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/DefaultTuple.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/DefaultTuple.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/DefaultTuple.java Fri Oct 23 20:41:31 2009
@@ -290,6 +290,7 @@
}
}
+ @SuppressWarnings("unchecked")
private long getFieldMemorySize(Object o) {
// 12 is added to each to account for the object overhead and the
// pointer in the tuple.
Modified: hadoop/pig/trunk/src/org/apache/pig/data/DefaultTupleFactory.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/DefaultTupleFactory.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/DefaultTupleFactory.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/DefaultTupleFactory.java Fri Oct 23 20:41:31 2009
@@ -35,10 +35,12 @@
return new DefaultTuple(size);
}
+ @SuppressWarnings("unchecked")
public Tuple newTuple(List c) {
return new DefaultTuple(c);
}
+ @SuppressWarnings("unchecked")
public Tuple newTupleNoCopy(List list) {
return new DefaultTuple(list, 1);
}
Modified: hadoop/pig/trunk/src/org/apache/pig/data/DistinctDataBag.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/DistinctDataBag.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/DistinctDataBag.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/DistinctDataBag.java Fri Oct 23 20:41:31 2009
@@ -199,6 +199,7 @@
public Tuple tuple;
public int fileNum;
+ @SuppressWarnings("unchecked")
public int compareTo(TContainer other) {
return tuple.compareTo(other.tuple);
}
@@ -213,6 +214,7 @@
private ArrayList<DataInputStream> mStreams = null;
private int mCntr = 0;
+ @SuppressWarnings("unchecked")
DistinctDataBagIterator() {
// If this is the first read, we need to sort the data.
synchronized (mContents) {
Modified: hadoop/pig/trunk/src/org/apache/pig/data/NonSpillableDataBag.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/NonSpillableDataBag.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/NonSpillableDataBag.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/NonSpillableDataBag.java Fri Oct 23 20:41:31 2009
@@ -192,6 +192,7 @@
return compareTo(obj) == 0;
}
+ @SuppressWarnings("unchecked")
@Override
public int compareTo(Object other) {
if (this == other)
Modified: hadoop/pig/trunk/src/org/apache/pig/data/SortedDataBag.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/SortedDataBag.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/SortedDataBag.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/SortedDataBag.java Fri Oct 23 20:41:31 2009
@@ -62,6 +62,7 @@
private boolean mReadStarted = false;
private class DefaultComparator implements Comparator<Tuple> {
+ @SuppressWarnings("unchecked")
public int compare(Tuple t1, Tuple t2) {
return t1.compareTo(t2);
}
Modified: hadoop/pig/trunk/src/org/apache/pig/data/TargetedTuple.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/TargetedTuple.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/TargetedTuple.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/TargetedTuple.java Fri Oct 23 20:41:31 2009
@@ -146,6 +146,7 @@
return t.toDelimitedString(delim);
}
+ @SuppressWarnings("unchecked")
public int compareTo(Object o) {
return t.compareTo(o);
}
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/PigContext.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/PigContext.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/PigContext.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/PigContext.java Fri Oct 23 20:41:31 2009
@@ -351,6 +351,7 @@
/**
* @deprecated use {@link #getProperties()} instead
*/
+ @Deprecated
public Properties getConf() {
return getProperties();
}
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/io/PigNullableWritable.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/io/PigNullableWritable.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/io/PigNullableWritable.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/io/PigNullableWritable.java Fri Oct 23 20:41:31 2009
@@ -36,6 +36,10 @@
*
* Index and the null indicator are packed into one byte to save space.
*/
+
+//Put in to make the compiler not complain about WritableComparable
+//being a generic type.
+@SuppressWarnings("unchecked")
public abstract class PigNullableWritable implements WritableComparable {
/**
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java Fri Oct 23 20:41:31 2009
@@ -732,7 +732,7 @@
* @see org.apache.pig.impl.plan.Operator#rewire(org.apache.pig.impl.plan.Operator, org.apache.pig.impl.plan.Operator)
*/
@Override
- public void rewire(Operator oldPred, int oldPredIndex, Operator newPred, boolean useOldPred) throws PlanException {
+ public void rewire(Operator<LOVisitor> oldPred, int oldPredIndex, Operator<LOVisitor> newPred, boolean useOldPred) throws PlanException {
super.rewire(oldPred, oldPredIndex, newPred, useOldPred);
if(newPred == null) {
int errCode = 1097;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java Fri Oct 23 20:41:31 2009
@@ -212,7 +212,7 @@
* @see org.apache.pig.impl.plan.Operator#rewire(org.apache.pig.impl.plan.Operator, org.apache.pig.impl.plan.Operator)
*/
@Override
- public void rewire(Operator oldPred, int oldPredIndex, Operator newPred, boolean useOldPred) throws PlanException {
+ public void rewire(Operator<LOVisitor> oldPred, int oldPredIndex, Operator<LOVisitor> newPred, boolean useOldPred) throws PlanException {
super.rewire(oldPred, oldPredIndex, newPred, useOldPred);
LogicalOperator previous = (LogicalOperator) oldPred;
LogicalOperator current = (LogicalOperator) newPred;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java Fri Oct 23 20:41:31 2009
@@ -750,7 +750,7 @@
* @see org.apache.pig.impl.plan.Operator#rewire(org.apache.pig.impl.plan.Operator, org.apache.pig.impl.plan.Operator)
*/
@Override
- public void rewire(Operator oldPred, int oldPredIndex, Operator newPred, boolean useOldPred) throws PlanException {
+ public void rewire(Operator<LOVisitor> oldPred, int oldPredIndex, Operator<LOVisitor> newPred, boolean useOldPred) throws PlanException {
super.rewire(oldPred, oldPredIndex, newPred, useOldPred);
LogicalOperator previous = (LogicalOperator) oldPred;
LogicalOperator current = (LogicalOperator) newPred;
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -54,7 +54,7 @@
*/
public LOPrinter(PrintStream ps, LogicalPlan plan) {
//super(plan, new DependencyOrderWalker(plan));
- super(plan, new DepthFirstWalker(plan));
+ super(plan, new DepthFirstWalker<LogicalOperator, LogicalPlan>(plan));
mStream = ps;
}
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java Fri Oct 23 20:41:31 2009
@@ -295,7 +295,7 @@
* @see org.apache.pig.impl.plan.Operator#rewire(org.apache.pig.impl.plan.Operator, org.apache.pig.impl.plan.Operator)
*/
@Override
- public void rewire(Operator oldPred, int oldPredIndex, Operator newPred, boolean useOldPred) throws PlanException {
+ public void rewire(Operator<LOVisitor> oldPred, int oldPredIndex, Operator<LOVisitor> newPred, boolean useOldPred) throws PlanException {
super.rewire(oldPred, oldPredIndex, newPred, useOldPred);
LogicalOperator previous = (LogicalOperator) oldPred;
LogicalOperator current = (LogicalOperator) newPred;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java Fri Oct 23 20:41:31 2009
@@ -178,7 +178,7 @@
* @see org.apache.pig.impl.plan.Operator#rewire(org.apache.pig.impl.plan.Operator, org.apache.pig.impl.plan.Operator)
*/
@Override
- public void rewire(Operator oldPred, int oldPredIndex, Operator newPred, boolean useOldPred) throws PlanException {
+ public void rewire(Operator<LOVisitor> oldPred, int oldPredIndex, Operator<LOVisitor> newPred, boolean useOldPred) throws PlanException {
for(LogicalOperator output: mPlan.getSuccessors(this)) {
output.rewire(oldPred, oldPredIndex, newPred, useOldPred);
}
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java Fri Oct 23 20:41:31 2009
@@ -221,7 +221,7 @@
* @see org.apache.pig.impl.plan.Operator#rewire(org.apache.pig.impl.plan.Operator, org.apache.pig.impl.plan.Operator)
*/
@Override
- public void rewire(Operator oldPred, int oldPredIndex, Operator newPred, boolean useOldPred) throws PlanException {
+ public void rewire(Operator<LOVisitor> oldPred, int oldPredIndex, Operator<LOVisitor> newPred, boolean useOldPred) throws PlanException {
super.rewire(oldPred, oldPredIndex, newPred, useOldPred);
LogicalOperator previous = (LogicalOperator) oldPred;
LogicalOperator current = (LogicalOperator) newPred;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOVisitor.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOVisitor.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOVisitor.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOVisitor.java Fri Oct 23 20:41:31 2009
@@ -128,7 +128,7 @@
// TODO FIX - How do we know this should be a
// DependencyOrderWalker? We should be replicating the
// walker the current visitor is using.
- PlanWalker w = new DependencyOrderWalker(lp);
+ PlanWalker<LogicalOperator, LogicalPlan> w = new DependencyOrderWalker<LogicalOperator, LogicalPlan>(lp);
pushWalker(w);
w.walk(this);
popWalker();
@@ -171,7 +171,7 @@
protected void visit(LOForEach forEach) throws VisitorException {
// Visit each of generates projection elements.
for(LogicalPlan lp: forEach.getForEachPlans()) {
- PlanWalker w = new DependencyOrderWalker(lp);
+ PlanWalker<LogicalOperator, LogicalPlan> w = new DependencyOrderWalker<LogicalOperator, LogicalPlan>(lp);
pushWalker(w);
w.walk(this);
popWalker();
@@ -187,7 +187,7 @@
protected void visit(LOSort s) throws VisitorException {
// Visit the sort function
for(LogicalPlan lp: s.getSortColPlans()) {
- PlanWalker w = new DependencyOrderWalker(lp);
+ PlanWalker<LogicalOperator, LogicalPlan> w = new DependencyOrderWalker<LogicalOperator, LogicalPlan>(lp);
pushWalker(w);
w.walk(this);
popWalker();
@@ -210,7 +210,7 @@
*/
protected void visit(LOFilter filter) throws VisitorException {
// Visit the condition for the filter followed by the input
- PlanWalker w = new DependencyOrderWalker(filter.getComparisonPlan());
+ PlanWalker<LogicalOperator, LogicalPlan> w = new DependencyOrderWalker<LogicalOperator, LogicalPlan>(filter.getComparisonPlan());
pushWalker(w);
w.walk(this);
popWalker();
@@ -240,7 +240,7 @@
protected void visit(LOGenerate g) throws VisitorException {
// Visit the operators that are part of the foreach plan
for(LogicalPlan lp: g.getGeneratePlans()) {
- PlanWalker w = new DependencyOrderWalker(lp);
+ PlanWalker<LogicalOperator, LogicalPlan> w = new DependencyOrderWalker<LogicalOperator, LogicalPlan>(lp);
pushWalker(w);
w.walk(this);
popWalker();
@@ -307,7 +307,7 @@
protected void visit(LOSplitOutput sop) throws VisitorException {
LogicalPlan lp = sop.getConditionPlan();
if (null != lp) {
- PlanWalker w = new DependencyOrderWalker(lp);
+ PlanWalker<LogicalOperator, LogicalPlan> w = new DependencyOrderWalker<LogicalOperator, LogicalPlan>(lp);
pushWalker(w);
w.walk(this);
popWalker();
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/LogicalOptimizer.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/LogicalOptimizer.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/LogicalOptimizer.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/LogicalOptimizer.java Fri Oct 23 20:41:31 2009
@@ -117,7 +117,7 @@
* the Storage class.
*/
- Rule rule = new Rule<LogicalOperator, LogicalPlan>(rulePlan,
+ Rule<LogicalOperator, LogicalPlan> rule = new Rule<LogicalOperator, LogicalPlan>(rulePlan,
new StreamOptimizer(plan, LOStream.class.getName()),
"StreamOptimizer");
checkAndAddRule(rule);
@@ -152,7 +152,7 @@
}
- private void checkAndAddRule(Rule rule) {
+ private void checkAndAddRule(Rule<LogicalOperator, LogicalPlan> rule) {
if(mRulesOff != null) {
for(String ruleOff: mRulesOff) {
String ruleName = rule.getRuleName();
@@ -172,8 +172,8 @@
int numIterations = 0;
do {
sawMatch = false;
- for (Rule rule : mRules) {
- RuleMatcher matcher = new RuleMatcher();
+ for (Rule<LogicalOperator, LogicalPlan> rule : mRules) {
+ RuleMatcher<LogicalOperator, LogicalPlan> matcher = new RuleMatcher<LogicalOperator, LogicalPlan>();
if (matcher.match(rule)) {
// It matches the pattern. Now check if the transformer
// approves as well.
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/PushDownForeachFlatten.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/PushDownForeachFlatten.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/PushDownForeachFlatten.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/PushDownForeachFlatten.java Fri Oct 23 20:41:31 2009
@@ -174,7 +174,7 @@
}
}
- IndexHelper indexHelper = new IndexHelper(peers);
+ IndexHelper<LogicalOperator> indexHelper = new IndexHelper<LogicalOperator>(peers);
Integer foreachPosition = indexHelper.getIndex(foreach);
// the foreach with flatten can be swapped with an order by
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt Fri Oct 23 20:41:31 2009
@@ -2075,7 +2075,7 @@
}
}
-LogicalOperator ForEachClause(LogicalPlan lp) :
+ LogicalOperator ForEachClause(LogicalPlan lp) :
{
ArrayList<LogicalOperator> specList = new ArrayList<LogicalOperator>();
LogicalOperator input, foreach;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalker.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalker.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalker.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalker.java Fri Oct 23 20:41:31 2009
@@ -47,6 +47,7 @@
* @param visitor Visitor this walker is being used by.
* @throws VisitorException if an error is encountered while walking.
*/
+ @SuppressWarnings("unchecked")
public void walk(PlanVisitor<O, P> visitor) throws VisitorException {
// This is highly inefficient, but our graphs are small so it should be okay.
// The algorithm works by starting at any node in the graph, finding it's
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalkerWOSeenChk.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalkerWOSeenChk.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalkerWOSeenChk.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/DependencyOrderWalkerWOSeenChk.java Fri Oct 23 20:41:31 2009
@@ -47,6 +47,7 @@
* @param visitor Visitor this walker is being used by.
* @throws VisitorException if an error is encountered while walking.
*/
+ @SuppressWarnings("unchecked")
public void walk(PlanVisitor<O, P> visitor) throws VisitorException {
// This is highly inefficient, but our graphs are small so it should be okay.
// The algorithm works by starting at any node in the graph, finding it's
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/DepthFirstWalker.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/DepthFirstWalker.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/DepthFirstWalker.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/DepthFirstWalker.java Fri Oct 23 20:41:31 2009
@@ -54,6 +54,8 @@
return new DepthFirstWalker<O, P>(plan);
}
+ // Suppress "unchecked" warnings for all logical plan related classes. Will revisit in logical plan rework
+ @SuppressWarnings("unchecked")
private void depthFirst(O node,
Collection<O> successors,
Set<O> seen,
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/DotPlanDumper.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/DotPlanDumper.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/DotPlanDumper.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/DotPlanDumper.java Fri Oct 23 20:41:31 2009
@@ -174,6 +174,7 @@
ps.println(attributes);
}
+ @SuppressWarnings("unchecked")
@Override
protected PlanDumper makeDumper(S plan, PrintStream ps) {
return new DotPlanDumper(plan, ps, true,
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/Operator.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/Operator.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/Operator.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/Operator.java Fri Oct 23 20:41:31 2009
@@ -28,6 +28,8 @@
/**
* Base class for all types of operators.
*/
+// Suppress "unchecked" warnings for all logical plan related classes. Will revisit in logical plan rework
+@SuppressWarnings("unchecked")
abstract public class Operator<V extends PlanVisitor> implements Serializable, Comparable<Operator>, Cloneable {
private static final long serialVersionUID = 1L;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/OperatorPlan.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/OperatorPlan.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/OperatorPlan.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/OperatorPlan.java Fri Oct 23 20:41:31 2009
@@ -63,6 +63,9 @@
* has resulted in a slightly less maintainable code along with the necessity to use
* rewire with discretion.
*/
+
+// Suppress "unchecked" warnings for all logical plan related classes. Will revisit in logical plan rework
+@SuppressWarnings("unchecked")
public abstract class OperatorPlan<E extends Operator> implements Iterable<E>, Serializable, Cloneable {
protected Map<E, OperatorKey> mOps;
protected Map<OperatorKey, E> mKeys;
@@ -316,13 +319,13 @@
// Find all of the from edges, as I have to remove all the associated to
// edges. Need to make a copy so we can delete from the map without
// screwing up our iterator.
- Collection c = fromMap.get(op);
+ Collection<E> c = fromMap.get(op);
if (c == null) return;
- ArrayList al = new ArrayList(c);
- Iterator i = al.iterator();
+ ArrayList<E> al = new ArrayList<E>(c);
+ Iterator<E> i = al.iterator();
while (i.hasNext()) {
- E to = (E)i.next();
+ E to = i.next();
toMap.remove(to, op);
fromMap.remove(op, to);
}
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanDumper.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanDumper.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanDumper.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanDumper.java Fri Oct 23 20:41:31 2009
@@ -93,6 +93,7 @@
* @param plan Plan that the new dumper should handle
* @return the dumper for plan
*/
+ @SuppressWarnings("unchecked")
protected PlanDumper makeDumper(S plan, PrintStream ps) {
return new PlanDumper(plan, ps);
}
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -53,7 +53,7 @@
*/
public PlanPrinter(PrintStream ps, P plan) {
//super(plan, new DependencyOrderWalker(plan));
- super(plan, new DepthFirstWalker(plan));
+ super(plan, new DepthFirstWalker<O, P>(plan));
mStream = ps;
}
@@ -72,6 +72,7 @@
}
+ @SuppressWarnings("unchecked")
protected String depthFirst() throws VisitorException, IOException {
StringBuilder sb = new StringBuilder();
List<O> leaves = mPlan.getLeaves();
@@ -107,6 +108,7 @@
return sb.toString();
}
+ @SuppressWarnings("unchecked")
private String depthFirst(O node) throws VisitorException, IOException {
StringBuilder sb = new StringBuilder(node.name());
sb.append("\n");
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/ReverseDependencyOrderWalker.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/ReverseDependencyOrderWalker.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/ReverseDependencyOrderWalker.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/ReverseDependencyOrderWalker.java Fri Oct 23 20:41:31 2009
@@ -47,6 +47,7 @@
* @param visitor Visitor this walker is being used by.
* @throws VisitorException if an error is encountered while walking.
*/
+ @SuppressWarnings("unchecked")
public void walk(PlanVisitor<O, P> visitor) throws VisitorException {
// This is highly inefficient, but our graphs are small so it should be okay.
// The algorithm works by starting at any node in the graph, finding it's
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/PlanOptimizer.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/PlanOptimizer.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/PlanOptimizer.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/PlanOptimizer.java Fri Oct 23 20:41:31 2009
@@ -33,7 +33,7 @@
public abstract class PlanOptimizer<O extends Operator, P extends OperatorPlan<O>> {
- protected List<Rule> mRules;
+ protected List<Rule<O, P>> mRules;
protected P mPlan;
protected int mMaxIterations;
@@ -49,7 +49,7 @@
* @param iterations maximum number of optimization iterations
*/
protected PlanOptimizer(P plan, int iterations) {
- mRules = new ArrayList<Rule>();
+ mRules = new ArrayList<Rule<O, P>>();
mPlan = plan;
if(iterations < 0) {
mMaxIterations = 1000;
@@ -76,8 +76,8 @@
int numIterations = 0;
do {
sawMatch = false;
- for (Rule rule : mRules) {
- RuleMatcher matcher = new RuleMatcher();
+ for (Rule<O, P> rule : mRules) {
+ RuleMatcher<O, P> matcher = new RuleMatcher<O, P>();
if (matcher.match(rule)) {
// It matches the pattern. Now check if the transformer
// approves as well.
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=829218&r1=829217&r2=829218&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 20:41:31 2009
@@ -53,7 +53,7 @@
*/
public RulePlanPrinter(PrintStream ps, RulePlan plan) {
//super(plan, new DependencyOrderWalker(plan));
- super(plan, new DepthFirstWalker(plan));
+ super(plan, new DepthFirstWalker<RuleOperator, RulePlan>(plan));
mStream = ps;
}
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/util/IdentityHashSet.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/util/IdentityHashSet.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/util/IdentityHashSet.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/util/IdentityHashSet.java Fri Oct 23 20:41:31 2009
@@ -97,6 +97,7 @@
return true;
}
+ @SuppressWarnings("unchecked")
public boolean retainAll(Collection<?> elements) {
IdentityHashMap<E, Object> newMap = new IdentityHashMap<E, Object>();
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/util/TupleFormat.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/util/TupleFormat.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/util/TupleFormat.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/util/TupleFormat.java Fri Oct 23 20:41:31 2009
@@ -43,6 +43,7 @@
* @param tuple
* @return Default format of Tuple
*/
+ @SuppressWarnings("unchecked")
public static String format(Tuple tuple) {
StringBuilder sb = new StringBuilder();
sb.append('(');
Modified: hadoop/pig/trunk/src/org/apache/pig/pen/util/DependencyOrderLimitedWalker.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/util/DependencyOrderLimitedWalker.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/util/DependencyOrderLimitedWalker.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/util/DependencyOrderLimitedWalker.java Fri Oct 23 20:41:31 2009
@@ -40,6 +40,7 @@
this.operator = operator;
}
+ @SuppressWarnings("unchecked")
@Override
public void walk(PlanVisitor<O, P> visitor) throws VisitorException {
List<O> fifo = new ArrayList<O>();
Modified: hadoop/pig/trunk/src/org/apache/pig/pen/util/ExampleTuple.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/util/ExampleTuple.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/util/ExampleTuple.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/util/ExampleTuple.java Fri Oct 23 20:41:31 2009
@@ -120,6 +120,7 @@
return t.toDelimitedString(delim);
}
+ @SuppressWarnings("unchecked")
public int compareTo(Object o) {
return t.compareTo(o);
}
Modified: hadoop/pig/trunk/src/org/apache/pig/pen/util/PreOrderDepthFirstWalker.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/util/PreOrderDepthFirstWalker.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/util/PreOrderDepthFirstWalker.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/util/PreOrderDepthFirstWalker.java Fri Oct 23 20:41:31 2009
@@ -59,6 +59,7 @@
return new DepthFirstWalker<O, P>(plan);
}
+ @SuppressWarnings("unchecked")
private void depthFirst(O node, Collection<O> predecessors, Set<O> seen,
PlanVisitor<O, P> visitor) throws VisitorException {
if (predecessors == null)
Modified: hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletor.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletor.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletor.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletor.java Fri Oct 23 20:41:31 2009
@@ -99,6 +99,8 @@
return true;
}
+ @SuppressWarnings("unchecked")
+ @Override
public int complete(String buffer, int cursor, List candidates) {
if (cursor == 0)
return -1;
Modified: hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletorAliases.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletorAliases.java?rev=829218&r1=829217&r2=829218&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletorAliases.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/tools/grunt/PigCompletorAliases.java Fri Oct 23 20:41:31 2009
@@ -49,6 +49,8 @@
}
}
+ @SuppressWarnings("unchecked")
+ @Override
public int complete(String buffer, int cursor, List candidates)
{
if (cursor == 0)