Merge pull request #5 from scwf/hbase

make package logical and execution

Author: scwf

sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseSQLParser.scala

@@ -20,6 +20,7 @@ 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.catalyst.SparkSQLParser
+import org.apache.spark.sql.hbase.logical.{DropTablePlan, CreateHBaseTablePlan}
 
 class HBaseSQLParser extends SqlParser {
   protected val BULK = Keyword("BULK")

sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseStrategies.scala

@@ -17,15 +17,12 @@
 
 package org.apache.spark.sql.hbase
 
-import org.apache.hadoop.conf.Configuration
-import org.apache.hadoop.hbase.client.HTable
-import org.apache.hadoop.hbase.filter.{Filter => HFilter}
 import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.catalyst.planning.{PhysicalOperation, QueryPlanner}
-import org.apache.spark.sql.catalyst.plans.logical
-import org.apache.spark.sql.catalyst.plans.logical.{Filter, Join, LogicalPlan}
+import org.apache.spark.sql.catalyst.plans.logical.{InsertIntoTable, LogicalPlan}
 import org.apache.spark.sql.execution._
-import org.apache.spark.sql.{SQLContext, SchemaRDD}
+import org.apache.spark.sql.SQLContext
+import org.apache.spark.sql.hbase.execution._
 
 /**
  * HBaseStrategies
@@ -91,16 +88,16 @@ private[hbase] trait HBaseStrategies extends QueryPlanner[SparkPlan] {
 
   object HBaseOperations extends Strategy {
     def apply(plan: LogicalPlan): Seq[SparkPlan] = plan match {
-      case CreateHBaseTablePlan(
+      case logical.CreateHBaseTablePlan(
       tableName, nameSpace, hbaseTableName,
       colsSeq, keyCols, nonKeyCols) =>
         Seq(CreateHBaseTableCommand(
           tableName, nameSpace, hbaseTableName,
           colsSeq, keyCols, nonKeyCols)
           (hbaseSQLContext))
-      case logical.InsertIntoTable(table: HBaseRelation, partition, child, _) =>
+      case InsertIntoTable(table: HBaseRelation, partition, child, _) =>
         new InsertIntoHBaseTable(table, planLater(child))(hbaseSQLContext) :: Nil
-      case DropTablePlan(tableName) => Seq(DropHbaseTableCommand(tableName)(hbaseSQLContext))
+      case logical.DropTablePlan(tableName) => Seq(DropHbaseTableCommand(tableName)(hbaseSQLContext))
       case _ => Nil
     }
   }

sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseCommands.scala renamed to sql/hbase/src/main/scala/org/apache/spark/sql/hbase/execution/HBaseCommands.scala

@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.sql.hbase
+package org.apache.spark.sql.hbase.execution
 
 import org.apache.spark.sql._
 import org.apache.spark.sql.catalyst.expressions.Attribute
 import org.apache.spark.sql.execution.{Command, LeafNode}
+import org.apache.spark.sql.hbase.{NonKeyColumn, KeyColumn, HBaseSQLContext}
 
 case class CreateHBaseTableCommand(tableName: String,
                                    nameSpace: String,

sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseOperators.scala renamed to sql/hbase/src/main/scala/org/apache/spark/sql/hbase/execution/HBaseOperators.scala

@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.hbase
+package org.apache.spark.sql.hbase.execution
 
 import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.rdd.RDD
 import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.execution.{LeafNode, UnaryNode, SparkPlan}
+import org.apache.spark.sql.hbase.{HBaseSQLReaderRDD, HBaseSQLContext, HBaseRelation}
 
 /**
  * :: DeveloperApi ::

sql/hbase/src/main/scala/org/apache/spark/sql/hbase/HBaseLogicalPlan.scala renamed to sql/hbase/src/main/scala/org/apache/spark/sql/hbase/logical/HBaseLogicalPlans.scala

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.sql.hbase
+package org.apache.spark.sql.hbase.logical
 
 import org.apache.spark.sql.catalyst.plans.logical.Command