Skip to content

[SPARK-46575][SQL][FOLLOWUP] Add back HiveThriftServer2.startWithContext(SQLContext) method for compatibility #45727

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
dragqueen95 wants to merge 4 commits into from
Closed

[SPARK-46575][SQL][FOLLOWUP] Add back HiveThriftServer2.startWithContext(SQLContext) method for compatibility #45727

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7157703
commit
dragqueen95 Mar 25, 2024
2c191ea
Update HiveThriftServer2.scala
dragqueen95 Mar 26, 2024
73d8d2d
empty commit
dragqueen95 Mar 27, 2024
82494da
Update sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive…
cloud-fan Mar 27, 2024
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
17 changes: 15 additions & 2 deletions ...hriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.apache.hive.service.cli.thrift.{ThriftBinaryCLIService, ThriftHttpCLI
import org.apache.hive.service.server.HiveServer2

import org.apache.spark.SparkContext
import org.apache.spark.annotation.DeveloperApi
import org.apache.spark.annotation.{DeveloperApi, Since}
import org.apache.spark.internal.Logging
import org.apache.spark.internal.config.UI.UI_ENABLED
import org.apache.spark.sql.SQLContext
Expand Down Expand Up @@ -56,8 +56,9 @@ object HiveThriftServer2 extends Logging {
* the call logs the error and exits the JVM with exit code -1. When false, the
* call throws an exception instead.
*/
@Since("3.5.2")
Copy link
Member

@yaooqinn yaooqinn Mar 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4.0.0?

Copy link
Member

@dongjoon-hyun dongjoon-hyun Mar 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I thought #44575 was backported.

Copy link
Member

@dongjoon-hyun dongjoon-hyun Mar 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To @dragqueen95 , could you make a follow-up to fix this to 4.0.0 since SPARK-46575 is not in branch-3.5?

Copy link
Contributor Author

@dragqueen95 dragqueen95 Mar 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Raised #45737

@DeveloperApi
def startWithContext(sqlContext: SQLContext, exitOnError: Boolean = true): HiveThriftServer2 = {
def startWithContext(sqlContext: SQLContext, exitOnError: Boolean): HiveThriftServer2 = {
systemExitOnError.set(exitOnError)

val executionHive = HiveUtils.newClientForExecution(
Expand All @@ -75,6 +76,18 @@ object HiveThriftServer2 extends Logging {
server
}

/**
* :: DeveloperApi ::
* Starts a new thrift server with the given context.
*
* @param sqlContext SQLContext to use for the server
*/
@Since("2.0.0")
@DeveloperApi
def startWithContext(sqlContext: SQLContext): HiveThriftServer2 = {
startWithContext(sqlContext, exitOnError = true)
}

private def createListenerAndUI(server: HiveThriftServer2, sc: SparkContext): Unit = {
val kvStore = sc.statusStore.store.asInstanceOf[ElementTrackingStore]
eventManager = new HiveThriftServer2EventManager(sc)
Expand Down