Skip to content

Support to config pdAddress by manual when user has no privs on INFORMATION_SCHEMA table. #2802

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support to config pdAddress by manual when user has no privs on INFORMATION_SCHEMA table. #2802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions core/src/main/scala/org/apache/spark/sql/catalyst/catalog/TiCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,24 @@ class TiCatalog extends TableCatalog with SupportsNamespaces {
override def initialize(name: String, options: CaseInsensitiveStringMap): Unit = {
_name = Some(name)

def getPdAddressFromConf: String = {
if (!options.containsKey("pd.addresses") && !options.containsKey("pd.address")) {
throw new Exception("missing configuration spark.sql.catalog.tidb_catalog.pd.addresses")
}
options.getOrDefault("pd.addresses", options.get("pd.address"))
}

val pdAddress: String =
if (TiAuthorization.enableAuth) {
tiAuthorization.get.getPDAddresses()
} else {
if (!options.containsKey("pd.addresses") && !options.containsKey("pd.address")) {
throw new Exception("missing configuration spark.sql.catalog.tidb_catalog.pd.addresses")
try {
tiAuthorization.get.getPDAddresses()
} catch {
case e: Throwable =>
logger.warn("getPDAddress error", e)
getPdAddressFromConf
}
options.getOrDefault("pd.addresses", options.get("pd.address"))
} else {
getPdAddressFromConf
}

logger.info(s"Initialize TiCatalog with name: $name, pd address: $pdAddress")
Expand Down
Loading