You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/03/15 23:18:44 UTC
[shardingsphere] branch master updated: Revise #9658 (#9678)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 053baf3 Revise #9658 (#9678)
053baf3 is described below
commit 053baf3c348d9eb7713716f6be0732eed590259c
Author: Liang Zhang <te...@163.com>
AuthorDate: Tue Mar 16 07:17:59 2021 +0800
Revise #9658 (#9678)
---
.../loader/dialect/MySQLTableMetaDataLoader.java | 39 +++++++++++-----------
.../infra/metadata/schema/model/TableMetaData.java | 4 +--
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoader.java
index feae161..b17acf0 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoader.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect;
-import com.google.common.collect.Lists;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.DataTypeLoader;
import org.apache.shardingsphere.infra.metadata.schema.builder.spi.DialectTableMetaDataLoader;
import org.apache.shardingsphere.infra.metadata.schema.model.ColumnMetaData;
@@ -45,9 +44,9 @@ public final class MySQLTableMetaDataLoader implements DialectTableMetaDataLoade
private static final String BASIC_TABLE_META_DATA_SQL = "SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE, COLUMN_KEY, EXTRA, COLLATION_NAME FROM information_schema.columns WHERE TABLE_SCHEMA=?";
private static final String TABLE_META_DATA_SQL_WITH_EXISTED_TABLES = BASIC_TABLE_META_DATA_SQL + " AND TABLE_NAME NOT IN (%s)";
-
+
private static final String BASIC_INDEX_META_DATA_SQL = "SELECT INDEX_NAME FROM information_schema.statistics WHERE TABLE_SCHEMA=?";
-
+
@Override
public Map<String, TableMetaData> load(final DataSource dataSource, final Collection<String> existedTables) throws SQLException {
return loadTableMetaDataMap(dataSource, existedTables);
@@ -60,23 +59,7 @@ public final class MySQLTableMetaDataLoader implements DialectTableMetaDataLoade
}
return result;
}
-
- private Collection<IndexMetaData> loadIndexMetaData(final DataSource dataSource, final String tableName) throws SQLException {
- Collection<IndexMetaData> result = Lists.newLinkedList();
- try (
- Connection connection = dataSource.getConnection();
- PreparedStatement preparedStatement = connection.prepareStatement(BASIC_INDEX_META_DATA_SQL)) {
- preparedStatement.setString(1, tableName);
- try (ResultSet resultSet = preparedStatement.executeQuery()) {
- while (resultSet.next()) {
- String indexName = resultSet.getString("INDEX_NAME");
- result.add(new IndexMetaData(indexName));
- }
- }
- }
- return result;
- }
-
+
private Map<String, Collection<ColumnMetaData>> loadColumnMetaDataMap(final DataSource dataSource, final Collection<String> existedTables) throws SQLException {
Map<String, Collection<ColumnMetaData>> result = new HashMap<>();
try (
@@ -113,6 +96,22 @@ public final class MySQLTableMetaDataLoader implements DialectTableMetaDataLoade
: String.format(TABLE_META_DATA_SQL_WITH_EXISTED_TABLES, existedTables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
}
+ private Collection<IndexMetaData> loadIndexMetaData(final DataSource dataSource, final String tableName) throws SQLException {
+ Collection<IndexMetaData> result = new LinkedList<>();
+ try (
+ Connection connection = dataSource.getConnection();
+ PreparedStatement preparedStatement = connection.prepareStatement(BASIC_INDEX_META_DATA_SQL)) {
+ preparedStatement.setString(1, tableName);
+ try (ResultSet resultSet = preparedStatement.executeQuery()) {
+ while (resultSet.next()) {
+ String indexName = resultSet.getString("INDEX_NAME");
+ result.add(new IndexMetaData(indexName));
+ }
+ }
+ }
+ return result;
+ }
+
@Override
public String getDatabaseType() {
return "MySQL";
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaData.java
index 089424a..9438c3d 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaData.java
@@ -43,7 +43,7 @@ public final class TableMetaData {
@Getter(AccessLevel.NONE)
private final List<String> columnNames = new ArrayList<>();
-
+
private final List<String> primaryKeyColumns = new ArrayList<>();
public TableMetaData() {
@@ -85,8 +85,6 @@ public final class TableMetaData {
public ColumnMetaData getColumnMetaData(final int columnIndex) {
return columns.get(columnNames.get(columnIndex));
}
-
-
/**
* Find index of column.