You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/05/06 14:38:18 UTC
[shardingsphere] branch master updated: Rename SchemaRequiredBackendHandler to DatabaseRequiredBackendHandler. (#17397)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 fc0a13efc16 Rename SchemaRequiredBackendHandler to DatabaseRequiredBackendHandler. (#17397)
fc0a13efc16 is described below
commit fc0a13efc169a5acbb664a33b02834a5eeb54737
Author: yx9o <ya...@163.com>
AuthorDate: Fri May 6 22:38:04 2022 +0800
Rename SchemaRequiredBackendHandler to DatabaseRequiredBackendHandler. (#17397)
* Rename SchemaRequiredBackendHandler to DatabaseRequiredBackendHandler.
* Update.
---
...BackendHandler.java => DatabaseRequiredBackendHandler.java} | 10 +++++-----
.../ral/scaling/query/QueryableScalingRALBackendHandler.java | 10 +++++-----
.../text/distsql/rdl/resource/AddResourceBackendHandler.java | 4 ++--
.../text/distsql/rdl/resource/AlterResourceBackendHandler.java | 4 ++--
.../text/distsql/rdl/resource/DropResourceBackendHandler.java | 4 ++--
.../text/distsql/rdl/rule/RuleDefinitionBackendHandler.java | 6 +++---
.../proxy/backend/text/distsql/rql/RQLBackendHandler.java | 10 +++++-----
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/SchemaRequiredBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/DatabaseRequiredBackendHandler.java
similarity index 91%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/SchemaRequiredBackendHandler.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/DatabaseRequiredBackendHandler.java
index ac65027fddb..66f0bce3515 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/SchemaRequiredBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/DatabaseRequiredBackendHandler.java
@@ -32,13 +32,13 @@ import java.sql.SQLException;
import java.util.Optional;
/**
- * Schema required backend handler.
- *
+ * Database required backend handler.
+ *
* @param <T> type of SQL statement
*/
@RequiredArgsConstructor
@Getter
-public abstract class SchemaRequiredBackendHandler<T extends SQLStatement> implements TextProtocolBackendHandler {
+public abstract class DatabaseRequiredBackendHandler<T extends SQLStatement> implements TextProtocolBackendHandler {
private final T sqlStatement;
@@ -47,7 +47,7 @@ public abstract class SchemaRequiredBackendHandler<T extends SQLStatement> imple
@Override
public final ResponseHeader execute() throws SQLException {
String databaseName = getDatabaseName(connectionSession, sqlStatement);
- checkDatabase(databaseName);
+ checkDatabaseName(databaseName);
return execute(databaseName, sqlStatement);
}
@@ -58,7 +58,7 @@ public abstract class SchemaRequiredBackendHandler<T extends SQLStatement> imple
return schemaFromSQL.isPresent() ? schemaFromSQL.get().getIdentifier().getValue() : connectionSession.getDatabaseName();
}
- private void checkDatabase(final String databaseName) {
+ private void checkDatabaseName(final String databaseName) {
if (null == databaseName) {
throw new NoDatabaseSelectedException();
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/scaling/query/QueryableScalingRALBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/scaling/query/QueryableScalingRALBackendHandler.java
index e1fc82744ff..351e40d51cd 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/scaling/query/QueryableScalingRALBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/scaling/query/QueryableScalingRALBackendHandler.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.SchemaRequiredBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.DatabaseRequiredBackendHandler;
import java.sql.Types;
import java.util.ArrayList;
@@ -34,7 +34,7 @@ import java.util.List;
/**
* Queryable scaling RAL backend handler.
*/
-public final class QueryableScalingRALBackendHandler extends SchemaRequiredBackendHandler<RALStatement> {
+public final class QueryableScalingRALBackendHandler extends DatabaseRequiredBackendHandler<RALStatement> {
private final DistSQLResultSet resultSet;
@@ -44,11 +44,11 @@ public final class QueryableScalingRALBackendHandler extends SchemaRequiredBacke
}
@Override
- protected ResponseHeader execute(final String schemaName, final RALStatement sqlStatement) {
- resultSet.init(ProxyContext.getInstance().getMetaData(schemaName), sqlStatement);
+ protected ResponseHeader execute(final String databaseName, final RALStatement sqlStatement) {
+ resultSet.init(ProxyContext.getInstance().getMetaData(databaseName), sqlStatement);
List<QueryHeader> queryHeaders = new ArrayList<>();
for (String each : resultSet.getColumnNames()) {
- queryHeaders.add(new QueryHeader(schemaName, "", each, each, Types.CHAR, "CHAR", 255, 0, false, false, false, false));
+ queryHeaders.add(new QueryHeader(databaseName, "", each, each, Types.CHAR, "CHAR", 255, 0, false, false, false, false));
}
return new QueryResponseHeader(queryHeaders);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AddResourceBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AddResourceBackendHandler.java
index 0857f7304ec..0dde57d51b2 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AddResourceBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AddResourceBackendHandler.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.SchemaRequiredBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.DatabaseRequiredBackendHandler;
import java.util.ArrayList;
import java.util.Collection;
@@ -42,7 +42,7 @@ import java.util.Map;
* Add resource backend handler.
*/
@Slf4j
-public final class AddResourceBackendHandler extends SchemaRequiredBackendHandler<AddResourceStatement> {
+public final class AddResourceBackendHandler extends DatabaseRequiredBackendHandler<AddResourceStatement> {
private final DatabaseType databaseType;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AlterResourceBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AlterResourceBackendHandler.java
index aaca0d88123..d0a2923f1c5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AlterResourceBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AlterResourceBackendHandler.java
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.SchemaRequiredBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.DatabaseRequiredBackendHandler;
import javax.sql.DataSource;
import java.util.Collection;
@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
* Alter resource backend handler.
*/
@Slf4j
-public final class AlterResourceBackendHandler extends SchemaRequiredBackendHandler<AlterResourceStatement> {
+public final class AlterResourceBackendHandler extends DatabaseRequiredBackendHandler<AlterResourceStatement> {
private final DatabaseType databaseType;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
index f54ac59a9d6..ac9362dcca2 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.SchemaRequiredBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.DatabaseRequiredBackendHandler;
import org.apache.shardingsphere.singletable.rule.SingleTableRule;
import javax.sql.DataSource;
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
/**
* Drop resource backend handler.
*/
-public final class DropResourceBackendHandler extends SchemaRequiredBackendHandler<DropResourceStatement> {
+public final class DropResourceBackendHandler extends DatabaseRequiredBackendHandler<DropResourceStatement> {
public DropResourceBackendHandler(final DropResourceStatement sqlStatement, final ConnectionSession connectionSession) {
super(sqlStatement, connectionSession);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
index c4bfcdf5349..c49d0a4249e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
@@ -38,7 +38,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.SchemaRequiredBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.DatabaseRequiredBackendHandler;
import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterDefaultShardingStrategyStatement;
import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingAlgorithmStatement;
import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingBindingTableRulesStatement;
@@ -57,7 +57,7 @@ import java.util.Set;
* @param <T> type of SQL statement
*/
@Slf4j
-public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatement> extends SchemaRequiredBackendHandler<T> {
+public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatement> extends DatabaseRequiredBackendHandler<T> {
private static final Set<String> RULE_ALTERED_ACTION_LIST = Sets.newHashSet(AlterShardingTableRuleStatement.class.getName(), AlterShardingAlgorithmStatement.class.getName(),
AlterDefaultShardingStrategyStatement.class.getName(), AlterShardingBindingTableRulesStatement.class.getName(), AlterShardingBroadcastTableRulesStatement.class.getName());
@@ -146,7 +146,7 @@ public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatemen
if (metaDataPersistService.isPresent()) {
Optional<String> newVersion = metaDataPersistService.get().getDatabaseVersionPersistService().createNewVersion(shardingSphereMetaData.getDatabaseName());
if (!newVersion.isPresent()) {
- throw new RuntimeException(String.format("Unable to get a new version for schema: %s", shardingSphereMetaData.getDatabaseName()));
+ throw new RuntimeException(String.format("Unable to get a new version for database: %s", shardingSphereMetaData.getDatabaseName()));
}
metaDataPersistService.get().getDatabaseRulePersistService().persist(shardingSphereMetaData.getDatabaseName(), newVersion.get(),
buildAlteredRuleConfigurations(shardingSphereMetaData, sqlStatement, updater, currentRuleConfig, preprocessor));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RQLBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RQLBackendHandler.java
index 4d20b8a6be9..5f1f0dab46a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RQLBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RQLBackendHandler.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.SchemaRequiredBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.DatabaseRequiredBackendHandler;
import java.sql.Types;
import java.util.Collection;
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
/**
* RQL backend handler.
*/
-public final class RQLBackendHandler extends SchemaRequiredBackendHandler<RQLStatement> {
+public final class RQLBackendHandler extends DatabaseRequiredBackendHandler<RQLStatement> {
private final DistSQLResultSet resultSet;
@@ -44,10 +44,10 @@ public final class RQLBackendHandler extends SchemaRequiredBackendHandler<RQLSta
}
@Override
- protected ResponseHeader execute(final String schemaName, final RQLStatement sqlStatement) {
- resultSet.init(ProxyContext.getInstance().getMetaData(schemaName), sqlStatement);
+ protected ResponseHeader execute(final String databaseName, final RQLStatement sqlStatement) {
+ resultSet.init(ProxyContext.getInstance().getMetaData(databaseName), sqlStatement);
List<QueryHeader> queryHeaders = resultSet.getColumnNames().stream()
- .map(each -> new QueryHeader(schemaName, "", each, each, Types.CHAR, "CHAR", 255, 0, false, false, false, false)).collect(Collectors.toList());
+ .map(each -> new QueryHeader(databaseName, "", each, each, Types.CHAR, "CHAR", 255, 0, false, false, false, false)).collect(Collectors.toList());
return new QueryResponseHeader(queryHeaders);
}