This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 f41c35e28b0 Remove useless codes (#31389)
f41c35e28b0 is described below
commit f41c35e28b013936e2af2a305c615dc1afd1772c
Author: Liang Zhang <[email protected]>
AuthorDate: Sat May 25 18:38:14 2024 +0800
Remove useless codes (#31389)
* Remove DataSourceUnitPersistService.deleteConfigurations
* Add override on JDBCBackendDataSource
* Remove useless codes
* Remove useless codes
---
.../infra/rewrite/sql/token/pojo/Attachable.java | 7 -------
.../segment/generic/table/CollectionTableSegment.java | 9 ---------
.../dialect/statement/doris/segment/ACLAttributeEnum.java | 2 +-
.../dialect/statement/mysql/segment/ACLAttributeEnum.java | 2 +-
.../connector/jdbc/datasource/JDBCBackendDataSource.java | 12 +-----------
.../admin/executor/AbstractDatabaseMetaDataExecutor.java | 14 ++++----------
6 files changed, 7 insertions(+), 39 deletions(-)
diff --git
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/Attachable.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/Attachable.java
index d3b2ff424ce..d1882492f9e 100644
---
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/Attachable.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/Attachable.java
@@ -21,11 +21,4 @@ package
org.apache.shardingsphere.infra.rewrite.sql.token.pojo;
* Attach available.
*/
public interface Attachable {
-
- /**
- * Get start index.
- *
- * @return start index
- */
- int getStartIndex();
}
diff --git
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/generic/table/CollectionTableSegment.java
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/generic/table/CollectionTableSegment.java
index 88da1cfbc84..089e984c82f 100644
---
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/generic/table/CollectionTableSegment.java
+++
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/generic/table/CollectionTableSegment.java
@@ -45,15 +45,6 @@ public final class CollectionTableSegment implements
TableSegment {
return Optional.ofNullable(alias).map(AliasSegment::getIdentifier);
}
- /**
- * Get alias segment.
- *
- * @return alias segment
- */
- public Optional<AliasSegment> getAliasSegment() {
- return Optional.ofNullable(alias);
- }
-
@Override
public int getStartIndex() {
return expressionSegment.getStartIndex();
diff --git
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/doris/segment/ACLAttributeEnum.java
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/doris/segment/ACLAttributeEnum.java
index cbf7237eb41..5d6ce4623b6 100644
---
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/doris/segment/ACLAttributeEnum.java
+++
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/doris/segment/ACLAttributeEnum.java
@@ -19,5 +19,5 @@ package
org.apache.shardingsphere.sql.parser.sql.dialect.statement.doris.segment
public enum ACLAttributeEnum {
- UNCHANGED, DEFAULT, YES, NO
+ DEFAULT, YES, NO
}
diff --git
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/ACLAttributeEnum.java
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/ACLAttributeEnum.java
index 6540a7bc8bd..73ef9a897bd 100644
---
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/ACLAttributeEnum.java
+++
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/ACLAttributeEnum.java
@@ -19,5 +19,5 @@ package
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.segment
public enum ACLAttributeEnum {
- UNCHANGED, DEFAULT, YES, NO
+ DEFAULT, YES, NO
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
index 3231ba16e36..d473a8b3217 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
@@ -39,16 +39,7 @@ import java.util.List;
*/
public final class JDBCBackendDataSource implements BackendDataSource {
- /**
- * Get connections.
- *
- * @param databaseName database name
- * @param dataSourceName data source name
- * @param connectionSize size of connections
- * @param connectionMode connection mode
- * @return connections
- * @throws SQLException SQL exception
- */
+ @Override
public List<Connection> getConnections(final String databaseName, final
String dataSourceName, final int connectionSize, final ConnectionMode
connectionMode) throws SQLException {
return getConnections(databaseName, dataSourceName, connectionSize,
connectionMode,
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class).getDefaultType());
@@ -65,7 +56,6 @@ public final class JDBCBackendDataSource implements
BackendDataSource {
* @return connections
* @throws SQLException SQL exception
*/
- @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
public List<Connection> getConnections(final String databaseName, final
String dataSourceName,
final int connectionSize, final
ConnectionMode connectionMode, final TransactionType transactionType) throws
SQLException {
DataSource dataSource =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData()
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 b1884b4f2b4..6cc9f9b34e4 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
@@ -70,7 +70,6 @@ public abstract class AbstractDatabaseMetaDataExecutor
implements DatabaseAdminQ
public final void execute(final ConnectionSession connectionSession)
throws SQLException {
Collection<String> databaseNames = getDatabaseNames(connectionSession);
for (String databaseName : databaseNames) {
- initDatabaseData(databaseName);
processMetaData(databaseName, resultSet ->
handleResultSet(databaseName, resultSet));
}
postProcess();
@@ -82,9 +81,10 @@ public abstract class AbstractDatabaseMetaDataExecutor
implements DatabaseAdminQ
private void handleResultSet(final String databaseName, final ResultSet
resultSet) {
ResultSetMetaData metaData = resultSet.getMetaData();
while (resultSet.next()) {
- Map<String, Object> rowMap = new LinkedHashMap<>();
- Map<String, String> aliasMap = new LinkedHashMap<>();
- for (int i = 1; i < metaData.getColumnCount() + 1; i++) {
+ int columnCount = metaData.getColumnCount();
+ Map<String, Object> rowMap = new LinkedHashMap<>(columnCount, 1F);
+ Map<String, String> aliasMap = new LinkedHashMap<>(columnCount,
1F);
+ for (int i = 1; i < columnCount + 1; i++) {
aliasMap.put(metaData.getColumnName(i),
metaData.getColumnLabel(i));
rowMap.put(metaData.getColumnLabel(i), resultSet.getString(i));
}
@@ -100,8 +100,6 @@ public abstract class AbstractDatabaseMetaDataExecutor
implements DatabaseAdminQ
}
}
- protected abstract void initDatabaseData(String databaseName);
-
protected abstract Collection<String> getDatabaseNames(ConnectionSession
connectionSession);
protected abstract void preProcess(String databaseName, Map<String,
Object> rows, Map<String, String> alias);
@@ -144,10 +142,6 @@ public abstract class AbstractDatabaseMetaDataExecutor
implements DatabaseAdminQ
private final List<Object> parameters;
- @Override
- protected void initDatabaseData(final String databaseName) {
- }
-
@Override
protected Collection<String> getDatabaseNames(final ConnectionSession
connectionSession) {
Optional<String> database =
ProxyContext.getInstance().getAllDatabaseNames().stream().filter(each ->
isAuthorized(each, connectionSession.getGrantee()))
