You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by th...@apache.org on 2011/07/18 17:18:12 UTC
svn commit: r1147927 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java
Author: thejas
Date: Mon Jul 18 15:18:11 2011
New Revision: 1147927
URL: http://svn.apache.org/viewvc?rev=1147927&view=rev
Log:
PIG-2053: PigInputFormat uses class.isAssignableFrom() where instanceof is more appropriate (woody via thejas)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1147927&r1=1147926&r2=1147927&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jul 18 15:18:11 2011
@@ -24,6 +24,9 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-2053: PigInputFormat uses class.isAssignableFrom() where
+ instanceof is more appropriate (woody via thejas)
+
PIG-2161: TOTUPLE should use no-copy tuple creation (dvryaboy)
PIG-1946: HBaseStorage constructor syntax is error prone (billgraham via dvryaboy)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java?rev=1147927&r1=1147926&r2=1147927&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java Mon Jul 18 15:18:11 2011
@@ -248,10 +248,9 @@ public class PigInputFormat extends Inpu
FuncSpec loadFuncSpec = inputs.get(i).getFuncSpec();
LoadFunc loadFunc = (LoadFunc) PigContext.instantiateFuncFromSpec(
loadFuncSpec);
- boolean combinable = !(loadFunc instanceof MergeJoinIndexer) &&
- !(IndexableLoadFunc.class.isAssignableFrom(loadFunc.getClass())) &&
- !(CollectableLoadFunc.class.isAssignableFrom(loadFunc.getClass()) &&
- OrderedLoadFunc.class.isAssignableFrom(loadFunc.getClass()));
+ boolean combinable = !(loadFunc instanceof MergeJoinIndexer
+ || loadFunc instanceof IndexableLoadFunc
+ || (loadFunc instanceof CollectableLoadFunc && loadFunc instanceof OrderedLoadFunc));
if (combinable)
combinable = !conf.getBoolean("pig.noSplitCombination", false);
Configuration confClone = new Configuration(conf);