Skip to content

[SPARK-29516][SQL][TEST] Test ThriftServerQueryTestSuite asynchronously #26172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wangyum wants to merge 7 commits into from
Closed

[SPARK-29516][SQL][TEST] Test ThriftServerQueryTestSuite asynchronously #26172

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b3a26e1
Test ThriftServerQueryTestSuite asynchronously
wangyum Oct 19, 2019
5c896ce
Add debug info
wangyum Oct 20, 2019
df58bb3
Apply SPARK-29530
wangyum Oct 21, 2019
8fd1efd
Remove custom SparkConf
wangyum Oct 21, 2019
8f08b3d
Apply SPARK-29530
wangyum Oct 21, 2019
f291ed4
Remove SparkSession.setActiveSession(this)
wangyum Oct 21, 2019
175c6f4
Merge remote-tracking branch 'upstream/master' into SPARK-29516
wangyum Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Test ThriftServerQueryTestSuite asynchronously
  • Loading branch information
@wangyum
wangyum committed Oct 19, 2019
commit b3a26e15ba1851669ffe5bf28e5bcb6f84a18316
10 changes: 8 additions & 2 deletions ...er/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerQueryTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.spark.sql.hive.thriftserver

import java.io.File
import java.sql.{DriverManager, Statement, Timestamp}
import java.sql.{DriverManager, SQLException, Statement, Timestamp}
import java.util.{Locale, MissingFormatArgumentException}

import scala.util.{Random, Try}
Expand Down Expand Up @@ -78,7 +78,7 @@ class ThriftServerQueryTestSuite extends SQLQueryTestSuite {
override def sparkConf: SparkConf = super.sparkConf
// Hive Thrift server should not executes SQL queries in an asynchronous way
// because we may set session configuration.
.set(HiveUtils.HIVE_THRIFT_SERVER_ASYNC, false)
.set(HiveUtils.HIVE_THRIFT_SERVER_ASYNC, true)

override val isTestWithConfigSets = false

Expand Down Expand Up @@ -220,6 +220,12 @@ class ThriftServerQueryTestSuite extends SQLQueryTestSuite {
s"Exception did not match for query #$i\n${expected.sql}, " +
s"expected: ${expected.output}, but got: ${output.output}")

// SQLException should not exactly match. We only assert the result contains Exception.
case _ if output.output.startsWith(classOf[SQLException].getName) =>
assert(expected.output.contains("Exception"),
s"Exception did not match for query #$i\n${expected.sql}, " +
s"expected: ${expected.output}, but got: ${output.output}")

case _ =>
assertResult(expected.output, s"Result did not match for query #$i\n${expected.sql}") {
output.output
Expand Down