commit

scwf · scwf · commit 48886fcd94d7 · 2015-09-10T14:18:11.000+08:00
diff --git a/src/main/scala/org/apache/spark/sql/hbase/SparkSqlRegionObserver.scala b/src/main/scala/org/apache/spark/sql/hbase/SparkSqlRegionObserver.scala
@@ -114,18 +114,19 @@ class HBaseCoprocessorSQLReaderRDD(var relation: HBaseRelation,
 }
 
 abstract class BaseRegionScanner extends RegionScanner {
+  override def getBatch={0}//Achieve this function inherited from RegionScanner
 
   override def isFilterDone = false
 
-  override def next(result: java.util.List[Cell], limit: Int) = next(result)
+  override def next(result: java.util.List[Cell],  scannerContext: ScannerContext)= next(result)// limit: Int=>scannerContext: ScannerContext
 
   override def reseek(row: Array[Byte]) = throw new DoNotRetryIOException("Unsupported")
 
   override def getMvccReadPoint = Long.MaxValue
 
   override def nextRaw(result: java.util.List[Cell]) = next(result)
 
-  override def nextRaw(result: java.util.List[Cell], limit: Int) = next(result, limit)
+  override def nextRaw(result: java.util.List[Cell],  scannerContext: ScannerContext) = next(result, scannerContext)  //limit: Int=>scannerContext: ScannerContext
 }
 
 class SparkSqlRegionObserver extends BaseRegionObserver {

Original file line number	Diff line number	Diff line change
`@@ -114,18 +114,19 @@ class HBaseCoprocessorSQLReaderRDD(var relation: HBaseRelation,`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`abstract class BaseRegionScanner extends RegionScanner {`
	`117`	`+ override def getBatch={0}//Achieve this function inherited from RegionScanner`
`117`	`118`
`118`	`119`	`override def isFilterDone = false`
`119`	`120`
`120`		`- override def next(result: java.util.List[Cell], limit: Int) = next(result)`
	`121`	`+ override def next(result: java.util.List[Cell], scannerContext: ScannerContext)= next(result)// limit: Int=>scannerContext: ScannerContext`
`121`	`122`
`122`	`123`	`override def reseek(row: Array[Byte]) = throw new DoNotRetryIOException("Unsupported")`
`123`	`124`
`124`	`125`	`override def getMvccReadPoint = Long.MaxValue`
`125`	`126`
`126`	`127`	`override def nextRaw(result: java.util.List[Cell]) = next(result)`
`127`	`128`
`128`		`- override def nextRaw(result: java.util.List[Cell], limit: Int) = next(result, limit)`
	`129`	`+ override def nextRaw(result: java.util.List[Cell], scannerContext: ScannerContext) = next(result, scannerContext) //limit: Int=>scannerContext: ScannerContext`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`class SparkSqlRegionObserver extends BaseRegionObserver {`