Author: pradeepkth
Date: Mon Oct 26 18:30:58 2009
New Revision: 829893
URL: http://svn.apache.org/viewvc?rev=829893&view=rev
Log:
svn merge -r829277:829891 http://svn.apache.org/repos/asf/hadoop/pig/trunk
Removed:
hadoop/pig/branches/load-store-redesign/lib/hadoop17.jar
Modified:
hadoop/pig/branches/load-store-redesign/CHANGES.txt
hadoop/pig/branches/load-store-redesign/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopStoreRemover.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/SortedDataBag.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/tools/grunt/GruntParser.java
hadoop/pig/branches/load-store-redesign/test/findbugsExcludeFile.xml
Modified: hadoop/pig/branches/load-store-redesign/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/CHANGES.txt?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/CHANGES.txt (original)
+++ hadoop/pig/branches/load-store-redesign/CHANGES.txt Mon Oct 26 18:30:58 2009
@@ -28,6 +28,9 @@
PIG-1045: Integration with Hadoop 20 New API (rding via pradeepkth)
+PIG-1043: FINDBUGS: SIC_INNER_SHOULD_BE_STATIC: Should be a static inner class
+(olgan)
+
PIG-1047: FINDBUGS: URF_UNREAD_FIELD: Unread field (olgan)
PIG-1032: FINDBUGS: DM_STRING_CTOR: Method invokes inefficient new
Modified:
hadoop/pig/branches/load-store-redesign/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java
(original)
+++
hadoop/pig/branches/load-store-redesign/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java
Mon Oct 26 18:30:58 2009
@@ -146,7 +146,7 @@
log.error(arg0 + ": " + arg1);
}
- class SSHProcess extends Process {
+ static class SSHProcess extends Process {
ChannelExec channel;
InputStream is;
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java
Mon Oct 26 18:30:58 2009
@@ -677,7 +677,7 @@
rearrange.setPlansFromCombiner(plans);
}
- private class AlgebraicPlanChecker extends PhyPlanVisitor {
+ private static class AlgebraicPlanChecker extends PhyPlanVisitor {
boolean sawNonAlgebraic = false;
boolean sawDistinctAgg = false;
private boolean sawForeach = false;
@@ -812,7 +812,7 @@
* with
* POUserFunc(org.apache.pig.builtin.Distinct)[DataBag]
*/
- private class DistinctPatcher extends PhyPlanVisitor {
+ private static class DistinctPatcher extends PhyPlanVisitor {
public boolean patched = false;
/**
@@ -884,7 +884,7 @@
}
- private class fixMapProjects extends PhyPlanVisitor {
+ private static class fixMapProjects extends PhyPlanVisitor {
public fixMapProjects(PhysicalPlan plan) {
this(plan, new DepthFirstWalker<PhysicalOperator, PhysicalPlan>(
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java
Mon Oct 26 18:30:58 2009
@@ -99,7 +99,7 @@
}
}
- class PhyPlanKeyTypeVisitor extends PhyPlanVisitor {
+ static class PhyPlanKeyTypeVisitor extends PhyPlanVisitor {
private MapReduceOper mro;
private boolean foundKeyType = false;
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
Mon Oct 26 18:30:58 2009
@@ -2425,7 +2425,7 @@
}
}
- private class FindKeyTypeVisitor extends PhyPlanVisitor {
+ private static class FindKeyTypeVisitor extends PhyPlanVisitor {
byte keyType = DataType.UNKNOWN;
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
Mon Oct 26 18:30:58 2009
@@ -170,7 +170,7 @@
*/
//We intentionally skip type checking in backend for performance reasons
@SuppressWarnings("unchecked")
- private class StoreFuncAdaptor implements StoreFunc {
+ private static class StoreFuncAdaptor implements StoreFunc {
private RecordWriter<PigNullableWritable, Writable> collector;
public StoreFuncAdaptor(RecordWriter<PigNullableWritable, Writable>
collector) {
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopStoreRemover.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopStoreRemover.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopStoreRemover.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopStoreRemover.java
Mon Oct 26 18:30:58 2009
@@ -123,7 +123,7 @@
}
}
- private class RemovableStore {
+ private static class RemovableStore {
public PhysicalPlan storePlan;
public PhysicalPlan plan;
public POSplit split;
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
Mon Oct 26 18:30:58 2009
@@ -110,7 +110,7 @@
* Helper class to represent the relationship of map, reduce and
* combine phases in an MR operator.
*/
- public class InnerOperator extends Operator<PlanVisitor> {
+ public static class InnerOperator extends Operator<PlanVisitor> {
private static final long serialVersionUID = 1L;
String name;
@@ -139,7 +139,7 @@
* operators. The inner operators contain the physical plan of the
* execution phase.
*/
- public class InnerPlan extends OperatorPlan<InnerOperator> {
+ public static class InnerPlan extends OperatorPlan<InnerOperator> {
private static final long serialVersionUID = 1L;
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java
Mon Oct 26 18:30:58 2009
@@ -131,7 +131,7 @@
* which will get a reference to the POPacakge
* present in the plan
*/
- class PackageDiscoverer extends PhyPlanVisitor {
+ static class PackageDiscoverer extends PhyPlanVisitor {
private POPackage pkg;
@@ -181,7 +181,7 @@
* in the LocalRearrange (regarding columns in the "value"
* present in the "key")
*/
- class LoRearrangeDiscoverer extends PhyPlanVisitor {
+ static class LoRearrangeDiscoverer extends PhyPlanVisitor {
private int loRearrangeFound = 0;
private POPackage pkg;
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java
Mon Oct 26 18:30:58 2009
@@ -227,7 +227,7 @@
return false;
}
- private class groupComparator implements Comparator<Tuple> {
+ private static class groupComparator implements Comparator<Tuple> {
public int compare(Tuple o1, Tuple o2) {
//We want to make it as efficient as possible by only comparing the
keys
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/SortedDataBag.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/SortedDataBag.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/SortedDataBag.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/SortedDataBag.java
Mon Oct 26 18:30:58 2009
@@ -61,7 +61,7 @@
transient private Comparator<Tuple> mComp;
private boolean mReadStarted = false;
- private class DefaultComparator implements Comparator<Tuple> {
+ private static class DefaultComparator implements Comparator<Tuple> {
@SuppressWarnings("unchecked")
public int compare(Tuple t1, Tuple t2) {
return t1.compareTo(t2);
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
Mon Oct 26 18:30:58 2009
@@ -1312,7 +1312,7 @@
return null;
}
- private class ScoreFuncSpecListComparator implements Comparator<Pair<Long,
FuncSpec>> {
+ private static class ScoreFuncSpecListComparator implements
Comparator<Pair<Long, FuncSpec>> {
/* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object,
java.lang.Object)
Modified:
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/tools/grunt/GruntParser.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/tools/grunt/GruntParser.java?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
---
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/tools/grunt/GruntParser.java
(original)
+++
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/tools/grunt/GruntParser.java
Mon Oct 26 18:30:58 2009
@@ -746,7 +746,7 @@
}
}
- private class ExplainState {
+ private static class ExplainState {
public long mTime;
public int mCount;
public String mAlias;
Modified: hadoop/pig/branches/load-store-redesign/test/findbugsExcludeFile.xml
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/findbugsExcludeFile.xml?rev=829893&r1=829892&r2=829893&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/findbugsExcludeFile.xml
(original)
+++ hadoop/pig/branches/load-store-redesign/test/findbugsExcludeFile.xml Mon
Oct 26 18:30:58 2009
@@ -127,5 +127,9 @@
<Class name="org.apache.pig.impl.util.SpillableMemoryManager" />
<Bug pattern="DM_GC" />
</Match>
+ <Match>
+ <Class
name="org.apache.pig.data.DistinctDataBag$DistinctDataBagIterator$TContainer" />
+ <Bug pattern="SIC_INNER_SHOULD_BE_STATIC" />
+ </Match>
</FindBugsFilter>
