Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-15282 Bump hbase-spark to use Spark 1.6.0

This commit is contained in:
Jonathan M Hsieh 2016-02-18 17:31:42 -08:00
parent d2ba87509b
commit f352f3c371
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-spark/pom.xml
View File

@ -37,7 +37,7 @@
<name>Apache HBase - Spark</name>
<properties>
<spark.version>1.3.0</spark.version>
<spark.version>1.6.0</spark.version>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>
<surefire.skipSecondPart>true</surefire.skipSecondPart>

4
hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DefaultSourceSuite.scala
View File

@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.spark
import org.apache.hadoop.hbase.client.{Put, ConnectionFactory}
import org.apache.hadoop.hbase.spark.datasources.HBaseSparkConf
import org.apache.hadoop.hbase.util.Bytes
import org.apache.hadoop.hbase.{TableNotFoundException, TableName, HBaseTestingUtility}
import org.apache.hadoop.hbase.{TableName, HBaseTestingUtility}
import org.apache.spark.sql.{DataFrame, SQLContext}
import org.apache.spark.{SparkConf, SparkContext, Logging}
import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, FunSuite}
@ -514,7 +514,7 @@ BeforeAndAfterEach with BeforeAndAfterAll with Logging {
test("Test table that doesn't exist") {
intercept[TableNotFoundException] {
intercept[Exception] {
df = sqlContext.load("org.apache.hadoop.hbase.spark",
Map("hbase.columns.mapping" ->
"KEY_FIELD STRING :key, A_FIELD STRING c:a, B_FIELD STRING c:b,",