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 2021/03/17 05:08:33 UTC
[shardingsphere] branch master updated: sss (#9687)
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 246ec6a sss (#9687)
246ec6a is described below
commit 246ec6ae30cd2f31082f866f4eaee701e623d23a
Author: wordKuaiLei <40...@users.noreply.github.com>
AuthorDate: Wed Mar 17 13:08:04 2021 +0800
sss (#9687)
Co-authored-by: Yuankai.Pan <yu...@merculet.cn>
---
.../loader/dialect/MySQLTableMetaDataLoader.java | 79 +++++++++++++---------
.../dialect/MySQLTableMetaDataLoaderTest.java | 23 ++++---
2 files changed, 61 insertions(+), 41 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 b17acf0..0618ae3 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,6 +17,7 @@
package org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect;
+import org.apache.commons.collections4.CollectionUtils;
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;
@@ -28,38 +29,63 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.Map;
import java.util.Collection;
-import java.util.HashMap;
import java.util.LinkedHashMap;
+import java.util.HashMap;
import java.util.LinkedList;
-import java.util.Map;
-import java.util.Map.Entry;
import java.util.stream.Collectors;
/**
* Table meta data loader for MySQL.
*/
public final class MySQLTableMetaDataLoader implements DialectTableMetaDataLoader {
-
+
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=?";
-
+
+ private static final String BASIC_INDEX_META_DATA_SQL = "SELECT TABLE_NAME, INDEX_NAME FROM information_schema.statistics WHERE TABLE_SCHEMA=? and TABLE_NAME IN (%s)";
+
+ private static final String SQL_WITH_EXISTED_TABLES = " AND TABLE_NAME NOT IN (%s)";
+
+ private static final String TABLE_META_DATA_SQL_WITH_EXISTED_TABLES = BASIC_TABLE_META_DATA_SQL + SQL_WITH_EXISTED_TABLES;
+
@Override
public Map<String, TableMetaData> load(final DataSource dataSource, final Collection<String> existedTables) throws SQLException {
return loadTableMetaDataMap(dataSource, existedTables);
}
-
+
private Map<String, TableMetaData> loadTableMetaDataMap(final DataSource dataSource, final Collection<String> existedTables) throws SQLException {
Map<String, TableMetaData> result = new LinkedHashMap<>();
- for (Entry<String, Collection<ColumnMetaData>> entry : loadColumnMetaDataMap(dataSource, existedTables).entrySet()) {
- result.put(entry.getKey(), new TableMetaData(entry.getValue(), loadIndexMetaData(dataSource, entry.getKey())));
+ Map<String, Collection<ColumnMetaData>> columnMetaDataMap = loadColumnMetaDataMap(dataSource, existedTables);
+ if (CollectionUtils.isNotEmpty(columnMetaDataMap.keySet())) {
+ Map<String, Collection<IndexMetaData>> indexMetaDataMap = loadIndexMetaData(dataSource, columnMetaDataMap.keySet(), existedTables);
+ for (Map.Entry<String, Collection<ColumnMetaData>> entry : columnMetaDataMap.entrySet()) {
+ result.put(entry.getKey(), new TableMetaData(entry.getValue(), indexMetaDataMap.get(entry.getKey())));
+ }
+ }
+ return result;
+ }
+
+ private Map<String, Collection<IndexMetaData>> loadIndexMetaData(final DataSource dataSource, final Collection<String> tableNames, final Collection<String> existedTables) throws SQLException {
+ Map<String, Collection<IndexMetaData>> result = new HashMap<>();
+ try (
+ Connection connection = dataSource.getConnection();
+ PreparedStatement preparedStatement = connection.prepareStatement(getIndexMetaDataSQL(tableNames, existedTables))) {
+ preparedStatement.setString(1, connection.getCatalog());
+ try (ResultSet resultSet = preparedStatement.executeQuery()) {
+ while (resultSet.next()) {
+ String indexName = resultSet.getString("INDEX_NAME");
+ String tableName = resultSet.getString("TABLE_NAME");
+ if (!result.containsKey(tableName)) {
+ result.put(tableName, new LinkedList<>());
+ }
+ result.get(tableName).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 (
@@ -80,7 +106,7 @@ public final class MySQLTableMetaDataLoader implements DialectTableMetaDataLoade
}
return result;
}
-
+
private ColumnMetaData loadColumnMetaData(final Map<String, Integer> dataTypeMap, final ResultSet resultSet) throws SQLException {
String columnName = resultSet.getString("COLUMN_NAME");
String dataType = resultSet.getString("DATA_TYPE");
@@ -90,30 +116,21 @@ public final class MySQLTableMetaDataLoader implements DialectTableMetaDataLoade
boolean caseSensitive = null != collationName && collationName.endsWith("_ci");
return new ColumnMetaData(columnName, dataTypeMap.get(dataType), primaryKey, generated, caseSensitive);
}
-
+
private String getTableMetaDataSQL(final Collection<String> existedTables) {
return existedTables.isEmpty() ? BASIC_TABLE_META_DATA_SQL
: 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;
+
+ private String getIndexMetaDataSQL(final Collection<String> tableNames, final Collection<String> existedTables) {
+ String sql = String.format(BASIC_INDEX_META_DATA_SQL, tableNames.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
+ return existedTables.isEmpty() ? sql
+ : sql + String.format(SQL_WITH_EXISTED_TABLES, existedTables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
}
-
+
@Override
public String getDatabaseType() {
return "MySQL";
}
}
+
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoaderTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoaderTest.java
index 995fc74..42fb049 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoaderTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoaderTest.java
@@ -38,12 +38,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public final class MySQLTableMetaDataLoaderTest {
-
+
@BeforeClass
public static void setUp() {
ShardingSphereServiceLoader.register(DialectTableMetaDataLoader.class);
}
-
+
@Test
public void assertLoadWithoutExistedTables() throws SQLException {
DataSource dataSource = mockDataSource();
@@ -52,10 +52,10 @@ public final class MySQLTableMetaDataLoaderTest {
"SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE, COLUMN_KEY, EXTRA, COLLATION_NAME FROM information_schema.columns WHERE TABLE_SCHEMA=?").executeQuery()).thenReturn(resultSet);
ResultSet indexResultSet = mockIndexMetaDataResultSet();
when(dataSource.getConnection().prepareStatement(
- "SELECT INDEX_NAME FROM information_schema.statistics WHERE TABLE_SCHEMA=?").executeQuery()).thenReturn(indexResultSet);
+ "SELECT TABLE_NAME, INDEX_NAME FROM information_schema.statistics WHERE TABLE_SCHEMA=? and TABLE_NAME IN ('tbl')").executeQuery()).thenReturn(indexResultSet);
assertTableMetaDataMap(getTableMetaDataLoader().load(dataSource, Collections.emptyList()));
}
-
+
@Test
public void assertLoadWithExistedTables() throws SQLException {
DataSource dataSource = mockDataSource();
@@ -65,17 +65,18 @@ public final class MySQLTableMetaDataLoaderTest {
.executeQuery()).thenReturn(resultSet);
ResultSet indexResultSet = mockIndexMetaDataResultSet();
when(dataSource.getConnection().prepareStatement(
- "SELECT INDEX_NAME FROM information_schema.statistics WHERE TABLE_SCHEMA=?").executeQuery()).thenReturn(indexResultSet);
+ "SELECT TABLE_NAME, INDEX_NAME FROM information_schema.statistics WHERE TABLE_SCHEMA=? and TABLE_NAME IN ('tbl') AND TABLE_NAME NOT IN ('existed_tbl')")
+ .executeQuery()).thenReturn(indexResultSet);
assertTableMetaDataMap(getTableMetaDataLoader().load(dataSource, Collections.singletonList("existed_tbl")));
}
-
+
private DataSource mockDataSource() throws SQLException {
DataSource result = mock(DataSource.class, RETURNS_DEEP_STUBS);
ResultSet typeInfoResultSet = mockTypeInfoResultSet();
when(result.getConnection().getMetaData().getTypeInfo()).thenReturn(typeInfoResultSet);
return result;
}
-
+
private ResultSet mockTypeInfoResultSet() throws SQLException {
ResultSet result = mock(ResultSet.class);
when(result.next()).thenReturn(true, true, false);
@@ -83,7 +84,7 @@ public final class MySQLTableMetaDataLoaderTest {
when(result.getInt("DATA_TYPE")).thenReturn(4, 12);
return result;
}
-
+
private ResultSet mockTableMetaDataResultSet() throws SQLException {
ResultSet result = mock(ResultSet.class);
when(result.next()).thenReturn(true, true, false);
@@ -100,9 +101,10 @@ public final class MySQLTableMetaDataLoaderTest {
ResultSet result = mock(ResultSet.class);
when(result.next()).thenReturn(true, false);
when(result.getString("INDEX_NAME")).thenReturn("id");
+ when(result.getString("TABLE_NAME")).thenReturn("tbl");
return result;
}
-
+
private DialectTableMetaDataLoader getTableMetaDataLoader() {
for (DialectTableMetaDataLoader each : ShardingSphereServiceLoader.newServiceInstances(DialectTableMetaDataLoader.class)) {
if ("MySQL".equals(each.getDatabaseType())) {
@@ -111,7 +113,7 @@ public final class MySQLTableMetaDataLoaderTest {
}
throw new IllegalStateException("Can not find MySQLTableMetaDataLoader");
}
-
+
private void assertTableMetaDataMap(final Map<String, TableMetaData> actual) {
assertThat(actual.size(), is(1));
assertThat(actual.get("tbl").getColumns().size(), is(2));
@@ -121,3 +123,4 @@ public final class MySQLTableMetaDataLoaderTest {
assertThat(actual.get("tbl").getIndexes().get("id"), is(new IndexMetaData("id")));
}
}
+