This is an automated email from the ASF dual-hosted git repository.
panjuan 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 858977bee56 Add DatabaseNameUtils (#29765)
858977bee56 is described below
commit 858977bee56c01a519c834c6f8ebee4e468515d0
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 18 18:19:08 2024 +0800
Add DatabaseNameUtils (#29765)
---
.../handler/DatabaseRequiredBackendHandler.java | 13 ++----
.../distsql/ral/QueryableRALBackendHandler.java | 13 ++----
.../handler/distsql/rdl/RDLBackendHandler.java | 15 ++-----
.../handler/distsql/rql/RQLBackendHandler.java | 11 +-----
.../proxy/backend/util/DatabaseNameUtils.java | 46 ++++++++++++++++++++++
5 files changed, 58 insertions(+), 40 deletions(-)
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/DatabaseRequiredBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/DatabaseRequiredBackendHandler.java
index 2ea60ef5d12..9113eaa028e 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/DatabaseRequiredBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/DatabaseRequiredBackendHandler.java
@@ -19,19 +19,17 @@ package org.apache.shardingsphere.proxy.backend.handler;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException;
import
org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException;
-import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandler;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
+import org.apache.shardingsphere.proxy.backend.util.DatabaseNameUtils;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
-import
org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable;
import java.sql.SQLException;
-import java.util.Optional;
/**
* Database required backend handler.
@@ -48,18 +46,13 @@ public abstract class DatabaseRequiredBackendHandler<T
extends SQLStatement> imp
@Override
public final ResponseHeader execute() throws SQLException {
- String databaseName = getDatabaseName(connectionSession, sqlStatement);
+ String databaseName = DatabaseNameUtils.getDatabaseName(sqlStatement,
connectionSession);
checkDatabaseName(databaseName);
return execute(databaseName, sqlStatement);
}
protected abstract ResponseHeader execute(String databaseName, T
sqlStatement);
- private String getDatabaseName(final ConnectionSession connectionSession,
final T sqlStatement) {
- Optional<DatabaseSegment> databaseSegment = sqlStatement instanceof
FromDatabaseAvailable ? ((FromDatabaseAvailable) sqlStatement).getDatabase() :
Optional.empty();
- return databaseSegment.isPresent() ?
databaseSegment.get().getIdentifier().getValue() :
connectionSession.getDatabaseName();
- }
-
private void checkDatabaseName(final String databaseName) {
ShardingSpherePreconditions.checkNotNull(databaseName,
NoDatabaseSelectedException::new);
ShardingSpherePreconditions.checkState(ProxyContext.getInstance().databaseExists(databaseName),
() -> new UnknownDatabaseException(databaseName));
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandler.java
index 7b0b29e25bb..cb8d485824e 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandler.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral;
+import
org.apache.shardingsphere.distsql.handler.type.ral.query.ConnectionSizeAwareQueryableRALExecutor;
import
org.apache.shardingsphere.distsql.handler.type.ral.query.DatabaseAwareQueryableRALExecutor;
import
org.apache.shardingsphere.distsql.handler.type.ral.query.InstanceContextAwareQueryableRALExecutor;
import
org.apache.shardingsphere.distsql.handler.type.ral.query.QueryableRALExecutor;
@@ -26,22 +27,19 @@ import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedRe
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import
org.apache.shardingsphere.distsql.handler.type.ral.query.ConnectionSizeAwareQueryableRALExecutor;
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseCell;
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
-import
org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable;
+import org.apache.shardingsphere.proxy.backend.util.DatabaseNameUtils;
import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -79,7 +77,7 @@ public final class QueryableRALBackendHandler<T extends
QueryableRALStatement> i
((InstanceContextAwareQueryableRALExecutor<T>)
executor).setInstanceContext(ProxyContext.getInstance().getContextManager().getInstanceContext());
}
if (executor instanceof DatabaseAwareQueryableRALExecutor) {
- ((DatabaseAwareQueryableRALExecutor<T>)
executor).setCurrentDatabase(ProxyContext.getInstance().getDatabase(getDatabaseName(connectionSession,
sqlStatement)));
+ ((DatabaseAwareQueryableRALExecutor<T>)
executor).setCurrentDatabase(ProxyContext.getInstance().getDatabase(DatabaseNameUtils.getDatabaseName(sqlStatement,
connectionSession)));
}
if (executor instanceof ConnectionSizeAwareQueryableRALExecutor) {
((ConnectionSizeAwareQueryableRALExecutor<T>)
executor).setConnectionSize(connectionSession.getDatabaseConnectionManager().getConnectionSize());
@@ -95,11 +93,6 @@ public final class QueryableRALBackendHandler<T extends
QueryableRALStatement> i
return new LocalDataMergedResult(rows);
}
- private String getDatabaseName(final ConnectionSession connectionSession,
final T sqlStatement) {
- Optional<DatabaseSegment> databaseSegment = sqlStatement instanceof
FromDatabaseAvailable ? ((FromDatabaseAvailable) sqlStatement).getDatabase() :
Optional.empty();
- return databaseSegment.isPresent() ?
databaseSegment.get().getIdentifier().getValue() :
connectionSession.getDatabaseName();
- }
-
@Override
public boolean next() throws SQLException {
return null != mergedResult && mergedResult.next();
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandler.java
index 8c8d2e50c60..12e3b8dd7ae 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandler.java
@@ -19,19 +19,17 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException;
-import
org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException;
import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
+import
org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException;
+import
org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandler;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
-import
org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable;
+import org.apache.shardingsphere.proxy.backend.util.DatabaseNameUtils;
import java.sql.SQLException;
-import java.util.Optional;
/**
* RDL backend handler.
@@ -48,18 +46,13 @@ public abstract class RDLBackendHandler<T extends
RDLStatement> implements DistS
@Override
public final ResponseHeader execute() throws SQLException {
- String databaseName = getDatabaseName(connectionSession, sqlStatement);
+ String databaseName = DatabaseNameUtils.getDatabaseName(sqlStatement,
connectionSession);
checkDatabaseName(databaseName);
return execute(databaseName, sqlStatement);
}
protected abstract ResponseHeader execute(String databaseName, T
sqlStatement);
- private String getDatabaseName(final ConnectionSession connectionSession,
final T sqlStatement) {
- Optional<DatabaseSegment> databaseSegment = sqlStatement instanceof
FromDatabaseAvailable ? ((FromDatabaseAvailable) sqlStatement).getDatabase() :
Optional.empty();
- return databaseSegment.isPresent() ?
databaseSegment.get().getIdentifier().getValue() :
connectionSession.getDatabaseName();
- }
-
private void checkDatabaseName(final String databaseName) {
ShardingSpherePreconditions.checkNotNull(databaseName,
NoDatabaseSelectedException::new);
ShardingSpherePreconditions.checkState(ProxyContext.getInstance().databaseExists(databaseName),
() -> new UnknownDatabaseException(databaseName));
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java
index ba0bd2e0e31..197a400807a 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java
@@ -33,15 +33,13 @@ import
org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
-import
org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable;
+import org.apache.shardingsphere.proxy.backend.util.DatabaseNameUtils;
import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -66,15 +64,10 @@ public final class RQLBackendHandler<T extends
RQLStatement> implements DistSQLB
public ResponseHeader execute() throws SQLException {
RQLExecutor executor = TypedSPILoader.getService(RQLExecutor.class,
sqlStatement.getClass());
queryHeaders = createQueryHeader(executor.getColumnNames());
- mergedResult =
createMergedResult(executor.getRows(ProxyContext.getInstance().getDatabase(getDatabaseName()),
sqlStatement));
+ mergedResult =
createMergedResult(executor.getRows(ProxyContext.getInstance().getDatabase(DatabaseNameUtils.getDatabaseName(sqlStatement,
connectionSession)), sqlStatement));
return new QueryResponseHeader(queryHeaders);
}
- private String getDatabaseName() {
- Optional<DatabaseSegment> databaseSegment = sqlStatement instanceof
FromDatabaseAvailable ? ((FromDatabaseAvailable) sqlStatement).getDatabase() :
Optional.empty();
- return databaseSegment.isPresent() ?
databaseSegment.get().getIdentifier().getValue() :
connectionSession.getDatabaseName();
- }
-
private List<QueryHeader> createQueryHeader(final Collection<String>
columnNames) {
return columnNames.stream().map(each -> new QueryHeader("", "", each,
each, Types.CHAR, "CHAR", 255, 0, false, false, false,
false)).collect(Collectors.toList());
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseNameUtils.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseNameUtils.java
new file mode 100644
index 00000000000..0aaf40d70da
--- /dev/null
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseNameUtils.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.proxy.backend.util;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
+import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+import
org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable;
+
+import java.util.Optional;
+
+/**
+ * Database name utility class.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class DatabaseNameUtils {
+
+ /**
+ * Get database name.
+ *
+ * @param sqlStatement SQL statement
+ * @param connectionSession connection session
+ * @return database name
+ */
+ public static String getDatabaseName(final SQLStatement sqlStatement,
final ConnectionSession connectionSession) {
+ Optional<DatabaseSegment> databaseSegment = sqlStatement instanceof
FromDatabaseAvailable ? ((FromDatabaseAvailable) sqlStatement).getDatabase() :
Optional.empty();
+ return databaseSegment.map(optional ->
optional.getIdentifier().getValue()).orElse(connectionSession.getDatabaseName());
+ }
+}
