You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/10/12 11:51:47 UTC
[shardingsphere] branch master updated: Rename
MetaDataConnectionAdapter (#7762)
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 e76e724 Rename MetaDataConnectionAdapter (#7762)
e76e724 is described below
commit e76e7249ba9ef082ef4774a494926fc55e476725
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Oct 12 19:51:22 2020 +0800
Rename MetaDataConnectionAdapter (#7762)
---
...aConnection.java => MetaDataConnectionAdapter.java} | 4 ++--
.../metadata/database/schema/SchemaMetaDataLoader.java | 9 ++++-----
.../metadata/database/table/TableMetaDataLoader.java | 9 +++++----
...ionTest.java => MetaDataConnectionAdapterTest.java} | 18 +++++++++---------
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnection.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapter.java
similarity index 99%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnection.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapter.java
index 2384d1a..5b9b6e0 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnection.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapter.java
@@ -43,10 +43,10 @@ import java.util.Properties;
import java.util.concurrent.Executor;
/**
- * Meta data connection.
+ * Meta data connection adapter.
*/
@RequiredArgsConstructor
-public final class MetaDataConnection implements Connection {
+public final class MetaDataConnectionAdapter implements Connection {
private final String databaseType;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaMetaDataLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaMetaDataLoader.java
index 3d7a02a..99df10b 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaMetaDataLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaMetaDataLoader.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.metadata.database.schema;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.infra.metadata.database.MetaDataConnection;
+import org.apache.shardingsphere.infra.metadata.database.MetaDataConnectionAdapter;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -49,13 +49,13 @@ public final class SchemaMetaDataLoader {
* @param dataSource data source
* @param databaseType database type
* @param excludedTableNames excluded table names
- * @return Unconfigured table names
+ * @return unconfigured table names
* @throws SQLException SQL exception
*/
public static Collection<String> loadUnconfiguredTableNames(final DataSource dataSource, final String databaseType, final Collection<String> excludedTableNames) throws SQLException {
List<String> result;
- try (MetaDataConnection connection = new MetaDataConnection(databaseType, dataSource.getConnection())) {
- result = loadAllTableNames(connection);
+ try (MetaDataConnectionAdapter connectionAdapter = new MetaDataConnectionAdapter(databaseType, dataSource.getConnection())) {
+ result = loadAllTableNames(connectionAdapter);
result.removeAll(excludedTableNames);
}
log.info("Loading {} tables' meta data.", result.size());
@@ -81,5 +81,4 @@ public final class SchemaMetaDataLoader {
private static boolean isSystemTable(final String table) {
return table.contains("$") || table.contains("/");
}
-
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/table/TableMetaDataLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/table/TableMetaDataLoader.java
index 13cc26b..d97e429 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/table/TableMetaDataLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/table/TableMetaDataLoader.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.metadata.database.column.ColumnMetaDataLoader;
import org.apache.shardingsphere.infra.metadata.database.index.IndexMetaDataLoader;
-import org.apache.shardingsphere.infra.metadata.database.MetaDataConnection;
+import org.apache.shardingsphere.infra.metadata.database.MetaDataConnectionAdapter;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -45,9 +45,10 @@ public final class TableMetaDataLoader {
* @throws SQLException SQL exception
*/
public static Optional<TableMetaData> load(final DataSource dataSource, final String tableNamePattern, final String databaseType) throws SQLException {
- try (MetaDataConnection connection = new MetaDataConnection(databaseType, dataSource.getConnection())) {
- return isTableExist(connection, tableNamePattern)
- ? Optional.of(new TableMetaData(ColumnMetaDataLoader.load(connection, tableNamePattern, databaseType), IndexMetaDataLoader.load(connection, tableNamePattern))) : Optional.empty();
+ try (MetaDataConnectionAdapter connectionAdapter = new MetaDataConnectionAdapter(databaseType, dataSource.getConnection())) {
+ return isTableExist(connectionAdapter, tableNamePattern)
+ ? Optional.of(new TableMetaData(ColumnMetaDataLoader.load(connectionAdapter, tableNamePattern, databaseType), IndexMetaDataLoader.load(connectionAdapter, tableNamePattern)))
+ : Optional.empty();
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapterTest.java
similarity index 74%
rename from shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionTest.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapterTest.java
index 9609aa2..93583ac 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapterTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class MetaDataConnectionTest {
+public final class MetaDataConnectionAdapterTest {
private static final String TEST_CATALOG = "catalog";
@@ -43,28 +43,28 @@ public final class MetaDataConnectionTest {
@Test
public void assertGetCatalog() throws SQLException {
when(connection.getCatalog()).thenReturn(TEST_CATALOG);
- MetaDataConnection metaDataConnection = new MetaDataConnection("MySQL", connection);
- assertThat(metaDataConnection.getCatalog(), is(TEST_CATALOG));
+ MetaDataConnectionAdapter connectionAdapter = new MetaDataConnectionAdapter("MySQL", connection);
+ assertThat(connectionAdapter.getCatalog(), is(TEST_CATALOG));
}
@Test
public void assertGetCatalogReturnNullWhenThrowsSQLException() throws SQLException {
when(connection.getCatalog()).thenThrow(SQLException.class);
- MetaDataConnection metaDataConnection = new MetaDataConnection("MySQL", connection);
- assertNull(metaDataConnection.getCatalog());
+ MetaDataConnectionAdapter connectionAdapter = new MetaDataConnectionAdapter("MySQL", connection);
+ assertNull(connectionAdapter.getCatalog());
}
@Test
public void assertGetSchema() throws SQLException {
when(connection.getSchema()).thenReturn(TEST_SCHEMA);
- MetaDataConnection metaDataConnection = new MetaDataConnection("MySQL", connection);
- assertThat(metaDataConnection.getSchema(), is(TEST_SCHEMA));
+ MetaDataConnectionAdapter connectionAdapter = new MetaDataConnectionAdapter("MySQL", connection);
+ assertThat(connectionAdapter.getSchema(), is(TEST_SCHEMA));
}
@Test
public void assertGetSchemaReturnNullWhenThrowsSQLException() throws SQLException {
when(connection.getSchema()).thenThrow(SQLException.class);
- MetaDataConnection metaDataConnection = new MetaDataConnection("MySQL", connection);
- assertNull(metaDataConnection.getSchema());
+ MetaDataConnectionAdapter connectionAdapter = new MetaDataConnectionAdapter("MySQL", connection);
+ assertNull(connectionAdapter.getSchema());
}
}