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

Fix: exception when the size of pdAddresse is > 1 (#2473) #2477

Merged
merged 2 commits into from
Aug 2, 2022
Merged

Fix: exception when the size of pdAddresse is > 1 (#2473) #2477

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
91571b3
This is an automated cherry-pick of #2473
xuanyu66 Aug 2, 2022
9c93aba
merge into release-2.5
xuanyu66 Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/scala/com/pingcap/tispark/auth/TiAuthorization.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ case class TiAuthorization private (parameters: Map[String, String], tiConf: TiC
parsePrivilegeFromRow(input)
}

def getPDAddress(): String = {
def getPDAddresses(): String = {
try {
jdbcClient.getPDAddress
String.join(",", jdbcClient.getPDAddresses)
} catch {
case e: Throwable =>
throw new IllegalArgumentException(
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/sql/TiContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TiContext(val sparkSession: SparkSession) extends Serializable with Loggin
final val tiConf: TiConfiguration = TiUtil.sparkConfToTiConf(
conf,
if (TiAuthorization.enableAuth) {
Option(tiAuthorization.get.getPDAddress())
Option(tiAuthorization.get.getPDAddresses())
} else Option.empty)
final val tiSession: TiSession = TiSession.getInstance(tiConf)
lazy val sqlContext: SQLContext = sparkSession.sqlContext
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -118,7 +118,7 @@ class TiCatalog extends TableCatalog with SupportsNamespaces {

val pdAddress: String =
if (TiAuthorization.enableAuth) {
tiAuthorization.get.getPDAddress()
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")
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/com/pingcap/tispark/auth/TiAuthIntegrationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class TiAuthIntegrationSuite extends SharedSQLContext {
}

test("Get PD address from TiDB should be correct") {
ti.tiAuthorization.get.getPDAddress() should be(pdAddresses)
ti.tiAuthorization.get.getPDAddresses() should be(pdAddresses)
}

test("Use database and select without privilege should not be passed") {
Expand Down
4 changes: 2 additions & 2 deletions tikv-client/src/main/java/com/pingcap/tikv/jdbc/JDBCClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public List<String> showGrants() {
}
}

public String getPDAddress() throws SQLException {
return queryForObject(GET_PD_ADDRESS, (rs, rowNum) -> rs.getString(1));
public List<String> getPDAddresses() throws SQLException {
return query(GET_PD_ADDRESS, (rs, rowNum) -> rs.getString(1));
}

public String getCurrentUser() throws SQLException {
Expand Down