This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 6f5b985c761 Remove StorageUnit.url (#28676)
6f5b985c761 is described below
commit 6f5b985c7616b6ec3152f1ff986fc79a86d27da9
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Oct 8 16:11:20 2023 +0800
Remove StorageUnit.url (#28676)
* Remove StorageUnit.url
* For code format
---
.../infra/metadata/database/resource/unit/StorageUnit.java | 6 ++----
.../rdl/storage/unit/UnregisterStorageUnitBackendHandler.java | 3 +--
.../handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java | 3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java
index 49668c7b7ba..2f806be4870 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java
@@ -40,8 +40,6 @@ public final class StorageUnit {
private final StorageNode storageNode;
- private final String url;
-
private final DatabaseType storageType;
private final String catalog;
@@ -55,7 +53,7 @@ public final class StorageUnit {
public StorageUnit(final StorageNode storageNode, final
DataSourcePoolProperties dataSourcePoolProperties, final DataSource dataSource)
{
this.storageNode = storageNode;
Map<String, Object> standardProps =
dataSourcePoolProperties.getConnectionPropertySynonyms().getStandardProperties();
- url = standardProps.get("url").toString();
+ String url = standardProps.get("url").toString();
storageType = DatabaseTypeFactory.get(url);
boolean isInstanceConnectionAvailable = new
DatabaseTypeRegistry(DatabaseTypeFactory.get(url)).getDialectDatabaseMetaData().isInstanceConnectionAvailable();
catalog = isInstanceConnectionAvailable ? new
StandardJdbcUrlParser().parse(url).getDatabase() : null;
@@ -66,6 +64,6 @@ public final class StorageUnit {
private ConnectionProperties createConnectionProperties(final Map<String,
Object> standardProps) {
ConnectionPropertiesParser parser =
DatabaseTypedSPILoader.getService(ConnectionPropertiesParser.class,
storageType);
- return parser.parse(url, standardProps.getOrDefault("username",
"").toString(), catalog);
+ return parser.parse(standardProps.get("url").toString(),
standardProps.getOrDefault("username", "").toString(), catalog);
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandler.java
index 32afd3263bd..a8a970d6cdd 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandler.java
@@ -78,8 +78,7 @@ public final class UnregisterStorageUnitBackendHandler
extends StorageUnitDefini
private void checkInUsed(final String databaseName, final
UnregisterStorageUnitStatement sqlStatement) {
ShardingSphereDatabase database =
ProxyContext.getInstance().getDatabase(databaseName);
- Map<String, Collection<String>> inUsedStorageUnits =
StorageUnitUtils.getInUsedStorageUnits(
- database.getRuleMetaData(),
database.getResourceMetaData().getStorageUnits().size());
+ Map<String, Collection<String>> inUsedStorageUnits =
StorageUnitUtils.getInUsedStorageUnits(database.getRuleMetaData(),
database.getResourceMetaData().getStorageUnits().size());
Collection<String> inUsedStorageUnitNames =
inUsedStorageUnits.keySet();
inUsedStorageUnitNames.retainAll(sqlStatement.getStorageUnitNames());
if (!inUsedStorageUnitNames.isEmpty()) {
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
index 5c7dea63c4b..b72349fc8e3 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
@@ -96,8 +96,7 @@ public final class ShowStorageUnitExecutor implements
RQLExecutor<ShowStorageUni
Map<String, StorageUnit> storageUnits =
database.getResourceMetaData().getStorageUnits();
Optional<Integer> usageCount = sqlStatement.getUsageCount();
if (usageCount.isPresent()) {
- Map<String, Collection<String>> inUsedStorageUnits =
StorageUnitUtils.getInUsedStorageUnits(
- database.getRuleMetaData(),
database.getResourceMetaData().getStorageUnits().size());
+ Map<String, Collection<String>> inUsedStorageUnits =
StorageUnitUtils.getInUsedStorageUnits(database.getRuleMetaData(),
database.getResourceMetaData().getStorageUnits().size());
for (Entry<String, StorageUnit> entry :
database.getResourceMetaData().getStorageUnits().entrySet()) {
Integer currentUsageCount =
inUsedStorageUnits.containsKey(entry.getKey()) ?
inUsedStorageUnits.get(entry.getKey()).size() : 0;
if (usageCount.get().equals(currentUsageCount)) {
