You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/04/25 08:23:05 UTC
[shardingsphere] branch master updated: Refactor method naming in AbstractDatabaseMetaDataExecutor (#25319)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 debabcd53b5 Refactor method naming in AbstractDatabaseMetaDataExecutor (#25319)
debabcd53b5 is described below
commit debabcd53b5bcf27f49e431cb810931ea50eeea3
Author: Raigor <ra...@gmail.com>
AuthorDate: Tue Apr 25 16:22:56 2023 +0800
Refactor method naming in AbstractDatabaseMetaDataExecutor (#25319)
---
.../executor/AbstractDatabaseMetaDataExecutor.java | 18 +++++++++---------
.../information/SelectInformationSchemataExecutor.java | 12 ++++++------
.../handler/admin/executor/SelectDatabaseExecutor.java | 14 +++++++-------
.../handler/admin/executor/SelectTableExecutor.java | 6 +++---
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
index 994b3ac4e05..51492b8ac68 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
@@ -73,9 +73,9 @@ public abstract class AbstractDatabaseMetaDataExecutor implements DatabaseAdminQ
Collection<String> databaseNames = getDatabaseNames(connectionSession);
for (String databaseName : databaseNames) {
initDatabaseData(databaseName);
- getSourceData(databaseName, resultSet -> handleResultSet(databaseName, resultSet));
+ processMetaData(databaseName, resultSet -> handleResultSet(databaseName, resultSet));
}
- createPreProcessing();
+ postProcess();
queryResultMetaData = createQueryResultMetaData();
mergedResult = createMergedResult();
}
@@ -90,7 +90,7 @@ public abstract class AbstractDatabaseMetaDataExecutor implements DatabaseAdminQ
aliasMap.put(metaData.getColumnName(i), metaData.getColumnLabel(i));
rowMap.put(metaData.getColumnLabel(i), resultSet.getString(i));
}
- rowPostProcessing(databaseName, rowMap, aliasMap);
+ preProcess(databaseName, rowMap, aliasMap);
if (!rowMap.isEmpty()) {
rows.add(rowMap);
}
@@ -106,11 +106,11 @@ public abstract class AbstractDatabaseMetaDataExecutor implements DatabaseAdminQ
protected abstract Collection<String> getDatabaseNames(ConnectionSession connectionSession);
- protected abstract void createPreProcessing();
+ protected abstract void preProcess(String databaseName, Map<String, Object> rows, Map<String, String> alias);
- protected abstract void getSourceData(String databaseName, Consumer<ResultSet> callback) throws SQLException;
+ protected abstract void postProcess();
- protected abstract void rowPostProcessing(String databaseName, Map<String, Object> rowMap, Map<String, String> aliasMap);
+ protected abstract void processMetaData(String databaseName, Consumer<ResultSet> callback) throws SQLException;
private MergedResult createMergedResult() {
List<MemoryQueryResultDataRow> resultDataRows = rows.stream().map(each -> new MemoryQueryResultDataRow(new LinkedList<>(each.values()))).collect(Collectors.toList());
@@ -159,7 +159,7 @@ public abstract class AbstractDatabaseMetaDataExecutor implements DatabaseAdminQ
}
@Override
- protected void getSourceData(final String databaseName, final Consumer<ResultSet> callback) throws SQLException {
+ protected void processMetaData(final String databaseName, final Consumer<ResultSet> callback) throws SQLException {
ShardingSphereResourceMetaData resourceMetaData = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData();
Optional<Entry<String, DataSource>> dataSourceEntry = resourceMetaData.getDataSources().entrySet().stream().findFirst();
if (!dataSourceEntry.isPresent()) {
@@ -178,11 +178,11 @@ public abstract class AbstractDatabaseMetaDataExecutor implements DatabaseAdminQ
}
@Override
- protected void rowPostProcessing(final String databaseName, final Map<String, Object> rowMap, final Map<String, String> aliasMap) {
+ protected void preProcess(final String databaseName, final Map<String, Object> rows, final Map<String, String> alias) {
}
@Override
- protected void createPreProcessing() {
+ protected void postProcess() {
}
}
}
diff --git a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutor.java b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutor.java
index cea058ebcd7..4e09f860f79 100644
--- a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutor.java
+++ b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutor.java
@@ -68,7 +68,7 @@ public final class SelectInformationSchemataExecutor extends DefaultDatabaseMeta
}
@Override
- protected void createPreProcessing() {
+ protected void postProcess() {
removeDuplicatedRow();
}
@@ -93,16 +93,16 @@ public final class SelectInformationSchemataExecutor extends DefaultDatabaseMeta
}
@Override
- protected void rowPostProcessing(final String databaseName, final Map<String, Object> rowMap, final Map<String, String> aliasMap) {
+ protected void preProcess(final String databaseName, final Map<String, Object> rows, final Map<String, String> alias) {
ShardingSphereResourceMetaData resourceMetaData = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData();
Collection<String> catalogs = resourceMetaData.getDataSources().keySet().stream().map(each -> resourceMetaData.getDataSourceMetaData(each).getCatalog()).collect(Collectors.toSet());
- schemaNameAlias = aliasMap.getOrDefault(SCHEMA_NAME, "");
- String rowValue = rowMap.getOrDefault(schemaNameAlias, "").toString();
+ schemaNameAlias = alias.getOrDefault(SCHEMA_NAME, "");
+ String rowValue = rows.getOrDefault(schemaNameAlias, "").toString();
queryDatabase = !rowValue.isEmpty();
if (catalogs.contains(rowValue)) {
- rowMap.replace(schemaNameAlias, databaseName);
+ rows.replace(schemaNameAlias, databaseName);
} else {
- rowMap.clear();
+ rows.clear();
}
}
diff --git a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectDatabaseExecutor.java b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectDatabaseExecutor.java
index 1787e711eb7..369d8117e9e 100644
--- a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectDatabaseExecutor.java
+++ b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectDatabaseExecutor.java
@@ -60,7 +60,7 @@ public final class SelectDatabaseExecutor extends DefaultDatabaseMetaDataExecuto
}
@Override
- protected void createPreProcessing() {
+ protected void postProcess() {
removeDuplicatedRow();
addDefaultRow();
}
@@ -85,17 +85,17 @@ public final class SelectDatabaseExecutor extends DefaultDatabaseMetaDataExecuto
}
@Override
- protected void rowPostProcessing(final String databaseName, final Map<String, Object> rowMap, final Map<String, String> aliasMap) {
- buildColumnNames(aliasMap);
+ protected void preProcess(final String databaseName, final Map<String, Object> rows, final Map<String, String> alias) {
+ buildColumnNames(alias);
ShardingSphereResourceMetaData resourceMetaData = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData();
Collection<String> catalogs = resourceMetaData.getDataSources().keySet().stream().map(each -> resourceMetaData.getDataSourceMetaData(each).getCatalog()).collect(Collectors.toSet());
- databaseNameAlias = aliasMap.getOrDefault(DATABASE_NAME, aliasMap.getOrDefault(DATNAME, aliasMap.getOrDefault(NAME, "")));
- String rowValue = rowMap.getOrDefault(databaseNameAlias, "").toString();
+ databaseNameAlias = alias.getOrDefault(DATABASE_NAME, alias.getOrDefault(DATNAME, alias.getOrDefault(NAME, "")));
+ String rowValue = rows.getOrDefault(databaseNameAlias, "").toString();
isQueryDatabase = !rowValue.isEmpty();
if (catalogs.contains(rowValue)) {
- rowMap.replace(databaseNameAlias, databaseName);
+ rows.replace(databaseNameAlias, databaseName);
} else {
- rowMap.clear();
+ rows.clear();
}
}
diff --git a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectTableExecutor.java b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectTableExecutor.java
index ffd8187a4bc..0b6644317b9 100644
--- a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectTableExecutor.java
+++ b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectTableExecutor.java
@@ -66,14 +66,14 @@ public final class SelectTableExecutor extends DefaultDatabaseMetaDataExecutor {
}
@Override
- protected void rowPostProcessing(final String databaseName, final Map<String, Object> rowMap, final Map<String, String> aliasMap) {
+ protected void preProcess(final String databaseName, final Map<String, Object> rows, final Map<String, String> alias) {
if (actualTableName.isEmpty()) {
- actualTableName = aliasMap.getOrDefault(REL_NAME, aliasMap.getOrDefault(TABLE_NAME, aliasMap.getOrDefault(NAME, aliasMap.getOrDefault(REF_NAME, ""))));
+ actualTableName = alias.getOrDefault(REL_NAME, alias.getOrDefault(TABLE_NAME, alias.getOrDefault(NAME, alias.getOrDefault(REF_NAME, ""))));
}
}
@Override
- protected void createPreProcessing() {
+ protected void postProcess() {
if (actualTableName.isEmpty()) {
return;
}