diff --git a/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseStrategies.scala b/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseStrategies.scala index 68301923e258f..3b64b94ebef9f 100755 --- a/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseStrategies.scala +++ b/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseStrategies.scala @@ -95,8 +95,8 @@ private[hbase] trait HBaseStrategies extends QueryPlanner[SparkPlan] { tableName, nameSpace, hbaseTableName, colsSeq, keyCols, nonKeyCols) (hbaseSQLContext)) - case logical.BulkLoadIntoTable(table: HBaseRelation, path) => - execution.BulkLoadIntoTable(table, path)(hbaseSQLContext) :: Nil + case logical.LoadDataIntoTable(path, table: HBaseRelation, isLocal) => + execution.BulkLoadIntoTable(path, table, isLocal)(hbaseSQLContext) :: Nil case InsertIntoTable(table: HBaseRelation, partition, child, _) => new InsertIntoHBaseTable(table, planLater(child))(hbaseSQLContext) :: Nil case logical.DropTablePlan(tableName) => Seq(execution.DropHbaseTableCommand(tableName)(hbaseSQLContext)) diff --git a/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/execution/HBaseOperators.scala b/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/execution/HBaseOperators.scala index a9a4a5f264939..26d704f15ef48 100755 --- a/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/execution/HBaseOperators.scala +++ b/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/execution/HBaseOperators.scala @@ -74,7 +74,7 @@ case class InsertIntoHBaseTable( } @DeveloperApi -case class BulkLoadIntoTable(relation: HBaseRelation, path: String)( +case class BulkLoadIntoTable(path: String, relation: HBaseRelation, isLocal: Boolean)( @transient hbContext: HBaseSQLContext) extends LeafNode { val jobConf = new JobConf(hbContext.sc.hadoopConfiguration) diff --git a/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/logical/HBaseLogicalPlans.scala b/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/logical/HBaseLogicalPlans.scala index 8aa04ced45e1f..4100eb9a8940a 100644 --- a/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/logical/HBaseLogicalPlans.scala +++ b/sql/hbase/src/main/scala/org/apache/spark/sql/hbase/logical/HBaseLogicalPlans.scala @@ -29,13 +29,6 @@ case class CreateHBaseTablePlan(tableName: String, case class DropTablePlan(tableName: String) extends Command - -case class BulkLoadIntoTable(table: HBaseRelation, path: String) extends LeafNode { - override def output = Seq.empty - // TODO:need resolved here? - -} - case class LoadDataIntoTable(path: String, table: String, isLocal: Boolean) extends LeafNode { override def output = Seq.empty }