Fix bugs

maropu · Mar 27, 2018 · ee78551 · ee78551
1 parent c6da9ff
commit ee78551
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/assembly/sql-server_2.11_2.3.0_0.1.1-SNAPSHOT-with-dependencies.jar b/assembly/sql-server_2.11_2.3.0_0.1.1-SNAPSHOT-with-dependencies.jar
diff --git a/assembly/tpcds_2.11_2.3.0_0.1.1-SNAPSHOT-with-dependencies.jar b/assembly/tpcds_2.11_2.3.0_0.1.1-SNAPSHOT-with-dependencies.jar
diff --git a/releases/spark-sql-server-0.1.1.zip b/releases/spark-sql-server-0.1.1.zip
diff --git a/...ala/org/apache/spark/sql/server/service/postgresql/protocol/v3/ParameterBinderSuite.scala b/...ala/org/apache/spark/sql/server/service/postgresql/protocol/v3/ParameterBinderSuite.scala
@@ -21,38 +21,40 @@ import java.sql.SQLException
 
 import org.apache.spark.sql.catalyst.dsl.expressions._
 import org.apache.spark.sql.catalyst.expressions.{And, EqualTo, Literal}
-import org.apache.spark.sql.catalyst.plans.logical._
 import org.apache.spark.sql.catalyst.plans.PlanTest
+import org.apache.spark.sql.catalyst.plans.logical._
 import org.apache.spark.sql.server.catalyst.expressions.ParameterPlaceHolder
 import org.apache.spark.sql.types._
 
 
 class ParameterBinderSuite extends PlanTest {
 
   test("bind parameters") {
-    val r1 = LocalRelation('a.int, 'b.int)
+    val c0 = 'a.int
+    val c1 = 'b.int
+    val r1 = LocalRelation(c0, c1)
 
     val param1 = Literal(18, IntegerType)
-    val lp1 = Filter(EqualTo('a.int, ParameterPlaceHolder(1)), r1)
-    val expected1 = Filter(EqualTo('a.int, param1), r1)
+    val lp1 = Filter(EqualTo(c0, ParameterPlaceHolder(1)), r1)
+    val expected1 = Filter(EqualTo(c0, param1), r1)
     comparePlans(expected1, ParamBinder.bind(lp1, Map(1 -> param1)))
 
     val param2 = Literal(42, IntegerType)
-    val lp2 = Filter(EqualTo('a.int, ParameterPlaceHolder(300)), r1)
-    val expected2 = Filter(EqualTo('a.int, param2), r1)
+    val lp2 = Filter(EqualTo(c0, ParameterPlaceHolder(300)), r1)
+    val expected2 = Filter(EqualTo(c0, param2), r1)
     comparePlans(expected2, ParamBinder.bind(lp2, Map(300 -> param2)))
 
     val param3 = Literal(-1, IntegerType)
     val param4 = Literal(48, IntegerType)
     val lp3 = Filter(
       And(
-        EqualTo('a.int, ParameterPlaceHolder(1)),
-        EqualTo('b.int, ParameterPlaceHolder(2))
+        EqualTo(c0, ParameterPlaceHolder(1)),
+        EqualTo(c1, ParameterPlaceHolder(2))
       ), r1)
     val expected3 = Filter(
       And(
-        EqualTo('a.int, param3),
-        EqualTo('b.int, param4)
+        EqualTo(c0, param3),
+        EqualTo(c1, param4)
       ), r1)
     comparePlans(expected3, ParamBinder.bind(lp3, Map(1 -> param3, 2 -> param4)))
 

diff --git a/...rg/apache/spark/sql/server/service/postgresql/protocol/v3/PgV3ProtocolScenarioSuite.scala b/...rg/apache/spark/sql/server/service/postgresql/protocol/v3/PgV3ProtocolScenarioSuite.scala
@@ -38,8 +38,8 @@ class PgV3ProtocolScenarioSuite extends PgV3ProtocolTest {
   }
 
   testIfSupported("unsupported SQL strings") {
-    def expectedErrorMessage(message: String, cmd: String): String =
-      s"Exception detected in `$message`: java.sql.SQLException: Cannot handle command $cmd"
+    def expectedErrorMessage(message: String, cmd: String): Seq[String] =
+      Seq(s"Exception detected in `$message`", s"Operation not allowed: $cmd")
 
     Seq("COMMIT", "ROLLBACK").foreach { cmd =>
       val e1 = intercept[Exception] {
@@ -51,7 +51,7 @@ class PgV3ProtocolScenarioSuite extends PgV3ProtocolTest {
           expected = ""
         )
       }.getMessage
-      assert(e1.contains(expectedErrorMessage("Query", cmd)))
+      assert(expectedErrorMessage("Query", cmd).forall(e1.contains))
 
       val e2 = intercept[Exception] {
         checkV3Protocol(
@@ -62,7 +62,7 @@ class PgV3ProtocolScenarioSuite extends PgV3ProtocolTest {
           expected = ""
         )
       }.getMessage
-      assert(e2.contains(expectedErrorMessage("Parse", cmd)))
+      assert(expectedErrorMessage("Parse", cmd).forall(e2.contains))
     }
   }