comment fix

Huawei-Spark · Aug 20, 2015 · 2b96840 · 2b96840
1 parent e6cc6fb
commit 2b96840
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/src/main/scala/org/apache/spark/sql/hbase/HBaseRelation.scala b/src/main/scala/org/apache/spark/sql/hbase/HBaseRelation.scala
@@ -649,12 +649,11 @@ private[hbase] case class HBaseRelation(
     case NonKeyColumn(name, dt, _, _) => StructField(name, dt, nullable = true)
   })
 
-  override def insert(data: DataFrame, overwrite: Boolean) = {
-    if (!overwrite) {
+  override def insert(data: DataFrame, overwrite: Boolean = true) = {
+    if (overwrite) {
       sqlContext.sparkContext.runJob(data.rdd, writeToHBase _)
     } else {
-      // TODO: Support INSERT OVERWRITE INTO
-      sys.error("HBASE Table does not support INSERT OVERWRITE for now.")
+      sys.error("HBASE Table does not support append mode.")
     }
   }
 

diff --git a/src/main/scala/org/apache/spark/sql/hbase/catalyst/logical/operators.scala b/src/main/scala/org/apache/spark/sql/hbase/catalyst/logical/operators.scala
@@ -40,4 +40,4 @@ case class DeleteFromTable(tableName: String, child: LogicalPlan) extends UnaryN
 
   override def output: Seq[Attribute] = Seq.empty
 
-}
+}
diff --git a/src/main/scala/org/apache/spark/sql/hbase/execution/hbaseCommands.scala b/src/main/scala/org/apache/spark/sql/hbase/execution/hbaseCommands.scala
@@ -27,11 +27,12 @@ import org.apache.hadoop.hbase.mapreduce.{HFileOutputFormat2, LoadIncrementalHFi
 import org.apache.hadoop.hbase.util.Bytes
 import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter
 import org.apache.hadoop.mapreduce.{Job, RecordWriter}
+
 import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.mapreduce.SparkHadoopMapReduceUtil
 import org.apache.spark.sql._
-import org.apache.spark.sql.catalyst.expressions.{Expression, Attribute, Row}
-import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, Subquery}
+import org.apache.spark.sql.catalyst.expressions.{Attribute, Row}
+import org.apache.spark.sql.catalyst.plans.logical.Subquery
 import org.apache.spark.sql.execution.RunnableCommand
 import org.apache.spark.sql.hbase.HBasePartitioner.HBaseRawOrdering
 import org.apache.spark.sql.hbase._
@@ -55,11 +56,11 @@ case class AlterDropColCommand(tableName: String, columnName: String) extends Ru
 
 @DeveloperApi
 case class AlterAddColCommand(
-                               tableName: String,
-                               colName: String,
-                               colType: String,
-                               colFamily: String,
-                               colQualifier: String) extends RunnableCommand {
+    tableName: String,
+    colName: String,
+    colType: String,
+    colFamily: String,
+    colQualifier: String) extends RunnableCommand {
 
   def run(sqlContext: SQLContext): Seq[Row] = {
     val hbaseCatalog = sqlContext.catalog.asInstanceOf[HBaseCatalog]
@@ -137,7 +138,7 @@ case class InsertValueIntoTableCommand(tableName: String, valueSeq: Seq[String])
 
     val rows = sqlContext.sparkContext.makeRDD(Seq(Row.fromSeq(bytes)))
     val inputValuesDF = sqlContext.createDataFrame(rows, relation.schema)
-    relation.insert(inputValuesDF, overwrite = false)
+    relation.insert(inputValuesDF)
 
     Seq.empty[Row]
   }
@@ -147,11 +148,11 @@ case class InsertValueIntoTableCommand(tableName: String, valueSeq: Seq[String])
 
 @DeveloperApi
 case class BulkLoadIntoTableCommand(
-                                     inputPath: String,
-                                     tableName: String,
-                                     isLocal: Boolean,
-                                     delimiter: Option[String],
-                                     parallel: Boolean)
+    inputPath: String,
+    tableName: String,
+    isLocal: Boolean,
+    delimiter: Option[String],
+    parallel: Boolean)
   extends RunnableCommand
   with SparkHadoopMapReduceUtil
   with Logging {
@@ -303,7 +304,3 @@ case class BulkLoadIntoTableCommand(
 
   override def output = Nil
 }
-
-
-
-
diff --git a/src/main/scala/org/apache/spark/sql/hbase/execution/oprators.scala b/src/main/scala/org/apache/spark/sql/hbase/execution/oprators.scala
@@ -65,7 +65,7 @@ case class UpdateTable(
       }
     }
     val inputValuesDF = sqlContext.createDataFrame(resRdd, relation.schema)
-    relation.insert(inputValuesDF, overwrite = false)
+    relation.insert(inputValuesDF)
     sqlContext.sparkContext.emptyRDD[Row]
   }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,4 +40,4 @@ case class DeleteFromTable(tableName: String, child: LogicalPlan) extends UnaryN

		override def output: Seq[Attribute] = Seq.empty

		}
		}