Author: daijy
Date: Fri Oct 23 20:39:39 2009
New Revision: 829216
URL: http://svn.apache.org/viewvc?rev=829216&view=rev
Log:
PIG-1041: javac warnings: cast, fallthrough, serial
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java
hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2OutputStream.java
hadoop/pig/trunk/src/org/apache/pig/Main.java
hadoop/pig/trunk/src/org/apache/pig/backend/executionengine/util/ExecTools.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROperPlan.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/LogicalToPhysicalTranslatorException.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalExecutionEngine.java
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalPigLauncher.java
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java
hadoop/pig/trunk/src/org/apache/pig/builtin/FloatMax.java
hadoop/pig/trunk/src/org/apache/pig/builtin/FloatSum.java
hadoop/pig/trunk/src/org/apache/pig/builtin/IntMax.java
hadoop/pig/trunk/src/org/apache/pig/builtin/IntSum.java
hadoop/pig/trunk/src/org/apache/pig/builtin/LongSum.java
hadoop/pig/trunk/src/org/apache/pig/builtin/Utf8StorageConverter.java
hadoop/pig/trunk/src/org/apache/pig/data/DataByteArray.java
hadoop/pig/trunk/src/org/apache/pig/data/DefaultAbstractBag.java
hadoop/pig/trunk/src/org/apache/pig/data/SingleTupleBag.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckerException.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanException.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/VisitorException.java
hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/OptimizerException.java
hadoop/pig/trunk/src/org/apache/pig/impl/util/Pair.java
hadoop/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java
hadoop/pig/trunk/src/org/apache/pig/pen/DerivedDataVisitor.java
hadoop/pig/trunk/src/org/apache/pig/pen/LineageTrimmingVisitor.java
Modified: hadoop/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Fri Oct 23 20:39:39 2009
@@ -76,6 +76,8 @@
PIG-1033: javac warnings: deprecated hadoop APIs (daijy)
+PIG-1041: javac warnings: cast, fallthrough, serial (daijy)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java
(original)
+++
hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java
Fri Oct 23 20:39:39 2009
@@ -433,11 +433,11 @@
}
private int bsGetIntVS(int numBits) throws IOException {
- return (int) bsR(numBits);
+ return bsR(numBits);
}
private int bsGetInt32() throws IOException {
- return (int) bsGetint();
+ return bsGetint();
}
private void hbCreateDecodeTables(int[] limit, int[] base,
@@ -796,7 +796,7 @@
}
for (i = 0; i <= last; i++) {
- ch = (char) ll8[i];
+ ch = ll8[i];
tt[cftab[ch]] = i;
cftab[ch]++;
}
@@ -830,7 +830,7 @@
}
}
rNToGo--;
- ch2 ^= (int) ((rNToGo == 1) ? 1 : 0);
+ ch2 ^= ((rNToGo == 1) ? 1 : 0);
i2++;
currentChar = ch2;
Modified:
hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2OutputStream.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2OutputStream.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2OutputStream.java
(original)
+++
hadoop/pig/trunk/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2OutputStream.java
Fri Oct 23 20:39:39 2009
@@ -1211,7 +1211,7 @@
quadrant[i] = 0;
}
- block[0] = (char) (block[last + 1]);
+ block[0] = block[last + 1];
if (last < 4000) {
/*
Modified: hadoop/pig/trunk/src/org/apache/pig/Main.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/Main.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/Main.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/Main.java Fri Oct 23 20:39:39 2009
@@ -537,9 +537,9 @@
final Manifest manifest = jar.getManifest();
final Map <String,Attributes> attrs = manifest.getEntries();
Attributes attr = attrs.get("org/apache/pig");
- String version = (String) attr.getValue("Implementation-Version");
- String svnRevision = (String) attr.getValue("Svn-Revision");
- String buildTime = (String) attr.getValue("Build-TimeStamp");
+ String version = attr.getValue("Implementation-Version");
+ String svnRevision = attr.getValue("Svn-Revision");
+ String buildTime = attr.getValue("Build-TimeStamp");
// we use a version string similar to svn
//svn, version 1.4.4 (r25188)
// compiled Sep 23 2007, 22:32:34
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/executionengine/util/ExecTools.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/executionengine/util/ExecTools.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/executionengine/util/ExecTools.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/executionengine/util/ExecTools.java
Fri Oct 23 20:39:39 2009
@@ -41,7 +41,7 @@
PhysicalPlan plan,
PigContext pigContext) throws ExecException {
try {
- PhysicalOperator leaf = (PhysicalOperator)plan.getLeaves().get(0);
+ PhysicalOperator leaf = plan.getLeaves().get(0);
FileSpec spec = null;
if(!(leaf instanceof POStore)){
String scope = leaf.getOperatorKey().getScope();
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
Fri Oct 23 20:39:39 2009
@@ -155,7 +155,7 @@
IOException;
protected boolean isComplete(double prog){
- return (int)(Math.ceil(prog)) == (int)1;
+ return (int)(Math.ceil(prog)) == 1;
}
protected void getStats(Job job, JobClient jobClient, boolean errNotDbg,
PigContext pigContext) throws Exception {
@@ -494,7 +494,7 @@
}
StackTraceElement[] steArr = new
StackTraceElement[stackTraceElements.size()];
-
((Throwable)object).setStackTrace((StackTraceElement[])(stackTraceElements.toArray(steArr)));
+
((Throwable)object).setStackTrace(stackTraceElements.toArray(steArr));
if(startingLineNum < (stackTraceLines.length - 1)) {
Throwable e = getExceptionFromStrings(stackTraceLines,
startingLineNum);
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
Fri Oct 23 20:39:39 2009
@@ -111,6 +111,8 @@
* combine phases in an MR operator.
*/
public class InnerOperator extends Operator<PlanVisitor> {
+
+ private static final long serialVersionUID = 1L;
String name;
PhysicalPlan plan;
int code;
@@ -138,6 +140,9 @@
* execution phase.
*/
public class InnerPlan extends OperatorPlan<InnerOperator> {
+
+ private static final long serialVersionUID = 1L;
+
public InnerPlan(PhysicalPlan mapPlan, PhysicalPlan combinePlan,
PhysicalPlan reducePlan) {
try {
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROperPlan.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROperPlan.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROperPlan.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROperPlan.java
Fri Oct 23 20:39:39 2009
@@ -34,6 +34,8 @@
*/
public class MROperPlan extends OperatorPlan<MapReduceOper> {
+ private static final long serialVersionUID = 1L;
+
public MROperPlan() {
// TODO Auto-generated constructor stub
}
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=829216&r1=829215&r2=829216&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:39:39 2009
@@ -944,7 +944,7 @@
.spawnChildWalker(lp);
pushWalker(childWalker);
mCurrentWalker.walk(this);
- exprPlans.add((PhysicalPlan) currentPlan);
+ exprPlans.add(currentPlan);
popWalker();
}
@@ -1178,7 +1178,7 @@
mCurrentWalker.walk(this);
popWalker();
- poFilter.setPlan((PhysicalPlan) currentPlan);
+ poFilter.setPlan(currentPlan);
currentPlan = currentPlans.pop();
List<LogicalOperator> op = filter.getPlan().getPredecessors(filter);
@@ -1327,7 +1327,7 @@
.spawnChildWalker(plan);
pushWalker(childWalker);
childWalker.walk(this);
- sortPlans.add((PhysicalPlan) currentPlan);
+ sortPlans.add(currentPlan);
popWalker();
}
currentPlan = currentPlans.pop();
@@ -1472,7 +1472,7 @@
mCurrentWalker.walk(this);
popWalker();
- ((POFilter) physOp).setPlan((PhysicalPlan) currentPlan);
+ ((POFilter) physOp).setPlan(currentPlan);
currentPlan = currentPlans.pop();
currentPlan.add(physOp);
@@ -1719,7 +1719,7 @@
@Override
public void visit(LOMapLookup op) throws VisitorException {
- String scope = ((OperatorKey) op.getOperatorKey()).scope;
+ String scope = (op.getOperatorKey()).scope;
ExpressionOperator physOp = new POMapLookUp(new OperatorKey(scope,
nodeGen.getNextNodeId(scope)), op.getRequestedParallelism(), op
.getLookUpKey());
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogicalToPhysicalTranslatorException.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogicalToPhysicalTranslatorException.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogicalToPhysicalTranslatorException.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogicalToPhysicalTranslatorException.java
Fri Oct 23 20:39:39 2009
@@ -21,6 +21,8 @@
public class LogicalToPhysicalTranslatorException extends VisitorException {
+ private static final long serialVersionUID = 1L;
+
/**
* Create a new LogicalToPhysicalTranslatorException with null as the
error message.
*/
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java
Fri Oct 23 20:39:39 2009
@@ -32,6 +32,8 @@
import org.apache.pig.impl.plan.VisitorException;
public class POBinCond extends ExpressionOperator {
+
+ private static final long serialVersionUID = 1L;
ExpressionOperator cond;
ExpressionOperator lhs;
ExpressionOperator rhs;
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java
Fri Oct 23 20:39:39 2009
@@ -35,6 +35,8 @@
public class POIsNull extends UnaryComparisonOperator {
+ private static final long serialVersionUID = 1L;
+
public POIsNull(OperatorKey k, int rp) {
super(k, rp);
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java
Fri Oct 23 20:39:39 2009
@@ -33,7 +33,8 @@
public class POMapLookUp extends ExpressionOperator {
- private String key;
+ private static final long serialVersionUID = 1L;
+ private String key;
public POMapLookUp(OperatorKey k) {
super(k);
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java
Fri Oct 23 20:39:39 2009
@@ -28,6 +28,8 @@
public class PONegative extends UnaryExpressionOperator {
+ private static final long serialVersionUID = 1L;
+
public PONegative(OperatorKey k, int rp) {
super(k, rp);
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=829216&r1=829215&r2=829216&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:39:39 2009
@@ -409,7 +409,7 @@
planLeafOps = new PhysicalOperator[inputPlans.size()];
for(PhysicalPlan p : inputPlans) {
++i;
- PhysicalOperator leaf =
(PhysicalOperator)p.getLeaves().get(0);
+ PhysicalOperator leaf = p.getLeaves().get(0);
planLeafOps[i] = leaf;
if(leaf instanceof POProject &&
leaf.getResultType() == DataType.TUPLE &&
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalExecutionEngine.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalExecutionEngine.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalExecutionEngine.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalExecutionEngine.java
Fri Oct 23 20:39:39 2009
@@ -147,7 +147,7 @@
public List<ExecJob> execute(PhysicalPlan plan, String jobName)
throws ExecException {
try {
- PhysicalOperator leaf = (PhysicalOperator) plan.getLeaves().get(0);
+ PhysicalOperator leaf = plan.getLeaves().get(0);
if (!(leaf instanceof POStore)) {
String scope = leaf.getOperatorKey().getScope();
POStore str = new POStore(new OperatorKey(scope,
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalPigLauncher.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalPigLauncher.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalPigLauncher.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/LocalPigLauncher.java
Fri Oct 23 20:39:39 2009
@@ -135,6 +135,7 @@
}
+ @SuppressWarnings("fallthrough")
private int runPipeline(POStore[] leaves, PigContext pc) throws
IOException, ExecException {
BitSet bs = new BitSet(leaves.length);
int failed = 0;
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/backend/local/executionengine/physicalLayer/LocalLogToPhyTranslationVisitor.java
Fri Oct 23 20:39:39 2009
@@ -96,7 +96,7 @@
.spawnChildWalker(lp);
pushWalker(childWalker);
mCurrentWalker.walk(this);
- exprPlans.add((PhysicalPlan) currentPlan);
+ exprPlans.add(currentPlan);
popWalker();
}
@@ -284,7 +284,7 @@
mCurrentWalker.walk(this);
popWalker();
- ((POSplitOutput) physOp).setPlan((PhysicalPlan) currentPlan);
+ ((POSplitOutput) physOp).setPlan(currentPlan);
currentPlan = currentPlans.pop();
currentPlan.add(physOp);
PhysicalOperator from = logToPhyMap.get(split.getPlan()
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=829216&r1=829215&r2=829216&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:39:39 2009
@@ -206,7 +206,7 @@
t = data[i];
continue; //since the previous data was probably null so we
dont really need a comparison
}
- if(comp.compare(t, (Tuple) data[i]) > 0)
+ if(comp.compare(t, data[i]) > 0)
t = data[i];
}
return t;
Modified: hadoop/pig/trunk/src/org/apache/pig/builtin/FloatMax.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/FloatMax.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/builtin/FloatMax.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/builtin/FloatMax.java Fri Oct 23
20:39:39 2009
@@ -128,7 +128,7 @@
float curMax = Float.NEGATIVE_INFINITY;
boolean sawNonNull = false;
for (Iterator<Tuple> it = values.iterator(); it.hasNext();) {
- Tuple t = (Tuple)it.next();
+ Tuple t = it.next();
try {
Float f = (Float)(t.get(0));
if (f == null) continue;
Modified: hadoop/pig/trunk/src/org/apache/pig/builtin/FloatSum.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/FloatSum.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/builtin/FloatSum.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/builtin/FloatSum.java Fri Oct 23
20:39:39 2009
@@ -136,7 +136,7 @@
double sum = 0;
boolean sawNonNull = false;
for (Iterator<Tuple> it = values.iterator(); it.hasNext();) {
- Tuple t = (Tuple) it.next();
+ Tuple t = it.next();
try {
Double d = (Double)(t.get(0));
if (d == null) continue;
@@ -170,7 +170,7 @@
double sum = 0.0;
boolean sawNonNull = false;
for (Iterator<Tuple> it = values.iterator(); it.hasNext();) {
- Tuple t = (Tuple) it.next();
+ Tuple t = it.next();
try {
Float f = (Float)(t.get(0));
if (f == null) continue;
Modified: hadoop/pig/trunk/src/org/apache/pig/builtin/IntMax.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/IntMax.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/builtin/IntMax.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/builtin/IntMax.java Fri Oct 23 20:39:39
2009
@@ -128,7 +128,7 @@
int curMax = Integer.MIN_VALUE;
boolean sawNonNull = false;
for (Iterator<Tuple> it = values.iterator(); it.hasNext();) {
- Tuple t = (Tuple)it.next();
+ Tuple t = it.next();
try {
Integer i = (Integer)(t.get(0));
if (i == null) continue;
Modified: hadoop/pig/trunk/src/org/apache/pig/builtin/IntSum.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/IntSum.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/builtin/IntSum.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/builtin/IntSum.java Fri Oct 23 20:39:39
2009
@@ -136,7 +136,7 @@
long sum = 0;
boolean sawNonNull = false;
for (Iterator<Tuple> it = values.iterator(); it.hasNext();) {
- Tuple t = (Tuple) it.next();
+ Tuple t = it.next();
try {
Long l = (Long)(t.get(0));
if (l == null) continue;
@@ -169,7 +169,7 @@
long sum = 0;
boolean sawNonNull = false;
for (Iterator<Tuple> it = values.iterator(); it.hasNext();) {
- Tuple t = (Tuple) it.next();
+ Tuple t = it.next();
try {
Integer i = (Integer)(t.get(0));
if (i == null) continue;
Modified: hadoop/pig/trunk/src/org/apache/pig/builtin/LongSum.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/LongSum.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/builtin/LongSum.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/builtin/LongSum.java Fri Oct 23
20:39:39 2009
@@ -131,7 +131,7 @@
long sum = 0;
boolean sawNonNull = false;
for (Iterator<Tuple> it = values.iterator(); it.hasNext();) {
- Tuple t = (Tuple) it.next();
+ Tuple t = it.next();
try {
Long l = (Long)(t.get(0));
if (l == null) continue;
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=829216&r1=829215&r2=829216&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:39:39 2009
@@ -89,7 +89,7 @@
PigWarning.FIELD_DISCARDED_TYPE_CONVERSION_FAILED, mLog);
return null;
}
- return (DataBag)db;
+ return db;
}
public String bytesToCharArray(byte[] b) throws IOException {
Modified: hadoop/pig/trunk/src/org/apache/pig/data/DataByteArray.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/DataByteArray.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/DataByteArray.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/DataByteArray.java Fri Oct 23
20:39:39 2009
@@ -30,6 +30,8 @@
* other methods.
*/
public class DataByteArray implements Comparable, Serializable {
+
+ private static final long serialVersionUID = 1L;
byte[] mData = 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=829216&r1=829215&r2=829216&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:39:39 2009
@@ -355,9 +355,11 @@
}
public static abstract class BagDelimiterTuple extends DefaultTuple{}
- public static class StartBag extends BagDelimiterTuple{}
+ public static class StartBag extends BagDelimiterTuple{
+ private static final long serialVersionUID = 1L;}
- public static class EndBag extends BagDelimiterTuple{}
+ public static class EndBag extends BagDelimiterTuple{
+ private static final long serialVersionUID = 1L;}
public static final Tuple startBag = new StartBag();
public static final Tuple endBag = new EndBag();
Modified: hadoop/pig/trunk/src/org/apache/pig/data/SingleTupleBag.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/SingleTupleBag.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/SingleTupleBag.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/SingleTupleBag.java Fri Oct 23
20:39:39 2009
@@ -36,7 +36,8 @@
* a single Tuple non-serializable DataBag is required.
*/
public class SingleTupleBag implements DataBag {
-
+
+ private static final long serialVersionUID = 1L;
Tuple item;
public SingleTupleBag(Tuple t) {
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=829216&r1=829215&r2=829216&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:39:39 2009
@@ -1810,7 +1810,7 @@
{
LogicalPlan sortColPlan = new LogicalPlan();
LOProject projectStar = new LOProject(sortColPlan, new
OperatorKey(scope, getNextId()), op, -1);
- ((LOProject)projectStar).setStar(true);
+ projectStar.setStar(true);
sortColPlan.add(projectStar);
sortColPlans.add(sortColPlan);
log.debug("Set star to true");
@@ -2605,7 +2605,7 @@
{
LogicalPlan sortColPlan = new LogicalPlan();
LOProject projectStar = new LOProject(sortColPlan, new
OperatorKey(scope, getNextId()), eOp, -1);
- ((LOProject)projectStar).setStar(true);
+ projectStar.setStar(true);
sortColPlan.add(projectStar);
sortColPlans.add(sortColPlan);
if(asc) {
Modified:
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckerException.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckerException.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckerException.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckerException.java
Fri Oct 23 20:39:39 2009
@@ -21,6 +21,8 @@
public class TypeCheckerException extends VisitorException {
+ private static final long serialVersionUID = 1L;
+
/**
* Create a new TypeCheckerException with null as the error message.
*/
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanException.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanException.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanException.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/PlanException.java Fri Oct 23
20:39:39 2009
@@ -21,6 +21,8 @@
public class PlanException extends FrontendException {
+ private static final long serialVersionUID = 1L;
+
/**
* Create a new PlanException with null as the error message.
*/
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/plan/VisitorException.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/VisitorException.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/plan/VisitorException.java
(original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/plan/VisitorException.java Fri Oct
23 20:39:39 2009
@@ -21,6 +21,8 @@
public class VisitorException extends FrontendException {
+ private static final long serialVersionUID = 1L;
+
/**
* Create a new VisitorException with null as the error message.
*/
Modified:
hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/OptimizerException.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/OptimizerException.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/OptimizerException.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/impl/plan/optimizer/OptimizerException.java
Fri Oct 23 20:39:39 2009
@@ -22,6 +22,8 @@
public class OptimizerException extends VisitorException {
+ private static final long serialVersionUID = 1L;
+
/**
* Create a new OptimizerException with null as the error message.
*/
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/util/Pair.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/util/Pair.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/util/Pair.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/util/Pair.java Fri Oct 23 20:39:39
2009
@@ -23,6 +23,8 @@
* Copy of C++ STL pair container.
*/
public class Pair<T, U> implements Serializable {
+
+ private static final long serialVersionUID = 1L;
public T first;
public U second;
Modified:
hadoop/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java
(original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java
Fri Oct 23 20:39:39 2009
@@ -119,10 +119,10 @@
try {
spillFileSizeThreshold = Long.parseLong(
- (String)
properties.getProperty("pig.spill.size.threshold") ) ;
+ properties.getProperty("pig.spill.size.threshold") ) ;
gcActivationSize = Long.parseLong(
- (String)
properties.getProperty("pig.spill.gc.activation.size") ) ;
+ properties.getProperty("pig.spill.gc.activation.size") ) ;
}
catch (NumberFormatException nfe) {
throw new RuntimeException("Error while converting system
configurations" +
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=829216&r1=829215&r2=829216&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
20:39:39 2009
@@ -433,7 +433,7 @@
// replace the original inputs by POReads
for (int i = 0; i < inputs.size(); i++) {
- DataBag bag = derivedData.get(((LOCogroup) op).getInputs().get(i));
+ DataBag bag = derivedData.get(op.getInputs().get(i));
PORead por = new PORead(new OperatorKey("", r.nextLong()), bag);
phy.add(por);
try {
Modified: hadoop/pig/trunk/src/org/apache/pig/pen/LineageTrimmingVisitor.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/LineageTrimmingVisitor.java?rev=829216&r1=829215&r2=829216&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/LineageTrimmingVisitor.java
(original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/LineageTrimmingVisitor.java Fri Oct
23 20:39:39 2009
@@ -338,8 +338,7 @@
Set<IdentityHashSet<Tuple>> equivClassesCovered =
lineageGroupToEquivClasses
.get(lineageGroup);
int numEquivClassesCovered = equivClassesCovered.size();
- double score = ((double) numEquivClassesCovered)
- / ((double) weight);
+ double score = ((double) numEquivClassesCovered) / weight;
if (score > bestScore) {
