Skip to content

Commit e5aa31a

Browse files
committed
Fixed metastore JDBC URI quotation
1 parent cd0720c commit e5aa31a

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ class HiveThriftServer2Suite extends FunSuite with BeforeAndAfterAll with TestUt
5151
port
5252
}
5353

54-
// If verbose is true, the test program will print all outputs coming from the Hive Thrift server.
55-
val VERBOSE = Option(System.getenv("SPARK_SQL_TEST_VERBOSE")).getOrElse("false").toBoolean
56-
5754
Class.forName(DRIVER_NAME)
5855

5956
override def beforeAll() { launchServer() }
@@ -68,17 +65,14 @@ class HiveThriftServer2Suite extends FunSuite with BeforeAndAfterAll with TestUt
6865
val command =
6966
s"""../../sbin/start-thriftserver.sh
7067
| --master local
71-
| --hiveconf hive.root.logger=INFO,console
72-
| --hiveconf ${ConfVars.METASTORECONNECTURLKEY}="$jdbcUrl"
68+
| --hiveconf ${ConfVars.METASTORECONNECTURLKEY}=$jdbcUrl
7369
| --hiveconf ${ConfVars.METASTOREWAREHOUSE}=$METASTORE_PATH
7470
| --hiveconf ${ConfVars.HIVE_SERVER2_THRIFT_BIND_HOST}=$HOST
7571
| --hiveconf ${ConfVars.HIVE_SERVER2_THRIFT_PORT}=$PORT
7672
""".stripMargin.split("\\s+")
7773

7874
val pb = new ProcessBuilder(command ++ args: _*)
7975
val environment = pb.environment()
80-
environment.put("HIVE_SERVER2_THRIFT_PORT", PORT.toString)
81-
environment.put("HIVE_SERVER2_THRIFT_BIND_HOST", HOST)
8276
process = pb.start()
8377
inputReader = new BufferedReader(new InputStreamReader(process.getInputStream))
8478
errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream))
@@ -91,12 +85,8 @@ class HiveThriftServer2Suite extends FunSuite with BeforeAndAfterAll with TestUt
9185
while (true) {
9286
val stdout = readFrom(inputReader)
9387
val stderr = readFrom(errorReader)
94-
if (VERBOSE && stdout.length > 0) {
95-
println(stdout)
96-
}
97-
if (VERBOSE && stderr.length > 0) {
98-
println(stderr)
99-
}
88+
print(stdout)
89+
print(stderr)
10090
Thread.sleep(50)
10191
}
10292
}

0 commit comments

Comments
 (0)