Skip to content
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

Jump to bottom

[SPARK-4554][SQL] Set fair scheduler pool for JDBC client session in hive 13 #3416

Closed
wants to merge 2 commits into from
Closed

[SPARK-4554][SQL] Set fair scheduler pool for JDBC client session in hive 13 #3416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af615fe
set a Fair Scheduler pool for a JDBC client session in hive 13
scwf Nov 22, 2014
bea4d87
minor fix
scwf Nov 22, 2014
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
16 changes: 13 additions & 3 deletions ...e-thriftserver/v0.13.1/src/main/scala/org/apache/spark/sql/hive/thriftserver/Shim13.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@ import org.apache.hive.service.cli.operation.ExecuteStatementOperation
import org.apache.hive.service.cli.session.HiveSession

import org.apache.spark.Logging
import org.apache.spark.sql.catalyst.plans.logical.SetCommand
import org.apache.spark.sql.catalyst.types._
import org.apache.spark.sql.hive.thriftserver.ReflectionUtils._
import org.apache.spark.sql.hive.{HiveContext, HiveMetastoreTypes}
import org.apache.spark.sql.{SchemaRDD, Row => SparkRow}
import org.apache.spark.sql.{Row => SparkRow, SQLConf, SchemaRDD}

/**
* A compatibility layer for interacting with Hive version 0.12.0.
* A compatibility layer for interacting with Hive version 0.13.1.
*/
private[thriftserver] object HiveThriftServerShim {
val version = "0.13.1"
Expand Down Expand Up @@ -83,8 +84,18 @@ private[hive] class SparkExecuteStatementOperation(
try {
result = hiveContext.sql(cmd)
logDebug(result.queryExecution.toString())
result.queryExecution.logical match {
case SetCommand(Some((SQLConf.THRIFTSERVER_POOL, Some(value)))) =>
sessionToActivePool(parentSession) = value
logInfo(s"Setting spark.scheduler.pool=$value for future statements in this session.")
case _ =>
}

val groupId = round(random * 1000000).toString
hiveContext.sparkContext.setJobGroup(groupId, statement)
sessionToActivePool.get(parentSession).foreach { pool =>
hiveContext.sparkContext.setLocalProperty("spark.scheduler.pool", pool)
}
iter = {
val useIncrementalCollect =
hiveContext.getConf("spark.sql.thriftServer.incrementalCollect", "false").toBoolean
Expand Down Expand Up @@ -143,7 +154,6 @@ private[hive] class SparkExecuteStatementOperation(
def getNextRowSet(order: FetchOrientation, maxRowsL: Long): RowSet = {
validateDefaultFetchOrientation(order)
assertState(OperationState.FINISHED)
setHasResultSet(true)
val resultRowSet: RowSet = RowSetFactory.create(getResultSetSchema, getProtocolVersion)
if (!iter.hasNext) {
resultRowSet
Expand Down