svn commit: r1533213 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce: MultiTableInputFormatBase.java TableInputFormatBase.java

[jxiang]

Author: jxiang
Date: Thu Oct 17 19:03:18 2013
New Revision: 1533213

URL: http://svn.apache.org/r1533213
Log:
HBASE-9791 MR initializes scanner twice

Modified:
    
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java
    
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java?rev=1533213&r1=1533212&r2=1533213&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java
 Thu Oct 17 19:03:18 2013
@@ -92,7 +92,6 @@ public abstract class MultiTableInputFor
     sc.setStopRow(tSplit.getEndRow());
     trr.setScan(sc);
     trr.setHTable(table);
-    trr.initialize(split, context);
     return trr;
   }
 

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java?rev=1533213&r1=1533212&r2=1533213&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
 Thu Oct 17 19:03:18 2013
@@ -131,11 +131,6 @@ extends InputFormat<ImmutableBytesWritab
     sc.setStopRow(tSplit.getEndRow());
     trr.setScan(sc);
     trr.setHTable(table);
-    try {
-      trr.initialize(tSplit, context);
-    } catch (InterruptedException e) {
-      throw new InterruptedIOException(e.getMessage());
-    }
     return trr;
   }