phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmaho...@apache.org
Subject phoenix git commit: PHOENIX-2985 Phoenix-Spark IT for non-existent column fails on Spark 1.6
Date Mon, 13 Jun 2016 15:32:22 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 49fc4af26 -> aba90451e


PHOENIX-2985 Phoenix-Spark IT for non-existent column fails on Spark 1.6

Removed offending unit test, it was reliant on checking a Spark-specific
exception and not guaranteed to be forward-compatible.


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/aba90451
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/aba90451
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/aba90451

Branch: refs/heads/4.x-HBase-0.98
Commit: aba90451e0944f934cef4e386fca094f58a27db5
Parents: 49fc4af
Author: Josh Mahonin <jmahonin@interset.com>
Authored: Mon Jun 13 11:26:57 2016 -0400
Committer: Josh Mahonin <jmahonin@interset.com>
Committed: Mon Jun 13 11:32:16 2016 -0400

----------------------------------------------------------------------
 .../apache/phoenix/spark/PhoenixSparkIT.scala    | 19 -------------------
 pom.xml                                          |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/aba90451/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
----------------------------------------------------------------------
diff --git a/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala b/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
index ce393cc..127f3fd 100644
--- a/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
+++ b/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
@@ -171,25 +171,6 @@ class PhoenixSparkIT extends FunSuite with Matchers with BeforeAndAfterAll
{
     count shouldEqual 1L
   }
 
-  test("Using a predicate referring to a non-existent column should fail") {
-    intercept[Exception] {
-      val sqlContext = new SQLContext(sc)
-
-      val df1 = sqlContext.phoenixTableAsDataFrame(
-        SchemaUtil.getEscapedArgument("table3"),
-        Array("id", "col1"),
-        predicate = Some("foo = bar"),
-        conf = hbaseConfiguration)
-
-      df1.registerTempTable("table3")
-
-      val sqlRdd = sqlContext.sql("SELECT * FROM table3")
-
-      // we have to execute an action before the predicate failure can occur
-      val count = sqlRdd.count()
-    }.getCause shouldBe a[ColumnNotFoundException]
-  }
-
   test("Can create schema RDD with predicate that will never match") {
     val sqlContext = new SQLContext(sc)
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/aba90451/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8bf9724..03f69c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
     <avatica.version>1.8.0</avatica.version>
     <jettyVersion>8.1.7.v20120910</jettyVersion>
     <tephra.version>0.8.0-incubating</tephra.version>
-    <spark.version>1.5.2</spark.version>
+    <spark.version>1.6.1</spark.version>
     <scala.version>2.10.4</scala.version>
     <scala.binary.version>2.10</scala.binary.version>
 


Mime
View raw message