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 2022/05/18 09:12:54 UTC
[shardingsphere] branch master updated: Refactor PipelineTableMetaDataLoader and fix typo in PipelineTableMetaData (#17778)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 6dd46d248de Refactor PipelineTableMetaDataLoader and fix typo in PipelineTableMetaData (#17778)
6dd46d248de is described below
commit 6dd46d248ded123fc9addcef18afc38d670721da
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Wed May 18 17:12:47 2022 +0800
Refactor PipelineTableMetaDataLoader and fix typo in PipelineTableMetaData (#17778)
* Refactor PipelineTableMetaDataLoader
* Fix typo in PipelineTableMetaData's javadoc
---
.../loader/PipelineTableMetaDataLoader.java | 51 ++++++++++------------
.../core/metadata/model/PipelineTableMetaData.java | 2 +-
2 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/PipelineTableMetaDataLoader.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/PipelineTableMetaDataLoader.java
index e70dd8dd566..1f35beda681 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/PipelineTableMetaDataLoader.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/PipelineTableMetaDataLoader.java
@@ -49,13 +49,30 @@ public final class PipelineTableMetaDataLoader {
private final Map<TableName, PipelineTableMetaData> tableMetaDataMap = new ConcurrentHashMap<>();
/**
- * Load table metadata.
+ * Get table metadata, load if it does not exist.
*
- * @param schemaName schema name
- * @param tableNamePattern table name pattern
- * @throws SQLException if loading failure
+ * @param schemaName schema name. nullable
+ * @param tableName dedicated table name, not table name pattern
+ * @return table metadata
*/
- public void loadTableMetaData(final String schemaName, final String tableNamePattern) throws SQLException {
+ public PipelineTableMetaData getTableMetaData(final String schemaName, final String tableName) {
+ PipelineTableMetaData result = tableMetaDataMap.get(new TableName(tableName));
+ if (null != result) {
+ return result;
+ }
+ try {
+ loadTableMetaData(schemaName, tableName);
+ } catch (final SQLException ex) {
+ throw new RuntimeException(String.format("Load metadata for table '%s' failed", tableName), ex);
+ }
+ result = tableMetaDataMap.get(new TableName(tableName));
+ if (null == result) {
+ log.warn("getTableMetaData, can not load metadata for table '{}'", tableName);
+ }
+ return result;
+ }
+
+ private void loadTableMetaData(final String schemaName, final String tableNamePattern) throws SQLException {
try (Connection connection = dataSource.getConnection()) {
long startMillis = System.currentTimeMillis();
String schemaNameFinal = isSchemaAvailable() ? schemaName : null;
@@ -112,28 +129,4 @@ public final class PipelineTableMetaDataLoader {
}
return result;
}
-
- /**
- * Get table metadata, load if it does not exist.
- *
- * @param schemaName schema name. nullable
- * @param tableName dedicated table name, not table name pattern
- * @return table metadata
- */
- public PipelineTableMetaData getTableMetaData(final String schemaName, final String tableName) {
- PipelineTableMetaData result = tableMetaDataMap.get(new TableName(tableName));
- if (null != result) {
- return result;
- }
- try {
- loadTableMetaData(schemaName, tableName);
- } catch (final SQLException ex) {
- throw new RuntimeException(String.format("Load metadata for table '%s' failed", tableName), ex);
- }
- result = tableMetaDataMap.get(new TableName(tableName));
- if (null == result) {
- log.warn("getTableMetaData, can not load metadata for table '{}'", tableName);
- }
- return result;
- }
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/model/PipelineTableMetaData.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/model/PipelineTableMetaData.java
index d63aedbb955..aef6719320a 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/model/PipelineTableMetaData.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/model/PipelineTableMetaData.java
@@ -30,7 +30,7 @@ import java.util.Objects;
import java.util.stream.Collectors;
/**
- * Pipelien table meta data.
+ * Pipeline table meta data.
*/
@Slf4j
@ToString