Skip to content

update strategy to use the correct logical plan #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2014
Merged

update strategy to use the correct logical plan #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6c25dc
update strategy to use the newly added bulkload logical plan
Oct 28, 2014
2a150c7
preserving isLocal for checking in execution
Oct 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseStrategies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion sql/hbase/src/main/scala/org/apache/spark/sql/hbase/execution/HBaseOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions sql/hbase/src/main/scala/org/apache/spark/sql/hbase/logical/HBaseLogicalPlans.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}