Skip to content

[20141023] adding bulkload parser support #5

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

Closed
wants to merge 2 commits into from
Closed

[20141023] adding bulkload parser support #5

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
eb81944
add the parser part
Oct 24, 2014
e595792
add the logical plan part
Oct 24, 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
15 changes: 10 additions & 5 deletions sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseLogicalPlan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.apache.spark.sql.hbase.logical

import org.apache.spark.sql.catalyst.plans.logical.{LeafNode, LogicalPlan, Command}
import org.apache.spark.sql.hbase.HBaseRelation

import org.apache.spark.sql.catalyst.plans.logical.{UnaryNode, LeafNode, LogicalPlan, Command}
//import org.apache.spark.sql.hbase.HBaseRelation
/*
case class CreateHBaseTablePlan(tableName: String,
nameSpace: String,
hbaseTable: String,
Expand All @@ -20,8 +20,13 @@ case class BulkLoadIntoTable(
// TODO:need resolved here?

}
*/
case class LoadDataIntoTable(path: String,
child: LogicalPlan,
isLocal: Boolean) extends UnaryNode {

case class LoadDataIntoTable(path: String, table: String, isLocal: Boolean) extends LeafNode {
override def output = Seq.empty
override def output = Nil

override def toString = s"LogicalPlan: LoadDataIntoTable(LOAD $path INTO $child)"
}

19 changes: 17 additions & 2 deletions sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseSQLParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,15 @@ package org.apache.spark.sql.hbase
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.plans.logical._
import org.apache.spark.sql.catalyst.{SqlLexical, SqlParser}
import org.apache.spark.sql.hbase.logical._

class HBaseSQLParser extends SqlParser {

protected val DATA = Keyword("DATA")
protected val LOAD = Keyword("LOAD")
protected val LOCAL = Keyword("LOCAL")
protected val INPATH = Keyword("INPATH")

protected val BULK = Keyword("BULK")
protected val CREATE = Keyword("CREATE")
protected val DROP = Keyword("DROP")
Expand Down Expand Up @@ -53,9 +60,10 @@ class HBaseSQLParser extends SqlParser {
| EXCEPT ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Except(q1, q2)}
| UNION ~ DISTINCT.? ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Distinct(Union(q1, q2))}
)
| insert | create | drop | alter
| load
/* | insert | create | drop | alter */
)

/*
override protected lazy val insert: Parser[LogicalPlan] =
INSERT ~> INTO ~> relation ~ select <~ opt(";") ^^ {
case r ~ s =>
Expand Down Expand Up @@ -121,6 +129,7 @@ class HBaseSQLParser extends SqlParser {

CreateHBaseTablePlan(tableName, customizedNameSpace, hbaseTableName,
tableColumns.unzip._1, keyColsWithDataType, nonKeyCols)

}

protected lazy val drop: Parser[LogicalPlan] =
Expand All @@ -134,6 +143,12 @@ class HBaseSQLParser extends SqlParser {
} | ALTER ~> TABLE ~> ident ~ ADD ~ tableCol ~ (MAPPED ~> BY ~> "(" ~> expressions <~ ")") ^^ {
case tn ~ op ~ tc ~ cf => null
}
*/
protected lazy val load: Parser[LogicalPlan] =
(LOAD ~> DATA ~> opt(LOCAL) ~> INPATH ~> ident) ~
(opt(OVERWRITE) ~> INTO ~> TABLE ~> relation) ^^ {
case filePath ~ table => LoadDataIntoTable(filePath, table, true)
}

protected lazy val tableCol: Parser[(String, String)] =
ident ~ (STRING | BYTE | SHORT | INTEGER | LONG | FLOAT | DOUBLE | BOOLEAN) ^^ {
Expand Down