Skip to content

[SPARK-30617][SQL] Stop check values of spark.sql.catalogImplementation to improve expansibility #27349

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
WeiWenda wants to merge 2 commits into from
Closed

[SPARK-30617][SQL] Stop check values of spark.sql.catalogImplementation to improve expansibility #27349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee868b9
stop check values of spark.sql.catalogImplementation to provide an ap…
WeiWenda Jan 24, 2020
e01b352
code reformat
WeiWenda Jan 24, 2020
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
7 changes: 5 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/internal/StaticSQLConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ object StaticSQLConf {
.createWithDefault(Utils.resolveURI("spark-warehouse").toString)

val CATALOG_IMPLEMENTATION = buildStaticConf("spark.sql.catalogImplementation")
.internal()
.doc("Spark built-in implementation is in-memory and hive, " +
"when set to yourImpl(can be any words), " +
"you need also provide following configurations to make everything going: " +
"`spark.sql.catalogImplementation.yourImpl.builder` " +
"`spark.sql.catalogImplementation.yourImpl.externalCatalog`.")
.stringConf
.checkValues(Set("hive", "in-memory"))
.createWithDefault("in-memory")

val GLOBAL_TEMP_DATABASE = buildStaticConf("spark.sql.globalTempDatabase")
Expand Down
6 changes: 6 additions & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,6 +1026,12 @@ object SparkSession extends Logging {
conf.get(CATALOG_IMPLEMENTATION) match {
case "hive" => HIVE_SESSION_STATE_BUILDER_CLASS_NAME
case "in-memory" => classOf[SessionStateBuilder].getCanonicalName
case other => conf.getOption(s"spark.sql.catalogImplementation.$other.builder")
.getOrElse {
throw new IllegalArgumentException(
s"You need to configure spark.sql.catalogImplementation.$other.builder when " +
s"`$other` configured by spark.sql.catalogImplementation is not in-memory nor hive.")
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/internal/SharedState.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ object SharedState extends Logging {
conf.get(CATALOG_IMPLEMENTATION) match {
case "hive" => HIVE_EXTERNAL_CATALOG_CLASS_NAME
case "in-memory" => classOf[InMemoryCatalog].getCanonicalName
case other => conf.getOption(s"spark.sql.catalogImplementation.$other.externalCatalog")
.getOrElse {
throw new IllegalArgumentException(
s"You need to configure spark.sql.catalogImplementation.$other.externalCatalog when " +
s"`$other` configured by spark.sql.catalogImplementation is not in-memory nor hive.")
}
}
}

Expand Down