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/12/25 13:45:22 UTC
[shardingsphere] branch master updated: Rename JDBCDataSourceConfiguration & JDBCDataSourceCreator to PipelineDataSourceConfiguration & PipelineDataSourceCreator (#14325)
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 5fa7cee Rename JDBCDataSourceConfiguration & JDBCDataSourceCreator to PipelineDataSourceConfiguration & PipelineDataSourceCreator (#14325)
5fa7cee is described below
commit 5fa7cee643277cb2e8b9e52b8c05846f8aab3d44
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Dec 25 21:44:26 2021 +0800
Rename JDBCDataSourceConfiguration & JDBCDataSourceCreator to PipelineDataSourceConfiguration & PipelineDataSourceCreator (#14325)
* Rename JDBCDataSourceCreator to PipelineDataSourceCreator
* Rename JDBCDataSourceConfiguration to PipelineDataSourceConfiguration
* Rename JDBCDataSourceConfiguration to PipelineDataSourceConfiguration
* Rename JDBCDataSourceConfiguration to PipelineDataSourceConfiguration
---
...hardingRuleAlteredJobConfigurationPreparer.java | 34 +++++++++++-----------
...> ShardingSpherePipelineDataSourceCreator.java} | 14 ++++-----
...e.datasource.creator.PipelineDataSourceCreator} | 2 +-
.../api/config/ingest/DumperConfiguration.java | 4 +--
.../config/rulealtered/ImporterConfiguration.java | 4 +--
.../api/config/rulealtered/JobConfiguration.java | 8 ++---
.../config/rulealtered/PipelineConfiguration.java | 12 ++++----
.../consistency/DataConsistencyCheckerImpl.java | 32 ++++++++++----------
.../core/datasource/DataSourceFactory.java | 10 +++----
.../core/datasource/DataSourceManager.java | 30 +++++++++----------
...n.java => PipelineDataSourceConfiguration.java} | 4 +--
...=> PipelineDataSourceConfigurationFactory.java} | 26 ++++++++---------
...dingSpherePipelineDataSourceConfiguration.java} | 14 ++++-----
...> StandardPipelineDataSourceConfiguration.java} | 14 ++++-----
...va => YamlPipelineDataSourceConfiguration.java} | 4 +--
...Creator.java => PipelineDataSourceCreator.java} | 12 ++++----
....java => PipelineDataSourceCreatorFactory.java} | 16 +++++-----
...java => StandardPipelineDataSourceCreator.java} | 14 ++++-----
.../ingest/dumper/AbstractInventoryDumper.java | 10 +++----
.../datasource/AbstractDataSourcePreparer.java | 6 ++--
.../AbstractSingleTableDataCalculator.java | 4 +--
.../rulealtered/RuleAlteredJobPreparer.java | 6 ++--
.../scenario/rulealtered/RuleAlteredJobWorker.java | 28 +++++++++---------
.../job/environment/ScalingEnvironmentManager.java | 4 +--
...e.datasource.creator.PipelineDataSourceCreator} | 2 +-
...SpherePipelineDataSourceConfigurationTest.java} | 6 ++--
...andardPipelineDataSourceConfigurationTest.java} | 13 +++++----
.../mysql/ingest/MySQLIncrementalDumper.java | 6 ++--
.../pipeline/mysql/importer/MySQLImporterTest.java | 4 +--
.../mysql/ingest/MySQLIncrementalDumperTest.java | 4 +--
.../pipeline/mysql/ingest/MySQLJdbcDumperTest.java | 4 +--
.../datasource/MySQLDataSourcePreparerTest.java | 26 ++++++++---------
.../opengauss/ingest/OpenGaussWalDumper.java | 17 +++++------
.../ingest/wal/OpenGaussLogicalReplication.java | 16 +++++-----
.../datasource/OpenGaussDataSourcePreparer.java | 8 ++---
.../postgresql/ingest/PostgreSQLWalDumper.java | 12 ++++----
.../postgresql/ingest/wal/LogicalReplication.java | 24 +++++++--------
.../ingest/PostgreSQLJdbcDumperTest.java | 4 +--
.../postgresql/ingest/PostgreSQLWalDumperTest.java | 10 +++----
.../ingest/wal/LogicalReplicationTest.java | 20 ++++++-------
.../ingest/wal/WalEventConverterTest.java | 4 +--
.../test/mysql/env/ITEnvironmentContext.java | 12 ++++----
.../test/mysql/env/config/SourceConfiguration.java | 16 +++++-----
.../test/mysql/env/config/TargetConfiguration.java | 23 +++++++--------
.../pipeline/api/impl/PipelineJobAPIImplTest.java | 18 ++++++------
.../DataConsistencyCheckerImplTest.java | 4 +--
.../core/datasource/DataSourceManagerTest.java | 8 ++---
.../core/importer/AbstractImporterTest.java | 4 +--
.../data/pipeline/core/util/ResourceUtil.java | 16 +++++-----
49 files changed, 293 insertions(+), 300 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
index 3f82704..11330c6 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
@@ -31,10 +31,10 @@ import org.apache.shardingsphere.data.pipeline.api.datanode.JobDataNodeEntry;
import org.apache.shardingsphere.data.pipeline.api.datanode.JobDataNodeLine;
import org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredJobConfigurationPreparer;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfigurationFactory;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSphereJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.apache.shardingsphere.infra.config.rulealtered.OnRuleAlteredActionConfiguration;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigurationSwapper;
@@ -85,10 +85,10 @@ public final class ShardingRuleAlteredJobConfigurationPreparer implements RuleAl
}
private static Map<String, List<DataNode>> getShouldScalingActualDataNodes(final PipelineConfiguration pipelineConfig) {
- JDBCDataSourceConfiguration sourceConfig = JDBCDataSourceConfigurationFactory.newInstance(pipelineConfig.getSource().getType(), pipelineConfig.getSource().getParameter());
- Preconditions.checkState(sourceConfig instanceof ShardingSphereJDBCDataSourceConfiguration,
+ PipelineDataSourceConfiguration sourceDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(pipelineConfig.getSource().getType(), pipelineConfig.getSource().getParameter());
+ Preconditions.checkState(sourceDataSourceConfig instanceof ShardingSpherePipelineDataSourceConfiguration,
"Only ShardingSphereJdbc type of source TypedDataSourceConfiguration is supported.");
- ShardingSphereJDBCDataSourceConfiguration source = (ShardingSphereJDBCDataSourceConfiguration) sourceConfig;
+ ShardingSpherePipelineDataSourceConfiguration source = (ShardingSpherePipelineDataSourceConfiguration) sourceDataSourceConfig;
ShardingRuleConfiguration sourceRuleConfig = ShardingRuleConfigurationConverter.findAndConvertShardingRuleConfiguration(source.getRootConfig().getRules());
ShardingRule shardingRule = new ShardingRule(sourceRuleConfig, source.getRootConfig().getDataSources().keySet());
Map<String, TableRule> tableRules = shardingRule.getTableRules();
@@ -123,7 +123,7 @@ public final class ShardingRuleAlteredJobConfigurationPreparer implements RuleAl
@Override
public Collection<TaskConfiguration> createTaskConfigurations(final PipelineConfiguration pipelineConfig, final HandleConfiguration handleConfig) {
Collection<TaskConfiguration> result = new LinkedList<>();
- ShardingSphereJDBCDataSourceConfiguration sourceConfig = getSourceConfiguration(pipelineConfig);
+ ShardingSpherePipelineDataSourceConfiguration sourceConfig = getSourceConfiguration(pipelineConfig);
ShardingRuleConfiguration sourceRuleConfig = ShardingRuleConfigurationConverter.findAndConvertShardingRuleConfiguration(sourceConfig.getRootConfig().getRules());
Map<String, DataSourceConfiguration> sourceDataSource = new YamlDataSourceConfigurationSwapper().getDataSourceConfigurations(sourceConfig.getRootConfig());
Map<String, Map<String, String>> dataSourceTableNameMap = toDataSourceTableNameMap(new ShardingRule(sourceRuleConfig, sourceConfig.getRootConfig().getDataSources().keySet()));
@@ -145,17 +145,17 @@ public final class ShardingRuleAlteredJobConfigurationPreparer implements RuleAl
return Optional.ofNullable(shardingRuleConfig.getScaling().get(shardingRuleConfig.getScalingName()));
}
- private static ShardingSphereJDBCDataSourceConfiguration getSourceConfiguration(final PipelineConfiguration pipelineConfig) {
- JDBCDataSourceConfiguration result = JDBCDataSourceConfigurationFactory.newInstance(pipelineConfig.getSource().getType(), pipelineConfig.getSource().getParameter());
- Preconditions.checkArgument(result instanceof ShardingSphereJDBCDataSourceConfiguration, "Only support ShardingSphere source data source.");
- return (ShardingSphereJDBCDataSourceConfiguration) result;
+ private static ShardingSpherePipelineDataSourceConfiguration getSourceConfiguration(final PipelineConfiguration pipelineConfig) {
+ PipelineDataSourceConfiguration result = PipelineDataSourceConfigurationFactory.newInstance(pipelineConfig.getSource().getType(), pipelineConfig.getSource().getParameter());
+ Preconditions.checkArgument(result instanceof ShardingSpherePipelineDataSourceConfiguration, "Only support ShardingSphere source data source.");
+ return (ShardingSpherePipelineDataSourceConfiguration) result;
}
private static Optional<ShardingRuleConfiguration> getTargetRuleConfiguration(final PipelineConfiguration pipelineConfig) {
- JDBCDataSourceConfiguration dataSourceConfig = JDBCDataSourceConfigurationFactory.newInstance(pipelineConfig.getTarget().getType(), pipelineConfig.getTarget().getParameter());
- if (dataSourceConfig instanceof ShardingSphereJDBCDataSourceConfiguration) {
+ PipelineDataSourceConfiguration targetDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(pipelineConfig.getTarget().getType(), pipelineConfig.getTarget().getParameter());
+ if (targetDataSourceConfig instanceof ShardingSpherePipelineDataSourceConfiguration) {
return Optional.of(
- ShardingRuleConfigurationConverter.findAndConvertShardingRuleConfiguration(((ShardingSphereJDBCDataSourceConfiguration) dataSourceConfig).getRootConfig().getRules()));
+ ShardingRuleConfigurationConverter.findAndConvertShardingRuleConfiguration(((ShardingSpherePipelineDataSourceConfiguration) targetDataSourceConfig).getRootConfig().getRules()));
}
return Optional.empty();
}
@@ -266,7 +266,7 @@ public final class ShardingRuleAlteredJobConfigurationPreparer implements RuleAl
final OnRuleAlteredActionConfiguration ruleAlteredActionConfig) {
DumperConfiguration result = new DumperConfiguration();
result.setDataSourceName(dataSourceName);
- result.setDataSourceConfig(new StandardJDBCDataSourceConfiguration(YamlEngine.marshal(props)));
+ result.setDataSourceConfig(new StandardPipelineDataSourceConfiguration(YamlEngine.marshal(props)));
result.setTableNameMap(tableMap);
if (null != ruleAlteredActionConfig) {
result.setBlockQueueSize(ruleAlteredActionConfig.getBlockQueueSize());
@@ -276,7 +276,7 @@ public final class ShardingRuleAlteredJobConfigurationPreparer implements RuleAl
private static ImporterConfiguration createImporterConfig(final PipelineConfiguration pipelineConfig, final HandleConfiguration handleConfig, final Map<String, Set<String>> shardingColumnsMap) {
ImporterConfiguration result = new ImporterConfiguration();
- result.setDataSourceConfig(JDBCDataSourceConfigurationFactory.newInstance(pipelineConfig.getTarget().getType(), pipelineConfig.getTarget().getParameter()));
+ result.setDataSourceConfig(PipelineDataSourceConfigurationFactory.newInstance(pipelineConfig.getTarget().getType(), pipelineConfig.getTarget().getParameter()));
result.setShardingColumnsMap(shardingColumnsMap);
result.setRetryTimes(handleConfig.getRetryTimes());
return result;
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCDataSourceCreator.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSpherePipelineDataSourceCreator.java
similarity index 85%
rename from shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCDataSourceCreator.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSpherePipelineDataSourceCreator.java
index 8213e4c..5c7c56f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCDataSourceCreator.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSpherePipelineDataSourceCreator.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.driver.config.datasource;
import org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory;
import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSphereJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreator;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreator;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigurationSwapper;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
@@ -31,13 +31,13 @@ import java.sql.SQLException;
import java.util.Collections;
/**
- * ShardingSphere JDBC data source creator.
+ * ShardingSphere pipeline data source creator.
*/
-public final class ShardingSphereJDBCDataSourceCreator implements JDBCDataSourceCreator {
+public final class ShardingSpherePipelineDataSourceCreator implements PipelineDataSourceCreator {
@Override
- public DataSource createDataSource(final Object dataSourceConfig) throws SQLException {
- YamlRootConfiguration rootConfig = (YamlRootConfiguration) dataSourceConfig;
+ public DataSource createPipelineDataSource(final Object pipelineDataSourceConfig) throws SQLException {
+ YamlRootConfiguration rootConfig = (YamlRootConfiguration) pipelineDataSourceConfig;
ShardingRuleConfiguration shardingRuleConfig = ShardingRuleConfigurationConverter.findAndConvertShardingRuleConfiguration(rootConfig.getRules());
enableRangeQueryForInline(shardingRuleConfig);
return ShardingSphereDataSourceFactory.createDataSource(rootConfig.getSchemaName(), new YamlDataSourceConfigurationSwapper().swapToDataSources(rootConfig.getDataSources()),
@@ -55,6 +55,6 @@ public final class ShardingSphereJDBCDataSourceCreator implements JDBCDataSource
@Override
public String getType() {
- return ShardingSphereJDBCDataSourceConfiguration.TYPE;
+ return ShardingSpherePipelineDataSourceConfiguration.TYPE;
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreator b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreator
similarity index 96%
rename from shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreator
rename to shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreator
index 7a1f0b0..3432175 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreator
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreator
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.config.datasource.ShardingSphereJDBCDataSourceCreator
+org.apache.shardingsphere.driver.config.datasource.ShardingSpherePipelineDataSourceCreator
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/ingest/DumperConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/ingest/DumperConfiguration.java
index 0e5ebb8..bfa2896 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/ingest/DumperConfiguration.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/ingest/DumperConfiguration.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
import java.util.Map;
@@ -35,7 +35,7 @@ public class DumperConfiguration {
private String dataSourceName;
- private JDBCDataSourceConfiguration dataSourceConfig;
+ private PipelineDataSourceConfiguration dataSourceConfig;
private int blockQueueSize = 10000;
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/ImporterConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/ImporterConfiguration.java
index e2ac675..8d4b44c 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/ImporterConfiguration.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/ImporterConfiguration.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.api.config.rulealtered;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
import java.util.Map;
import java.util.Set;
@@ -33,7 +33,7 @@ import java.util.Set;
@ToString(exclude = "dataSourceConfig")
public final class ImporterConfiguration {
- private JDBCDataSourceConfiguration dataSourceConfig;
+ private PipelineDataSourceConfiguration dataSourceConfig;
private Map<String, Set<String>> shardingColumnsMap;
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
index 86db178..2f88bdc 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
@@ -24,8 +24,8 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredJobConfigurationPreparer;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfigurationFactory;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.spi.required.RequiredSPIRegistry;
@@ -74,12 +74,12 @@ public final class JobConfiguration {
handleConfig.setJobId(System.nanoTime() - ThreadLocalRandom.current().nextLong(100_0000));
}
if (Strings.isNullOrEmpty(handleConfig.getSourceDatabaseType())) {
- JDBCDataSourceConfiguration sourceDataSourceConfig = JDBCDataSourceConfigurationFactory.newInstance(
+ PipelineDataSourceConfiguration sourceDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(
getPipelineConfig().getSource().getType(), getPipelineConfig().getSource().getParameter());
handleConfig.setSourceDatabaseType(sourceDataSourceConfig.getDatabaseType().getName());
}
if (Strings.isNullOrEmpty(handleConfig.getTargetDatabaseType())) {
- JDBCDataSourceConfiguration targetDataSourceConfig = JDBCDataSourceConfigurationFactory.newInstance(
+ PipelineDataSourceConfiguration targetDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(
getPipelineConfig().getTarget().getType(), getPipelineConfig().getTarget().getParameter());
handleConfig.setTargetDatabaseType(targetDataSourceConfig.getDatabaseType().getName());
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/PipelineConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/PipelineConfiguration.java
index 06d3634..80e69d4 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/PipelineConfiguration.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/PipelineConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.data.pipeline.api.config.rulealtered;
import com.google.common.base.Preconditions;
import lombok.Getter;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlPipelineDataSourceConfiguration;
/**
* Pipeline configuration.
@@ -27,16 +27,16 @@ import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlJ
@Getter
public final class PipelineConfiguration {
- private YamlJDBCDataSourceConfiguration source;
+ private YamlPipelineDataSourceConfiguration source;
- private YamlJDBCDataSourceConfiguration target;
+ private YamlPipelineDataSourceConfiguration target;
/**
* Set source.
*
* @param source source configuration
*/
- public void setSource(final YamlJDBCDataSourceConfiguration source) {
+ public void setSource(final YamlPipelineDataSourceConfiguration source) {
checkParameters(source);
this.source = source;
}
@@ -46,12 +46,12 @@ public final class PipelineConfiguration {
*
* @param target target configuration
*/
- public void setTarget(final YamlJDBCDataSourceConfiguration target) {
+ public void setTarget(final YamlPipelineDataSourceConfiguration target) {
checkParameters(target);
this.target = target;
}
- private void checkParameters(final YamlJDBCDataSourceConfiguration yamlConfig) {
+ private void checkParameters(final YamlPipelineDataSourceConfiguration yamlConfig) {
Preconditions.checkNotNull(yamlConfig);
Preconditions.checkNotNull(yamlConfig.getType());
Preconditions.checkNotNull(yamlConfig.getParameter());
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImpl.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImpl.java
index 114b882..25c8843 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImpl.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImpl.java
@@ -29,8 +29,8 @@ import org.apache.shardingsphere.data.pipeline.scenario.rulealtered.RuleAlteredJ
import org.apache.shardingsphere.data.pipeline.spi.check.consistency.DataConsistencyCheckAlgorithm;
import org.apache.shardingsphere.data.pipeline.spi.check.consistency.SingleTableDataCalculator;
import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfigurationFactory;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorThreadFactoryBuilder;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.common.TableMetaDataLoader;
@@ -75,12 +75,12 @@ public final class DataConsistencyCheckerImpl implements DataConsistencyChecker
public Map<String, DataConsistencyCheckResult> checkRecordsCount() {
ThreadFactory threadFactory = ExecutorThreadFactoryBuilder.build("job" + jobContext.getJobId() % 10_000 + "-countCheck-%d");
ThreadPoolExecutor executor = new ThreadPoolExecutor(2, 2, 60, TimeUnit.SECONDS, new ArrayBlockingQueue<>(2), threadFactory);
- JDBCDataSourceConfiguration sourceConfig = JDBCDataSourceConfigurationFactory.newInstance(
+ PipelineDataSourceConfiguration sourceDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(
jobContext.getJobConfig().getPipelineConfig().getSource().getType(), jobContext.getJobConfig().getPipelineConfig().getSource().getParameter());
- JDBCDataSourceConfiguration targetConfig = JDBCDataSourceConfigurationFactory.newInstance(
+ PipelineDataSourceConfiguration targetDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(
jobContext.getJobConfig().getPipelineConfig().getTarget().getType(), jobContext.getJobConfig().getPipelineConfig().getTarget().getParameter());
- try (DataSourceWrapper sourceDataSource = dataSourceFactory.newInstance(sourceConfig);
- DataSourceWrapper targetDataSource = dataSourceFactory.newInstance(targetConfig)) {
+ try (DataSourceWrapper sourceDataSource = dataSourceFactory.newInstance(sourceDataSourceConfig);
+ DataSourceWrapper targetDataSource = dataSourceFactory.newInstance(targetDataSourceConfig)) {
return jobContext.getTaskConfigs()
.stream().flatMap(each -> each.getDumperConfig().getTableNameMap().values().stream()).collect(Collectors.toSet())
.stream().collect(Collectors.toMap(Function.identity(), table -> countCheck(table, sourceDataSource, targetDataSource, executor),
@@ -119,30 +119,30 @@ public final class DataConsistencyCheckerImpl implements DataConsistencyChecker
@Override
public Map<String, Boolean> checkRecordsContent(final DataConsistencyCheckAlgorithm checkAlgorithm) {
Collection<String> supportedDatabaseTypes = checkAlgorithm.getSupportedDatabaseTypes();
- JDBCDataSourceConfiguration sourceConfig = JDBCDataSourceConfigurationFactory.newInstance(
+ PipelineDataSourceConfiguration sourceDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(
jobContext.getJobConfig().getPipelineConfig().getSource().getType(), jobContext.getJobConfig().getPipelineConfig().getSource().getParameter());
- checkDatabaseTypeSupportedOrNot(supportedDatabaseTypes, sourceConfig.getDatabaseType().getName());
- JDBCDataSourceConfiguration targetConfig = JDBCDataSourceConfigurationFactory.newInstance(
+ checkDatabaseTypeSupportedOrNot(supportedDatabaseTypes, sourceDataSourceConfig.getDatabaseType().getName());
+ PipelineDataSourceConfiguration targetDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(
jobContext.getJobConfig().getPipelineConfig().getTarget().getType(), jobContext.getJobConfig().getPipelineConfig().getTarget().getParameter());
- checkDatabaseTypeSupportedOrNot(supportedDatabaseTypes, targetConfig.getDatabaseType().getName());
+ checkDatabaseTypeSupportedOrNot(supportedDatabaseTypes, targetDataSourceConfig.getDatabaseType().getName());
Collection<String> logicTableNames = jobContext.getTaskConfigs().stream().flatMap(each -> each.getDumperConfig().getTableNameMap().values().stream()).distinct().collect(Collectors.toList());
- Map<String, TableMetaData> tableMetaDataMap = getTablesColumnsMap(sourceConfig, logicTableNames);
+ Map<String, TableMetaData> tableMetaDataMap = getTablesColumnsMap(sourceDataSourceConfig, logicTableNames);
logicTableNames.forEach(each -> {
//TODO put to preparer
if (!tableMetaDataMap.containsKey(each)) {
throw new DataCheckFailException(String.format("could not get columns for table '%s'", each));
}
});
- String sourceDatabaseType = sourceConfig.getDatabaseType().getName();
- String targetDatabaseType = targetConfig.getDatabaseType().getName();
+ String sourceDatabaseType = sourceDataSourceConfig.getDatabaseType().getName();
+ String targetDatabaseType = targetDataSourceConfig.getDatabaseType().getName();
SingleTableDataCalculator sourceCalculator = checkAlgorithm.getSingleTableDataCalculator(sourceDatabaseType);
SingleTableDataCalculator targetCalculator = checkAlgorithm.getSingleTableDataCalculator(targetDatabaseType);
Map<String, Boolean> result = new HashMap<>();
ThreadFactory threadFactory = ExecutorThreadFactoryBuilder.build("job" + jobContext.getJobId() % 10_000 + "-dataCheck-%d");
ThreadPoolExecutor executor = new ThreadPoolExecutor(2, 2, 60, TimeUnit.SECONDS, new ArrayBlockingQueue<>(2), threadFactory);
JobRateLimitAlgorithm rateLimitAlgorithm = jobContext.getRuleAlteredContext().getRateLimitAlgorithm();
- try (DataSourceWrapper sourceDataSource = dataSourceFactory.newInstance(sourceConfig);
- DataSourceWrapper targetDataSource = dataSourceFactory.newInstance(targetConfig)) {
+ try (DataSourceWrapper sourceDataSource = dataSourceFactory.newInstance(sourceDataSourceConfig);
+ DataSourceWrapper targetDataSource = dataSourceFactory.newInstance(targetDataSourceConfig)) {
for (String each : logicTableNames) {
Collection<String> columnNames = tableMetaDataMap.get(each).getColumns().keySet();
String uniqueKey = tableMetaDataMap.get(each).getPrimaryKeyColumns().get(0);
@@ -184,7 +184,7 @@ public final class DataConsistencyCheckerImpl implements DataConsistencyChecker
}
// TODO reuse metadata
- private Map<String, TableMetaData> getTablesColumnsMap(final JDBCDataSourceConfiguration dataSourceConfig, final Collection<String> tableNames) {
+ private Map<String, TableMetaData> getTablesColumnsMap(final PipelineDataSourceConfiguration dataSourceConfig, final Collection<String> tableNames) {
try (DataSourceWrapper dataSource = dataSourceFactory.newInstance(dataSourceConfig)) {
Map<String, TableMetaData> result = new LinkedHashMap<>();
for (String each : tableNames) {
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceFactory.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceFactory.java
index 4e6d1c0..3d56cd3 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceFactory.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceFactory.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.data.pipeline.core.datasource;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreatorFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreatorFactory;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -36,9 +36,9 @@ public final class DataSourceFactory {
* @return new data source wrapper
*/
@SneakyThrows(SQLException.class)
- public DataSourceWrapper newInstance(final JDBCDataSourceConfiguration dataSourceConfig) {
+ public DataSourceWrapper newInstance(final PipelineDataSourceConfiguration dataSourceConfig) {
// TODO cache and reuse, try DataSourceManager
- DataSource dataSource = JDBCDataSourceCreatorFactory.getInstance(dataSourceConfig.getType()).createDataSource(dataSourceConfig.getDataSourceConfiguration());
- return new DataSourceWrapper(dataSource, dataSourceConfig.getDatabaseType());
+ DataSource pipelineDataSource = PipelineDataSourceCreatorFactory.getInstance(dataSourceConfig.getType()).createPipelineDataSource(dataSourceConfig.getDataSourceConfiguration());
+ return new DataSourceWrapper(pipelineDataSource, dataSourceConfig.getDatabaseType());
}
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManager.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManager.java
index 57518fc..a4970e7 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManager.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManager.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.core.datasource;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
import java.sql.SQLException;
import java.util.Map;
@@ -36,32 +36,32 @@ public final class DataSourceManager implements AutoCloseable {
private final DataSourceFactory dataSourceFactory = new DataSourceFactory();
- private final Map<JDBCDataSourceConfiguration, DataSourceWrapper> cachedDataSources = new ConcurrentHashMap<>();
+ private final Map<PipelineDataSourceConfiguration, DataSourceWrapper> cachedDataSources = new ConcurrentHashMap<>();
- private final Map<JDBCDataSourceConfiguration, DataSourceWrapper> sourceDataSources = new ConcurrentHashMap<>();
+ private final Map<PipelineDataSourceConfiguration, DataSourceWrapper> sourceDataSources = new ConcurrentHashMap<>();
- private final Map<JDBCDataSourceConfiguration, DataSourceWrapper> targetDataSources = new ConcurrentHashMap<>();
+ private final Map<PipelineDataSourceConfiguration, DataSourceWrapper> targetDataSources = new ConcurrentHashMap<>();
/**
* Create source data source.
*
- * @param dataSourceConfig data source configuration
+ * @param pipelineDataSourceConfig pipeline data source configuration
*/
- public void createSourceDataSource(final JDBCDataSourceConfiguration dataSourceConfig) {
- DataSourceWrapper dataSource = dataSourceFactory.newInstance(dataSourceConfig);
- cachedDataSources.put(dataSourceConfig, dataSource);
- sourceDataSources.put(dataSourceConfig, dataSource);
+ public void createSourceDataSource(final PipelineDataSourceConfiguration pipelineDataSourceConfig) {
+ DataSourceWrapper dataSource = dataSourceFactory.newInstance(pipelineDataSourceConfig);
+ cachedDataSources.put(pipelineDataSourceConfig, dataSource);
+ sourceDataSources.put(pipelineDataSourceConfig, dataSource);
}
/**
* Create target data source.
*
- * @param dataSourceConfig data source configuration
+ * @param pipelineDataSourceConfig pipeline data source configuration
*/
- public void createTargetDataSource(final JDBCDataSourceConfiguration dataSourceConfig) {
- DataSourceWrapper dataSource = dataSourceFactory.newInstance(dataSourceConfig);
- cachedDataSources.put(dataSourceConfig, dataSource);
- targetDataSources.put(dataSourceConfig, dataSource);
+ public void createTargetDataSource(final PipelineDataSourceConfiguration pipelineDataSourceConfig) {
+ DataSourceWrapper dataSource = dataSourceFactory.newInstance(pipelineDataSourceConfig);
+ cachedDataSources.put(pipelineDataSourceConfig, dataSource);
+ targetDataSources.put(pipelineDataSourceConfig, dataSource);
}
/**
@@ -70,7 +70,7 @@ public final class DataSourceManager implements AutoCloseable {
* @param dataSourceConfig data source configuration
* @return data source
*/
- public DataSourceWrapper getDataSource(final JDBCDataSourceConfiguration dataSourceConfig) {
+ public DataSourceWrapper getDataSource(final PipelineDataSourceConfiguration dataSourceConfig) {
// TODO re-init if existing dataSource was closed
if (cachedDataSources.containsKey(dataSourceConfig)) {
return cachedDataSources.get(dataSourceConfig);
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/JDBCDataSourceConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/PipelineDataSourceConfiguration.java
similarity index 94%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/JDBCDataSourceConfiguration.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/PipelineDataSourceConfiguration.java
index dd6762d..af7c41e 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/JDBCDataSourceConfiguration.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/PipelineDataSourceConfiguration.java
@@ -22,9 +22,9 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import java.util.Map;
/**
- * JDBC data source configuration.
+ * Pipeline data source configuration.
*/
-public interface JDBCDataSourceConfiguration {
+public interface PipelineDataSourceConfiguration {
/**
* Get type.
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/JDBCDataSourceConfigurationFactory.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/PipelineDataSourceConfigurationFactory.java
similarity index 60%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/JDBCDataSourceConfigurationFactory.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/PipelineDataSourceConfigurationFactory.java
index 7182963..b2fa353 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/JDBCDataSourceConfigurationFactory.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/PipelineDataSourceConfigurationFactory.java
@@ -19,28 +19,28 @@ package org.apache.shardingsphere.data.pipeline.core.datasource.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSphereJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
/**
- * JDBC data source configuration factory.
+ * Pipeline data source configuration factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class JDBCDataSourceConfigurationFactory {
+public final class PipelineDataSourceConfigurationFactory {
/**
- * Get new instance of JDBC data source configuration.
+ * Get new instance of pipeline data source configuration.
*
- * @param type type of JDBC data source configuration
- * @param parameter parameter of JDBC data source configuration
- * @return new instance of JDBC data source configuration
+ * @param type type of pipeline data source configuration
+ * @param parameter parameter of pipeline data source configuration
+ * @return new instance of pipeline data source configuration
*/
- public static JDBCDataSourceConfiguration newInstance(final String type, final String parameter) {
+ public static PipelineDataSourceConfiguration newInstance(final String type, final String parameter) {
switch (type) {
- case StandardJDBCDataSourceConfiguration.TYPE:
- return new StandardJDBCDataSourceConfiguration(parameter);
- case ShardingSphereJDBCDataSourceConfiguration.TYPE:
- return new ShardingSphereJDBCDataSourceConfiguration(parameter);
+ case StandardPipelineDataSourceConfiguration.TYPE:
+ return new StandardPipelineDataSourceConfiguration(parameter);
+ case ShardingSpherePipelineDataSourceConfiguration.TYPE:
+ return new ShardingSpherePipelineDataSourceConfiguration(parameter);
default:
throw new UnsupportedOperationException(String.format("Unsupported data source type '%s'", type));
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/ShardingSphereJDBCDataSourceConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
similarity index 88%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/ShardingSphereJDBCDataSourceConfiguration.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
index 9a2772f..b3f3a88 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/ShardingSphereJDBCDataSourceConfiguration.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
@@ -23,7 +23,7 @@ import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
@@ -38,11 +38,11 @@ import java.util.LinkedList;
import java.util.Map;
/**
- * ShardingSphere-JDBC data source configuration.
+ * Pipeline data source configuration for ShardingSphere-JDBC.
*/
@Getter
@EqualsAndHashCode(of = "parameter")
-public final class ShardingSphereJDBCDataSourceConfiguration implements JDBCDataSourceConfiguration {
+public final class ShardingSpherePipelineDataSourceConfiguration implements PipelineDataSourceConfiguration {
public static final String TYPE = "ShardingSphereJDBC";
@@ -52,14 +52,14 @@ public final class ShardingSphereJDBCDataSourceConfiguration implements JDBCData
private final DatabaseType databaseType;
- public ShardingSphereJDBCDataSourceConfiguration(final String parameter) {
+ public ShardingSpherePipelineDataSourceConfiguration(final String parameter) {
this.parameter = parameter;
rootConfig = YamlEngine.unmarshal(parameter, YamlRootConfiguration.class);
Map<String, Object> props = rootConfig.getDataSources().values().iterator().next();
databaseType = DatabaseTypeRegistry.getDatabaseTypeByURL(getJdbcUrl(props));
}
- public ShardingSphereJDBCDataSourceConfiguration(final YamlRootConfiguration rootConfig) {
+ public ShardingSpherePipelineDataSourceConfiguration(final YamlRootConfiguration rootConfig) {
YamlParameterConfiguration parameterConfig = new YamlParameterConfiguration(rootConfig.getDataSources(), rootConfig.getRules());
this.parameter = YamlEngine.marshal(parameterConfig);
this.rootConfig = rootConfig;
@@ -98,10 +98,10 @@ public final class ShardingSphereJDBCDataSourceConfiguration implements JDBCData
* @param actualDataSourceName actual data source name
* @return actual data source configuration
*/
- public StandardJDBCDataSourceConfiguration getActualDataSourceConfig(final String actualDataSourceName) {
+ public StandardPipelineDataSourceConfiguration getActualDataSourceConfig(final String actualDataSourceName) {
Map<String, Object> yamlDataSourceConfig = rootConfig.getDataSources().get(actualDataSourceName);
Preconditions.checkNotNull(yamlDataSourceConfig, "actualDataSourceName '{}' does not exist", actualDataSourceName);
- return new StandardJDBCDataSourceConfiguration(yamlDataSourceConfig);
+ return new StandardPipelineDataSourceConfiguration(yamlDataSourceConfig);
}
/**
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/StandardJDBCDataSourceConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/StandardPipelineDataSourceConfiguration.java
similarity index 85%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/StandardJDBCDataSourceConfiguration.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/StandardPipelineDataSourceConfiguration.java
index 83b36a8..826a27d 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/StandardJDBCDataSourceConfiguration.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/impl/StandardPipelineDataSourceConfiguration.java
@@ -21,7 +21,7 @@ import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import lombok.EqualsAndHashCode;
import lombok.Getter;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
@@ -33,10 +33,10 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
- * Standard JDBC data source configuration.
+ * Pipeline data source configuration for standard JDBC.
*/
@EqualsAndHashCode(of = "parameter")
-public final class StandardJDBCDataSourceConfiguration implements JDBCDataSourceConfiguration {
+public final class StandardPipelineDataSourceConfiguration implements PipelineDataSourceConfiguration {
public static final String TYPE = "JDBC";
@@ -54,15 +54,15 @@ public final class StandardJDBCDataSourceConfiguration implements JDBCDataSource
private final DatabaseType databaseType;
@SuppressWarnings("unchecked")
- public StandardJDBCDataSourceConfiguration(final String parameter) {
+ public StandardPipelineDataSourceConfiguration(final String parameter) {
this(YamlEngine.unmarshal(parameter, Map.class), parameter);
}
- public StandardJDBCDataSourceConfiguration(final Map<String, Object> yamlDataSourceConfig) {
+ public StandardPipelineDataSourceConfiguration(final Map<String, Object> yamlDataSourceConfig) {
this(yamlDataSourceConfig, YamlEngine.marshal(yamlDataSourceConfig));
}
- private StandardJDBCDataSourceConfiguration(final Map<String, Object> yamlConfig, final String parameter) {
+ private StandardPipelineDataSourceConfiguration(final Map<String, Object> yamlConfig, final String parameter) {
this.parameter = parameter;
if (!yamlConfig.containsKey(DATA_SOURCE_CLASS_NAME)) {
yamlConfig.put(DATA_SOURCE_CLASS_NAME, HikariDataSource.class.getName());
@@ -73,7 +73,7 @@ public final class StandardJDBCDataSourceConfiguration implements JDBCDataSource
databaseType = DatabaseTypeRegistry.getDatabaseTypeByURL(hikariConfig.getJdbcUrl());
}
- public StandardJDBCDataSourceConfiguration(final String jdbcUrl, final String username, final String password) {
+ public StandardPipelineDataSourceConfiguration(final String jdbcUrl, final String username, final String password) {
this(wrapParameter(jdbcUrl, username, password));
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/yaml/YamlJDBCDataSourceConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/yaml/YamlPipelineDataSourceConfiguration.java
similarity index 89%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/yaml/YamlJDBCDataSourceConfiguration.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/yaml/YamlPipelineDataSourceConfiguration.java
index 2959862..d5df3bd 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/yaml/YamlJDBCDataSourceConfiguration.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/config/yaml/YamlPipelineDataSourceConfiguration.java
@@ -22,11 +22,11 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlConfiguration;
/**
- * JDBC data source configuration for YAML.
+ * Pipeline data source configuration for YAML.
*/
@Getter
@Setter
-public final class YamlJDBCDataSourceConfiguration implements YamlConfiguration {
+public final class YamlPipelineDataSourceConfiguration implements YamlConfiguration {
private String type;
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/JDBCDataSourceCreator.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreator.java
similarity index 76%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/JDBCDataSourceCreator.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreator.java
index 67d1449..5bdcb06 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/JDBCDataSourceCreator.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreator.java
@@ -23,16 +23,16 @@ import javax.sql.DataSource;
import java.sql.SQLException;
/**
- * JDBC data source creator.
+ * Pipeline data source creator.
*/
-public interface JDBCDataSourceCreator extends TypedSPI {
+public interface PipelineDataSourceCreator extends TypedSPI {
/**
- * Create data source.
+ * Create pipeline data source.
*
- * @param dataSourceConfig data source configuration
- * @return data source
+ * @param pipelineDataSourceConfig pipeline data source configuration
+ * @return pipeline data source
* @throws SQLException if create data source failed
*/
- DataSource createDataSource(Object dataSourceConfig) throws SQLException;
+ DataSource createPipelineDataSource(Object pipelineDataSourceConfig) throws SQLException;
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/JDBCDataSourceCreatorFactory.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreatorFactory.java
similarity index 67%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/JDBCDataSourceCreatorFactory.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreatorFactory.java
index 5beabc0..0a8f88f 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/JDBCDataSourceCreatorFactory.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreatorFactory.java
@@ -21,21 +21,21 @@ import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.spi.typed.TypedSPIRegistry;
/**
- * JDBC data source creator factory.
+ * Pipeline data source creator factory.
*/
-public final class JDBCDataSourceCreatorFactory {
+public final class PipelineDataSourceCreatorFactory {
static {
- ShardingSphereServiceLoader.register(JDBCDataSourceCreator.class);
+ ShardingSphereServiceLoader.register(PipelineDataSourceCreator.class);
}
/**
- * Get JDBC data source creator instance.
+ * Get pipeline data source creator instance.
*
- * @param type JDBC data source creator type
- * @return JDBC data source creator instance
+ * @param type pipeline data source creator type
+ * @return pipeline data source creator instance
*/
- public static JDBCDataSourceCreator getInstance(final String type) {
- return TypedSPIRegistry.getRegisteredService(JDBCDataSourceCreator.class, type, null);
+ public static PipelineDataSourceCreator getInstance(final String type) {
+ return TypedSPIRegistry.getRegisteredService(PipelineDataSourceCreator.class, type, null);
}
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardJDBCDataSourceCreator.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardPipelineDataSourceCreator.java
similarity index 76%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardJDBCDataSourceCreator.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardPipelineDataSourceCreator.java
index 4d326e7..a626d91 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardJDBCDataSourceCreator.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardPipelineDataSourceCreator.java
@@ -19,23 +19,23 @@ package org.apache.shardingsphere.data.pipeline.core.datasource.creator.impl;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreator;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreator;
import javax.sql.DataSource;
/**
- * Standard JDBC data source creator.
+ * Standard pipeline data source creator.
*/
-public final class StandardJDBCDataSourceCreator implements JDBCDataSourceCreator {
+public final class StandardPipelineDataSourceCreator implements PipelineDataSourceCreator {
@Override
- public DataSource createDataSource(final Object dataSourceConfig) {
- return DataSourceConverter.getDataSource((DataSourceConfiguration) dataSourceConfig);
+ public DataSource createPipelineDataSource(final Object pipelineDataSourceConfig) {
+ return DataSourceConverter.getDataSource((DataSourceConfiguration) pipelineDataSourceConfig);
}
@Override
public String getType() {
- return StandardJDBCDataSourceConfiguration.TYPE;
+ return StandardPipelineDataSourceConfiguration.TYPE;
}
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/AbstractInventoryDumper.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/AbstractInventoryDumper.java
index 51f5cd6..15dc777 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/AbstractInventoryDumper.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/AbstractInventoryDumper.java
@@ -38,8 +38,8 @@ import org.apache.shardingsphere.data.pipeline.core.ingest.IngestDataChangeType;
import org.apache.shardingsphere.data.pipeline.core.ingest.exception.IngestException;
import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.InventoryDumper;
import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
import java.sql.Connection;
@@ -70,8 +70,8 @@ public abstract class AbstractInventoryDumper extends AbstractLifecycleExecutor
private Channel channel;
protected AbstractInventoryDumper(final InventoryDumperConfiguration inventoryDumperConfig, final DataSourceManager dataSourceManager) {
- if (!StandardJDBCDataSourceConfiguration.class.equals(inventoryDumperConfig.getDataSourceConfig().getClass())) {
- throw new UnsupportedOperationException("AbstractInventoryDumper only support StandardJDBCDataSourceConfiguration");
+ if (!StandardPipelineDataSourceConfiguration.class.equals(inventoryDumperConfig.getDataSourceConfig().getClass())) {
+ throw new UnsupportedOperationException("AbstractInventoryDumper only support StandardPipelineDataSourceConfiguration");
}
this.inventoryDumperConfig = inventoryDumperConfig;
this.readBatchSize = inventoryDumperConfig.getReadBatchSize();
@@ -81,7 +81,7 @@ public abstract class AbstractInventoryDumper extends AbstractLifecycleExecutor
}
private TableMetaData createTableMetaData() {
- JDBCDataSourceConfiguration dataSourceConfig = inventoryDumperConfig.getDataSourceConfig();
+ PipelineDataSourceConfiguration dataSourceConfig = inventoryDumperConfig.getDataSourceConfig();
// TODO share MetaDataManager
MetaDataManager metaDataManager = new MetaDataManager(dataSourceManager.getDataSource(dataSourceConfig));
return metaDataManager.getTableMetaData(inventoryDumperConfig.getTableName(), dataSourceConfig.getDatabaseType());
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
index c692324..40ecc84 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.data.pipeline.api.prepare.datasource.TableDefin
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceFactory;
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceWrapper;
import org.apache.shardingsphere.data.pipeline.spi.rulealtered.DataSourcePreparer;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfigurationFactory;
import java.sql.Connection;
import java.sql.SQLException;
@@ -51,11 +51,11 @@ public abstract class AbstractDataSourcePreparer implements DataSourcePreparer {
private final DataSourceFactory dataSourceFactory = new DataSourceFactory();
protected final DataSourceWrapper getSourceDataSource(final PipelineConfiguration pipelineConfig) {
- return dataSourceFactory.newInstance(JDBCDataSourceConfigurationFactory.newInstance(pipelineConfig.getSource().getType(), pipelineConfig.getSource().getParameter()));
+ return dataSourceFactory.newInstance(PipelineDataSourceConfigurationFactory.newInstance(pipelineConfig.getSource().getType(), pipelineConfig.getSource().getParameter()));
}
protected final DataSourceWrapper getTargetDataSource(final PipelineConfiguration pipelineConfig) {
- return dataSourceFactory.newInstance(JDBCDataSourceConfigurationFactory.newInstance(pipelineConfig.getTarget().getType(), pipelineConfig.getTarget().getParameter()));
+ return dataSourceFactory.newInstance(PipelineDataSourceConfigurationFactory.newInstance(pipelineConfig.getTarget().getType(), pipelineConfig.getTarget().getParameter()));
}
protected final void executeTargetTableSQL(final Connection targetConnection, final String sql) throws SQLException {
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/AbstractSingleTableDataCalculator.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/AbstractSingleTableDataCalculator.java
index 3764d1c..e339380 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/AbstractSingleTableDataCalculator.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/AbstractSingleTableDataCalculator.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.core.spi.check.consistency;
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceFactory;
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceWrapper;
import org.apache.shardingsphere.data.pipeline.spi.check.consistency.SingleTableDataCalculator;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
import java.util.Properties;
@@ -33,7 +33,7 @@ public abstract class AbstractSingleTableDataCalculator implements SingleTableDa
private Properties algorithmProps;
- protected final DataSourceWrapper getDataSource(final JDBCDataSourceConfiguration dataSourceConfig) {
+ protected final DataSourceWrapper getDataSource(final PipelineDataSourceConfiguration dataSourceConfig) {
return dataSourceFactory.newInstance(dataSourceConfig);
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
index f209fdd..44c288f 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
@@ -34,7 +34,6 @@ import org.apache.shardingsphere.data.pipeline.core.task.InventoryTask;
import org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker;
import org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer;
import org.apache.shardingsphere.data.pipeline.spi.rulealtered.DataSourcePreparer;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
import org.apache.shardingsphere.scaling.core.job.check.EnvironmentCheckerFactory;
import org.apache.shardingsphere.scaling.core.job.position.PositionInitializerFactory;
@@ -84,9 +83,8 @@ public final class RuleAlteredJobPreparer {
}
private void initDataSourceManager(final DataSourceManager dataSourceManager, final Collection<TaskConfiguration> taskConfigs) {
- for (TaskConfiguration taskConfig : taskConfigs) {
- JDBCDataSourceConfiguration dataSourceConfig = taskConfig.getDumperConfig().getDataSourceConfig();
- dataSourceManager.createSourceDataSource(dataSourceConfig);
+ for (TaskConfiguration each : taskConfigs) {
+ dataSourceManager.createSourceDataSource(each.getDumperConfig().getDataSourceConfig());
}
dataSourceManager.createTargetDataSource(taskConfigs.iterator().next().getImporterConfig().getDataSourceConfig());
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
index 62cd573..27cc850 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
@@ -30,10 +30,10 @@ import org.apache.shardingsphere.data.pipeline.core.execute.FinishedCheckJobExec
import org.apache.shardingsphere.data.pipeline.core.execute.PipelineJobExecutor;
import org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredDetector;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfigurationFactory;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSphereJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlPipelineDataSourceConfiguration;
import org.apache.shardingsphere.infra.config.rulealtered.OnRuleAlteredActionConfiguration;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
@@ -151,14 +151,14 @@ public final class RuleAlteredJobWorker {
* @return YAML root configuration
*/
private static YamlRootConfiguration getYamlRootConfig(final JobConfiguration jobConfig) {
- JDBCDataSourceConfiguration targetDataSourceConfig = JDBCDataSourceConfigurationFactory.newInstance(
+ PipelineDataSourceConfiguration targetDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(
jobConfig.getPipelineConfig().getTarget().getType(), jobConfig.getPipelineConfig().getTarget().getParameter());
- if (targetDataSourceConfig instanceof ShardingSphereJDBCDataSourceConfiguration) {
- return ((ShardingSphereJDBCDataSourceConfiguration) targetDataSourceConfig).getRootConfig();
+ if (targetDataSourceConfig instanceof ShardingSpherePipelineDataSourceConfiguration) {
+ return ((ShardingSpherePipelineDataSourceConfiguration) targetDataSourceConfig).getRootConfig();
}
- JDBCDataSourceConfiguration sourceDataSourceConfig = JDBCDataSourceConfigurationFactory.newInstance(
+ PipelineDataSourceConfiguration sourceDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(
jobConfig.getPipelineConfig().getSource().getType(), jobConfig.getPipelineConfig().getSource().getParameter());
- return ((ShardingSphereJDBCDataSourceConfiguration) sourceDataSourceConfig).getRootConfig();
+ return ((ShardingSpherePipelineDataSourceConfiguration) sourceDataSourceConfig).getRootConfig();
}
/**
@@ -227,14 +227,14 @@ public final class RuleAlteredJobWorker {
private PipelineConfiguration getPipelineConfiguration(final YamlRootConfiguration sourceRootConfig, final YamlRootConfiguration targetRootConfig) {
PipelineConfiguration result = new PipelineConfiguration();
- result.setSource(createYamlJDBCDataSourceConfiguration(sourceRootConfig));
- result.setTarget(createYamlJDBCDataSourceConfiguration(targetRootConfig));
+ result.setSource(createYamlPipelineDataSourceConfiguration(sourceRootConfig));
+ result.setTarget(createYamlPipelineDataSourceConfiguration(targetRootConfig));
return result;
}
- private YamlJDBCDataSourceConfiguration createYamlJDBCDataSourceConfiguration(final YamlRootConfiguration yamlConfig) {
- JDBCDataSourceConfiguration config = new ShardingSphereJDBCDataSourceConfiguration(yamlConfig);
- YamlJDBCDataSourceConfiguration result = new YamlJDBCDataSourceConfiguration();
+ private YamlPipelineDataSourceConfiguration createYamlPipelineDataSourceConfiguration(final YamlRootConfiguration yamlConfig) {
+ PipelineDataSourceConfiguration config = new ShardingSpherePipelineDataSourceConfiguration(yamlConfig);
+ YamlPipelineDataSourceConfiguration result = new YamlPipelineDataSourceConfiguration();
result.setType(config.getType());
result.setParameter(config.getParameter());
return result;
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
index 5c2c06b..dd4db9b 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.scaling.core.job.environment;
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceFactory;
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceWrapper;
import org.apache.shardingsphere.data.pipeline.scenario.rulealtered.RuleAlteredJobContext;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfigurationFactory;
import org.apache.shardingsphere.scaling.core.job.sqlbuilder.ScalingSQLBuilderFactory;
import java.sql.Connection;
@@ -45,7 +45,7 @@ public final class ScalingEnvironmentManager {
// TODO seems it should be removed, dangerous to use
public void resetTargetTable(final RuleAlteredJobContext jobContext) throws SQLException {
Collection<String> tables = jobContext.getTaskConfigs().stream().flatMap(each -> each.getDumperConfig().getTableNameMap().values().stream()).collect(Collectors.toSet());
- try (DataSourceWrapper dataSource = dataSourceFactory.newInstance(JDBCDataSourceConfigurationFactory.newInstance(
+ try (DataSourceWrapper dataSource = dataSourceFactory.newInstance(PipelineDataSourceConfigurationFactory.newInstance(
jobContext.getJobConfig().getPipelineConfig().getTarget().getType(),
jobContext.getJobConfig().getPipelineConfig().getTarget().getParameter()));
Connection connection = dataSource.getConnection()) {
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreator b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreator
similarity index 95%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreator
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreator
index e75d6ef..67f1b79 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreator
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreator
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.data.pipeline.core.datasource.creator.impl.StandardJDBCDataSourceCreator
+org.apache.shardingsphere.data.pipeline.core.datasource.creator.impl.StandardPipelineDataSourceCreator
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/ShardingSphereJDBCDataSourceConfigurationTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/ShardingSpherePipelineDataSourceConfigurationTest.java
similarity index 91%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/ShardingSphereJDBCDataSourceConfigurationTest.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/ShardingSpherePipelineDataSourceConfigurationTest.java
index 7438a40..ddbe64d 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/ShardingSphereJDBCDataSourceConfigurationTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/ShardingSpherePipelineDataSourceConfigurationTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.config.datasource.config.impl;
import com.google.common.collect.ImmutableMap;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSphereJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigurationSwapper;
import org.junit.Test;
@@ -31,11 +31,11 @@ import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class ShardingSphereJDBCDataSourceConfigurationTest {
+public final class ShardingSpherePipelineDataSourceConfigurationTest {
@Test
public void assertAppendJDBCParameters() {
- ShardingSphereJDBCDataSourceConfiguration dataSourceConfig = new ShardingSphereJDBCDataSourceConfiguration(getDataSourceYaml());
+ ShardingSpherePipelineDataSourceConfiguration dataSourceConfig = new ShardingSpherePipelineDataSourceConfiguration(getDataSourceYaml());
dataSourceConfig.appendJDBCParameters(ImmutableMap.<String, String>builder().put("rewriteBatchedStatements", "true").build());
List<DataSourceConfiguration> actual = new ArrayList<>(getDataSourceConfigurations(dataSourceConfig.getRootConfig().getDataSources()).values());
assertThat(actual.get(0).getProps().get("url"), is("jdbc:mysql://192.168.0.2:3306/scaling?rewriteBatchedStatements=true&serverTimezone=UTC&useSSL=false"));
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/StandardJDBCDataSourceConfigurationTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/StandardPipelineDataSourceConfigurationTest.java
similarity index 74%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/StandardJDBCDataSourceConfigurationTest.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/StandardPipelineDataSourceConfigurationTest.java
index f86fae3..f0ac150 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/StandardJDBCDataSourceConfigurationTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/test/java/org/apache/shardingsphere/infra/config/datasource/config/impl/StandardPipelineDataSourceConfigurationTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.config.datasource.config.impl;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.junit.Test;
import java.io.IOException;
@@ -32,12 +32,12 @@ import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class StandardJDBCDataSourceConfigurationTest {
+public final class StandardPipelineDataSourceConfigurationTest {
@Test
public void assertConstructionByParameter() {
String parameter = readFileAndIgnoreComments("config_standard_jdbc_target.yaml");
- new StandardJDBCDataSourceConfiguration(parameter);
+ new StandardPipelineDataSourceConfiguration(parameter);
}
/**
@@ -54,8 +54,9 @@ public final class StandardJDBCDataSourceConfigurationTest {
@Test
public void assertAppendJDBCParameters() {
- StandardJDBCDataSourceConfiguration dataSourceConfig = new StandardJDBCDataSourceConfiguration("jdbc:mysql://192.168.0.1:3306/scaling?serverTimezone=UTC&useSSL=false", null, null);
- dataSourceConfig.appendJDBCParameters(ImmutableMap.<String, String>builder().put("rewriteBatchedStatements", "true").build());
- assertThat(dataSourceConfig.getHikariConfig().getJdbcUrl(), is("jdbc:mysql://192.168.0.1:3306/scaling?rewriteBatchedStatements=true&serverTimezone=UTC&useSSL=false"));
+ StandardPipelineDataSourceConfiguration pipelineDataSourceConfig = new StandardPipelineDataSourceConfiguration(
+ "jdbc:mysql://192.168.0.1:3306/scaling?serverTimezone=UTC&useSSL=false", null, null);
+ pipelineDataSourceConfig.appendJDBCParameters(ImmutableMap.<String, String>builder().put("rewriteBatchedStatements", "true").build());
+ assertThat(pipelineDataSourceConfig.getHikariConfig().getJdbcUrl(), is("jdbc:mysql://192.168.0.1:3306/scaling?rewriteBatchedStatements=true&serverTimezone=UTC&useSSL=false"));
}
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java
index 9199053..b77d2b5 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java
@@ -47,7 +47,7 @@ import org.apache.shardingsphere.data.pipeline.mysql.ingest.column.metadata.MySQ
import org.apache.shardingsphere.data.pipeline.mysql.ingest.column.value.ValueHandler;
import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumper;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import java.io.Serializable;
@@ -86,7 +86,7 @@ public final class MySQLIncrementalDumper extends AbstractLifecycleExecutor impl
public MySQLIncrementalDumper(final DumperConfiguration dumperConfig, final IngestPosition<BinlogPosition> binlogPosition) {
this.binlogPosition = (BinlogPosition) binlogPosition;
this.dumperConfig = dumperConfig;
- Preconditions.checkArgument(dumperConfig.getDataSourceConfig() instanceof StandardJDBCDataSourceConfiguration, "MySQLBinlogDumper only support StandardJDBCDataSourceConfiguration");
+ Preconditions.checkArgument(dumperConfig.getDataSourceConfig() instanceof StandardPipelineDataSourceConfiguration, "MySQLBinlogDumper only support StandardPipelineDataSourceConfiguration");
columnMetaDataLoader = new MySQLColumnMetaDataLoader(new DataSourceFactory().newInstance(dumperConfig.getDataSourceConfig()));
}
@@ -97,7 +97,7 @@ public final class MySQLIncrementalDumper extends AbstractLifecycleExecutor impl
}
private void dump() {
- HikariConfig hikariConfig = ((StandardJDBCDataSourceConfiguration) dumperConfig.getDataSourceConfig()).getHikariConfig();
+ HikariConfig hikariConfig = ((StandardPipelineDataSourceConfiguration) dumperConfig.getDataSourceConfig()).getHikariConfig();
log.info("incremental dump, jdbcUrl={}", hikariConfig.getJdbcUrl());
JdbcUri uri = new JdbcUri(hikariConfig.getJdbcUrl());
MySQLClient client = new MySQLClient(new ConnectInfo(random.nextInt(), uri.getHostname(), uri.getPort(), hikariConfig.getUsername(), hikariConfig.getPassword()));
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/importer/MySQLImporterTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/importer/MySQLImporterTest.java
index 0fb63e5..0a8f755 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/importer/MySQLImporterTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/importer/MySQLImporterTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column;
import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord;
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager;
import org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.BinlogPosition;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -46,7 +46,7 @@ public final class MySQLImporterTest {
@Test
public void assertCreateSqlBuilder() {
- when(importerConfig.getDataSourceConfig()).thenReturn(mock(JDBCDataSourceConfiguration.class));
+ when(importerConfig.getDataSourceConfig()).thenReturn(mock(PipelineDataSourceConfiguration.class));
MySQLImporter mysqlImporter = new MySQLImporter(importerConfig, dataSourceManager);
String insertSQL = mysqlImporter.createSQLBuilder(Collections.emptyMap()).buildInsertSQL(mockDataRecord());
assertThat(insertSQL, is("INSERT INTO `t_order`(`id`,`name`) VALUES(?,?) ON DUPLICATE KEY UPDATE `name`=VALUES(`name`)"));
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
index 7fdae85..0de0a1a 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.event.Placeho
import org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.event.UpdateRowsEvent;
import org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.event.WriteRowsEvent;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
@@ -71,7 +71,7 @@ public final class MySQLIncrementalDumperTest {
private DumperConfiguration mockDumperConfiguration() {
DumperConfiguration result = new DumperConfiguration();
- result.setDataSourceConfig(new StandardJDBCDataSourceConfiguration(URL, "root", "root"));
+ result.setDataSourceConfig(new StandardPipelineDataSourceConfiguration(URL, "root", "root"));
Map<String, String> tableNameMap = new HashedMap<>(1);
tableNameMap.put("t_order", "t_order");
result.setTableNameMap(tableNameMap);
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLJdbcDumperTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLJdbcDumperTest.java
index c124a1b..b4048da 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLJdbcDumperTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLJdbcDumperTest.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.data.pipeline.api.config.ingest.DumperConfiguration;
import org.apache.shardingsphere.data.pipeline.api.config.ingest.InventoryDumperConfiguration;
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -67,7 +67,7 @@ public final class MySQLJdbcDumperTest {
private DumperConfiguration mockDumperConfiguration() {
DumperConfiguration result = new DumperConfiguration();
- result.setDataSourceConfig(new StandardJDBCDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL", "root", "root"));
+ result.setDataSourceConfig(new StandardPipelineDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL", "root", "root"));
return result;
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparerTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparerTest.java
index fc3e992..52ca78c 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparerTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparerTest.java
@@ -21,9 +21,9 @@ import org.apache.shardingsphere.data.pipeline.api.config.rulealtered.PipelineCo
import org.apache.shardingsphere.data.pipeline.api.datanode.JobDataNodeLine;
import org.apache.shardingsphere.data.pipeline.api.prepare.datasource.PrepareTargetTablesParameter;
import org.apache.shardingsphere.data.pipeline.core.exception.PipelineJobPrepareFailedException;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSphereJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreatorFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlPipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreatorFactory;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -49,16 +49,16 @@ public final class MySQLDataSourcePreparerTest {
private PipelineConfiguration pipelineConfig;
@Mock
- private YamlJDBCDataSourceConfiguration sourceYamlJDBCDataSourceConfiguration;
+ private YamlPipelineDataSourceConfiguration sourceYamlPipelineDataSourceConfiguration;
@Mock
- private YamlJDBCDataSourceConfiguration targetYamlJDBCDataSourceConfiguration;
+ private YamlPipelineDataSourceConfiguration targetYamlPipelineDataSourceConfiguration;
@Mock
- private ShardingSphereJDBCDataSourceConfiguration sourceScalingDataSourceConfig;
+ private ShardingSpherePipelineDataSourceConfiguration sourceScalingDataSourceConfig;
@Mock
- private ShardingSphereJDBCDataSourceConfiguration targetScalingDataSourceConfig;
+ private ShardingSpherePipelineDataSourceConfiguration targetScalingDataSourceConfig;
@Mock(extraInterfaces = AutoCloseable.class)
private DataSource sourceDataSource;
@@ -70,12 +70,12 @@ public final class MySQLDataSourcePreparerTest {
public void setUp() throws SQLException {
when(prepareTargetTablesParameter.getPipelineConfiguration()).thenReturn(pipelineConfig);
when(prepareTargetTablesParameter.getTablesFirstDataNodes()).thenReturn(new JobDataNodeLine(Collections.emptyList()));
- when(pipelineConfig.getSource()).thenReturn(sourceYamlJDBCDataSourceConfiguration);
- when(JDBCDataSourceCreatorFactory.getInstance(
- sourceScalingDataSourceConfig.getType()).createDataSource(sourceScalingDataSourceConfig.getDataSourceConfiguration())).thenReturn(sourceDataSource);
- when(pipelineConfig.getTarget()).thenReturn(targetYamlJDBCDataSourceConfiguration);
- when(JDBCDataSourceCreatorFactory.getInstance(
- targetScalingDataSourceConfig.getType()).createDataSource(targetScalingDataSourceConfig.getDataSourceConfiguration())).thenReturn(targetDataSource);
+ when(pipelineConfig.getSource()).thenReturn(sourceYamlPipelineDataSourceConfiguration);
+ when(PipelineDataSourceCreatorFactory.getInstance(
+ sourceScalingDataSourceConfig.getType()).createPipelineDataSource(sourceScalingDataSourceConfig.getDataSourceConfiguration())).thenReturn(sourceDataSource);
+ when(pipelineConfig.getTarget()).thenReturn(targetYamlPipelineDataSourceConfiguration);
+ when(PipelineDataSourceCreatorFactory.getInstance(
+ targetScalingDataSourceConfig.getType()).createPipelineDataSource(targetScalingDataSourceConfig.getDataSourceConfiguration())).thenReturn(targetDataSource);
}
@Test
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWalDumper.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWalDumper.java
index 3d370df..6380e20 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWalDumper.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWalDumper.java
@@ -39,8 +39,8 @@ import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.Deco
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.AbstractWalEvent;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.PlaceholderEvent;
import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumper;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreatorFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreatorFactory;
import org.opengauss.jdbc.PgConnection;
import org.opengauss.replication.PGReplicationStream;
@@ -70,8 +70,8 @@ public final class OpenGaussWalDumper extends AbstractLifecycleExecutor implemen
public OpenGaussWalDumper(final DumperConfiguration dumperConfig, final IngestPosition<WalPosition> position) {
walPosition = (WalPosition) position;
- if (!StandardJDBCDataSourceConfiguration.class.equals(dumperConfig.getDataSourceConfig().getClass())) {
- throw new UnsupportedOperationException("PostgreSQLWalDumper only support JDBCDataSourceConfiguration");
+ if (!StandardPipelineDataSourceConfiguration.class.equals(dumperConfig.getDataSourceConfig().getClass())) {
+ throw new UnsupportedOperationException("PostgreSQLWalDumper only support PipelineDataSourceConfiguration");
}
this.dumperConfig = dumperConfig;
walEventConverter = new WalEventConverter(dumperConfig);
@@ -85,17 +85,16 @@ public final class OpenGaussWalDumper extends AbstractLifecycleExecutor implemen
private PgConnection getReplicationConn() throws SQLException {
return logicalReplication
- .createPgConnection((StandardJDBCDataSourceConfiguration) dumperConfig.getDataSourceConfig())
+ .createPgConnection((StandardPipelineDataSourceConfiguration) dumperConfig.getDataSourceConfig())
.unwrap(PgConnection.class);
}
private MppdbDecodingPlugin initReplication() {
MppdbDecodingPlugin plugin = null;
try {
-
- DataSource dataSource = JDBCDataSourceCreatorFactory.getInstance(
- dumperConfig.getDataSourceConfig().getType()).createDataSource(dumperConfig.getDataSourceConfig().getDataSourceConfiguration());
- try (Connection conn = dataSource.getConnection()) {
+ DataSource pipelineDataSource = PipelineDataSourceCreatorFactory.getInstance(
+ dumperConfig.getDataSourceConfig().getType()).createPipelineDataSource(dumperConfig.getDataSourceConfig().getDataSourceConfiguration());
+ try (Connection conn = pipelineDataSource.getConnection()) {
slotName = OpenGaussLogicalReplication.getUniqueSlotName(conn);
OpenGaussLogicalReplication.createIfNotExists(conn);
OpenGaussTimestampUtils utils = new OpenGaussTimestampUtils(conn.unwrap(PgConnection.class).getTimestampUtils());
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
index 418c70d..7bde210 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.data.pipeline.opengauss.ingest.wal;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.BaseLogSequenceNumber;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.opengauss.PGProperty;
import org.opengauss.jdbc.PgConnection;
import org.opengauss.replication.LogSequenceNumber;
@@ -47,22 +47,22 @@ public final class OpenGaussLogicalReplication {
/**
* Create OpenGauss connection.
*
- * @param jdbcDataSourceConfig JDBC data source configuration
+ * @param pipelineDataSourceConfig pipeline data source configuration
* @return OpenGauss connection
* @throws SQLException SQL exception
*/
- public Connection createPgConnection(final StandardJDBCDataSourceConfiguration jdbcDataSourceConfig) throws SQLException {
- return createConnection(jdbcDataSourceConfig);
+ public Connection createPgConnection(final StandardPipelineDataSourceConfiguration pipelineDataSourceConfig) throws SQLException {
+ return createConnection(pipelineDataSourceConfig);
}
- private Connection createConnection(final StandardJDBCDataSourceConfiguration jdbcDataSourceConfig) throws SQLException {
+ private Connection createConnection(final StandardPipelineDataSourceConfiguration pipelineDataSourceConfig) throws SQLException {
Properties props = new Properties();
- PGProperty.USER.set(props, jdbcDataSourceConfig.getHikariConfig().getUsername());
- PGProperty.PASSWORD.set(props, jdbcDataSourceConfig.getHikariConfig().getPassword());
+ PGProperty.USER.set(props, pipelineDataSourceConfig.getHikariConfig().getUsername());
+ PGProperty.PASSWORD.set(props, pipelineDataSourceConfig.getHikariConfig().getPassword());
PGProperty.ASSUME_MIN_SERVER_VERSION.set(props, "9.4");
PGProperty.REPLICATION.set(props, "database");
PGProperty.PREFER_QUERY_MODE.set(props, "simple");
- return DriverManager.getConnection(jdbcDataSourceConfig.getHikariConfig().getJdbcUrl(), props);
+ return DriverManager.getConnection(pipelineDataSourceConfig.getHikariConfig().getJdbcUrl(), props);
}
/**
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java
index 6b8fded..bd34c76 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java
@@ -26,8 +26,8 @@ import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceWrapper;
import org.apache.shardingsphere.data.pipeline.core.exception.PipelineJobPrepareFailedException;
import org.apache.shardingsphere.data.pipeline.core.prepare.datasource.AbstractDataSourcePreparer;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfigurationFactory;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSphereJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
import org.apache.shardingsphere.infra.datanode.DataNode;
import java.sql.Connection;
@@ -75,13 +75,13 @@ public final class OpenGaussDataSourcePreparer extends AbstractDataSourcePrepare
private Collection<ActualTableDefinition> getActualTableDefinitions(final PrepareTargetTablesParameter parameter) throws SQLException {
Collection<ActualTableDefinition> result = new ArrayList<>();
- ShardingSphereJDBCDataSourceConfiguration sourceConfig = (ShardingSphereJDBCDataSourceConfiguration) JDBCDataSourceConfigurationFactory.newInstance(
+ ShardingSpherePipelineDataSourceConfiguration sourceDataSourceConfig = (ShardingSpherePipelineDataSourceConfiguration) PipelineDataSourceConfigurationFactory.newInstance(
parameter.getPipelineConfiguration().getSource().getType(), parameter.getPipelineConfiguration().getSource().getParameter());
try (DataSourceManager dataSourceManager = new DataSourceManager()) {
for (JobDataNodeEntry each : parameter.getTablesFirstDataNodes().getEntries()) {
DataNode dataNode = each.getDataNodes().get(0);
// Keep dataSource to reuse
- DataSourceWrapper dataSource = dataSourceManager.getDataSource(sourceConfig.getActualDataSourceConfig(dataNode.getDataSourceName()));
+ DataSourceWrapper dataSource = dataSourceManager.getDataSource(sourceDataSourceConfig.getActualDataSourceConfig(dataNode.getDataSourceName()));
try (Connection sourceConnection = dataSource.getConnection()) {
String actualTableName = dataNode.getTableName();
int oid = queryTableOid(sourceConnection, actualTableName);
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumper.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumper.java
index 87c5add..aba9e34 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumper.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumper.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.Test
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.AbstractWalEvent;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.PlaceholderEvent;
import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumper;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.postgresql.jdbc.PgConnection;
import org.postgresql.replication.PGReplicationStream;
@@ -63,8 +63,8 @@ public final class PostgreSQLWalDumper extends AbstractLifecycleExecutor impleme
public PostgreSQLWalDumper(final DumperConfiguration dumperConfig, final IngestPosition<WalPosition> position) {
walPosition = (WalPosition) position;
- if (!StandardJDBCDataSourceConfiguration.class.equals(dumperConfig.getDataSourceConfig().getClass())) {
- throw new UnsupportedOperationException("PostgreSQLWalDumper only support JDBCDataSourceConfiguration");
+ if (!StandardPipelineDataSourceConfiguration.class.equals(dumperConfig.getDataSourceConfig().getClass())) {
+ throw new UnsupportedOperationException("PostgreSQLWalDumper only support PipelineDataSourceConfiguration");
}
this.dumperConfig = dumperConfig;
walEventConverter = new WalEventConverter(dumperConfig);
@@ -77,9 +77,9 @@ public final class PostgreSQLWalDumper extends AbstractLifecycleExecutor impleme
}
private void dump() {
- try (Connection pgConnection = logicalReplication.createPgConnection((StandardJDBCDataSourceConfiguration) dumperConfig.getDataSourceConfig());
- PGReplicationStream stream = logicalReplication.createReplicationStream(pgConnection, PostgreSQLPositionInitializer.getUniqueSlotName(pgConnection), walPosition.getLogSequenceNumber())) {
- PostgreSQLTimestampUtils utils = new PostgreSQLTimestampUtils(pgConnection.unwrap(PgConnection.class).getTimestampUtils());
+ try (Connection connection = logicalReplication.createConnection((StandardPipelineDataSourceConfiguration) dumperConfig.getDataSourceConfig());
+ PGReplicationStream stream = logicalReplication.createReplicationStream(connection, PostgreSQLPositionInitializer.getUniqueSlotName(connection), walPosition.getLogSequenceNumber())) {
+ PostgreSQLTimestampUtils utils = new PostgreSQLTimestampUtils(connection.unwrap(PgConnection.class).getTimestampUtils());
DecodingPlugin decodingPlugin = new TestDecodingPlugin(utils);
while (isRunning()) {
ByteBuffer message = stream.readPending();
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplication.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplication.java
index 61c6d26..39e6dd4 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplication.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplication.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.BaseLogSequenceNumber;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.postgresql.PGConnection;
import org.postgresql.PGProperty;
import org.postgresql.replication.LogSequenceNumber;
@@ -35,37 +35,33 @@ import java.util.Properties;
public final class LogicalReplication {
/**
- * Create PostgreSQL connection.
+ * Create connection.
*
- * @param jdbcDataSourceConfig JDBC data source configuration
+ * @param pipelineDataSourceConfig pipeline data source configuration
* @return PostgreSQL connection
* @throws SQLException SQL exception
*/
- public Connection createPgConnection(final StandardJDBCDataSourceConfiguration jdbcDataSourceConfig) throws SQLException {
- return createConnection(jdbcDataSourceConfig);
- }
-
- private Connection createConnection(final StandardJDBCDataSourceConfiguration jdbcDataSourceConfig) throws SQLException {
+ public Connection createConnection(final StandardPipelineDataSourceConfiguration pipelineDataSourceConfig) throws SQLException {
Properties props = new Properties();
- PGProperty.USER.set(props, jdbcDataSourceConfig.getHikariConfig().getUsername());
- PGProperty.PASSWORD.set(props, jdbcDataSourceConfig.getHikariConfig().getPassword());
+ PGProperty.USER.set(props, pipelineDataSourceConfig.getHikariConfig().getUsername());
+ PGProperty.PASSWORD.set(props, pipelineDataSourceConfig.getHikariConfig().getPassword());
PGProperty.ASSUME_MIN_SERVER_VERSION.set(props, "9.6");
PGProperty.REPLICATION.set(props, "database");
PGProperty.PREFER_QUERY_MODE.set(props, "simple");
- return DriverManager.getConnection(jdbcDataSourceConfig.getHikariConfig().getJdbcUrl(), props);
+ return DriverManager.getConnection(pipelineDataSourceConfig.getHikariConfig().getJdbcUrl(), props);
}
/**
* Create PostgreSQL replication stream.
*
- * @param pgConnection PostgreSQL connection
+ * @param connection connection
* @param slotName slot name
* @param startPosition start position
* @return replication stream
* @throws SQLException SQL exception
*/
- public PGReplicationStream createReplicationStream(final Connection pgConnection, final String slotName, final BaseLogSequenceNumber startPosition) throws SQLException {
- return pgConnection.unwrap(PGConnection.class).getReplicationAPI()
+ public PGReplicationStream createReplicationStream(final Connection connection, final String slotName, final BaseLogSequenceNumber startPosition) throws SQLException {
+ return connection.unwrap(PGConnection.class).getReplicationAPI()
.replicationStream()
.logical()
.withStartPosition((LogSequenceNumber) startPosition.get())
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLJdbcDumperTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLJdbcDumperTest.java
index 165b4d2..294d032 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLJdbcDumperTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLJdbcDumperTest.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.data.pipeline.api.config.ingest.DumperConfiguration;
import org.apache.shardingsphere.data.pipeline.api.config.ingest.InventoryDumperConfiguration;
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
@@ -76,7 +76,7 @@ public final class PostgreSQLJdbcDumperTest {
private DumperConfiguration mockDumperConfiguration() {
DumperConfiguration result = new DumperConfiguration();
- result.setDataSourceConfig(new StandardJDBCDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root"));
+ result.setDataSourceConfig(new StandardPipelineDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root"));
return result;
}
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumperTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumperTest.java
index e2e7621..06e872f 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumperTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumperTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.data.pipeline.core.util.ReflectionUtil;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.LogicalReplication;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.WalPosition;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.PostgreSQLLogSequenceNumber;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -62,7 +62,7 @@ public final class PostgreSQLWalDumperTest {
private PostgreSQLWalDumper walDumper;
- private StandardJDBCDataSourceConfiguration jdbcDataSourceConfig;
+ private StandardPipelineDataSourceConfiguration pipelineDataSourceConfig;
private MemoryChannel channel;
@@ -87,9 +87,9 @@ public final class PostgreSQLWalDumperTest {
} catch (final SQLException e) {
throw new RuntimeException("Init table failed", e);
}
- jdbcDataSourceConfig = new StandardJDBCDataSourceConfiguration(jdbcUrl, username, password);
+ pipelineDataSourceConfig = new StandardPipelineDataSourceConfiguration(jdbcUrl, username, password);
DumperConfiguration result = new DumperConfiguration();
- result.setDataSourceConfig(jdbcDataSourceConfig);
+ result.setDataSourceConfig(pipelineDataSourceConfig);
Map<String, String> tableNameMap = new HashMap<>();
tableNameMap.put("t_order_0", "t_order");
result.setTableNameMap(tableNameMap);
@@ -100,7 +100,7 @@ public final class PostgreSQLWalDumperTest {
public void assertStart() throws SQLException, NoSuchFieldException, IllegalAccessException {
try {
ReflectionUtil.setFieldValue(walDumper, "logicalReplication", logicalReplication);
- when(logicalReplication.createPgConnection(jdbcDataSourceConfig)).thenReturn(pgConnection);
+ when(logicalReplication.createConnection(pipelineDataSourceConfig)).thenReturn(pgConnection);
when(pgConnection.unwrap(PgConnection.class)).thenReturn(pgConnection);
when(logicalReplication.createReplicationStream(pgConnection, PostgreSQLPositionInitializer.getUniqueSlotName(pgConnection), position.getLogSequenceNumber()))
.thenReturn(pgReplicationStream);
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplicationTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplicationTest.java
index 34d045d..c34f076 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplicationTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplicationTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal;
import lombok.SneakyThrows;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.BaseLogSequenceNumber;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.PostgreSQLLogSequenceNumber;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.when;
public final class LogicalReplicationTest {
@Mock
- private PgConnection pgConnection;
+ private PgConnection connection;
@Mock
private PGReplicationConnection pgReplicationConnection;
@@ -66,30 +66,30 @@ public final class LogicalReplicationTest {
@Test
public void assertCreatePgConnectionSuccess() throws SQLException {
- Connection pgConnection = logicalReplication.createPgConnection(
- new StandardJDBCDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root"));
- assertFalse(pgConnection.isClosed());
+ Connection connection = logicalReplication.createConnection(
+ new StandardPipelineDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root"));
+ assertFalse(connection.isClosed());
}
@Test
public void assertCreateReplicationStreamSuccess() throws SQLException {
LogSequenceNumber startPosition = LogSequenceNumber.valueOf(100L);
- when(pgConnection.unwrap(PGConnection.class)).thenReturn(pgConnection);
- when(pgConnection.getReplicationAPI()).thenReturn(pgReplicationConnection);
+ when(connection.unwrap(PGConnection.class)).thenReturn(connection);
+ when(connection.getReplicationAPI()).thenReturn(pgReplicationConnection);
when(pgReplicationConnection.replicationStream()).thenReturn(chainedStreamBuilder);
when(chainedStreamBuilder.logical()).thenReturn(chainedLogicalStreamBuilder);
when(chainedLogicalStreamBuilder.withStartPosition(startPosition)).thenReturn(chainedLogicalStreamBuilder);
when(chainedLogicalStreamBuilder.withSlotName("")).thenReturn(chainedLogicalStreamBuilder);
when(chainedLogicalStreamBuilder.withSlotOption(anyString(), eq(true))).thenReturn(chainedLogicalStreamBuilder, chainedLogicalStreamBuilder);
BaseLogSequenceNumber basePosition = new PostgreSQLLogSequenceNumber(startPosition);
- logicalReplication.createReplicationStream(pgConnection, "", basePosition);
+ logicalReplication.createReplicationStream(connection, "", basePosition);
verify(chainedLogicalStreamBuilder).start();
}
@Test(expected = SQLException.class)
@SneakyThrows(SQLException.class)
public void assertCreateReplicationStreamFailure() {
- when(pgConnection.unwrap(PGConnection.class)).thenThrow(new SQLException(""));
- logicalReplication.createReplicationStream(pgConnection, "", new PostgreSQLLogSequenceNumber(LogSequenceNumber.valueOf(100L)));
+ when(connection.unwrap(PGConnection.class)).thenThrow(new SQLException(""));
+ logicalReplication.createReplicationStream(connection, "", new PostgreSQLLogSequenceNumber(LogSequenceNumber.valueOf(100L)));
}
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WalEventConverterTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WalEventConverterTest.java
index 7f0fe61e..a5b983f 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WalEventConverterTest.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WalEventConverterTest.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.Delet
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.PlaceholderEvent;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.UpdateRowEvent;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.WriteRowEvent;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
@@ -57,7 +57,7 @@ public final class WalEventConverterTest {
private DumperConfiguration mockDumperConfiguration() {
DumperConfiguration result = new DumperConfiguration();
- result.setDataSourceConfig(new StandardJDBCDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root"));
+ result.setDataSourceConfig(new StandardPipelineDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root"));
result.setTableNameMap(Collections.singletonMap("t_order", "t_order"));
return result;
}
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java
index c6f7c2f..2cd5fc9 100644
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java
+++ b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java
@@ -22,8 +22,8 @@ import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.data.pipeline.api.config.rulealtered.JobConfiguration;
import org.apache.shardingsphere.data.pipeline.api.config.rulealtered.PipelineConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlPipelineDataSourceConfiguration;
import org.apache.shardingsphere.integration.scaling.test.mysql.env.cases.DataSet;
import org.apache.shardingsphere.integration.scaling.test.mysql.env.cases.Type;
import org.apache.shardingsphere.integration.scaling.test.mysql.env.config.SourceConfiguration;
@@ -82,15 +82,15 @@ public final class ITEnvironmentContext {
private static String createScalingConfiguration(final Map<String, YamlTableRuleConfiguration> tableRules) {
PipelineConfiguration pipelineConfig = new PipelineConfiguration();
- pipelineConfig.setSource(createYamlJDBCDataSourceConfiguration(SourceConfiguration.getDockerConfiguration(tableRules)));
- pipelineConfig.setTarget(createYamlJDBCDataSourceConfiguration(TargetConfiguration.getDockerConfiguration()));
+ pipelineConfig.setSource(createYamlPipelineDataSourceConfiguration(SourceConfiguration.getDockerConfiguration(tableRules)));
+ pipelineConfig.setTarget(createYamlPipelineDataSourceConfiguration(TargetConfiguration.getDockerConfiguration()));
JobConfiguration jobConfig = new JobConfiguration();
jobConfig.setPipelineConfig(pipelineConfig);
return new Gson().toJson(jobConfig);
}
- private static YamlJDBCDataSourceConfiguration createYamlJDBCDataSourceConfiguration(final JDBCDataSourceConfiguration targetConfig) {
- YamlJDBCDataSourceConfiguration result = new YamlJDBCDataSourceConfiguration();
+ private static YamlPipelineDataSourceConfiguration createYamlPipelineDataSourceConfiguration(final PipelineDataSourceConfiguration targetConfig) {
+ YamlPipelineDataSourceConfiguration result = new YamlPipelineDataSourceConfiguration();
result.setType(targetConfig.getType());
result.setParameter(targetConfig.getParameter());
return result;
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
index b38158f..7f9871b 100644
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
+++ b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigu
import org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.integration.scaling.test.mysql.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSphereJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.yaml.config.rule.YamlTableRuleConfiguration;
@@ -51,7 +51,7 @@ public final class SourceConfiguration {
* @param tableRules table rules
* @return sharding jdbc configuration
*/
- public static ShardingSphereJDBCDataSourceConfiguration getDockerConfiguration(final Map<String, YamlTableRuleConfiguration> tableRules) {
+ public static ShardingSpherePipelineDataSourceConfiguration getDockerConfiguration(final Map<String, YamlTableRuleConfiguration> tableRules) {
return getConfiguration(String.format(SOURCE_JDBC_URL, ENGINE_ENV_PROPS.getProperty("db.host.docker")), tableRules);
}
@@ -61,13 +61,13 @@ public final class SourceConfiguration {
* @param tableRules table rules
* @return sharding jdbc configuration
*/
- public static ShardingSphereJDBCDataSourceConfiguration getHostConfiguration(final Map<String, YamlTableRuleConfiguration> tableRules) {
+ public static ShardingSpherePipelineDataSourceConfiguration getHostConfiguration(final Map<String, YamlTableRuleConfiguration> tableRules) {
return getConfiguration(String.format(SOURCE_JDBC_URL, ENGINE_ENV_PROPS.getProperty("db.host.host")), tableRules);
}
- private static ShardingSphereJDBCDataSourceConfiguration getConfiguration(final String jdbcUrl, final Map<String, YamlTableRuleConfiguration> tableRules) {
+ private static ShardingSpherePipelineDataSourceConfiguration getConfiguration(final String jdbcUrl, final Map<String, YamlTableRuleConfiguration> tableRules) {
YamlRootConfiguration rootConfig = getShardingJdbcConfiguration(jdbcUrl, tableRules);
- return new ShardingSphereJDBCDataSourceConfiguration(YamlEngine.marshal(rootConfig));
+ return new ShardingSpherePipelineDataSourceConfiguration(YamlEngine.marshal(rootConfig));
}
private static YamlRootConfiguration getShardingJdbcConfiguration(final String jdbcUrl, final Map<String, YamlTableRuleConfiguration> tableRules) {
@@ -92,9 +92,9 @@ public final class SourceConfiguration {
*/
@SneakyThrows(SQLException.class)
public static DataSource createHostDataSource(final Map<String, YamlTableRuleConfiguration> tableRules) {
- ShardingSphereJDBCDataSourceConfiguration configuration = getHostConfiguration(tableRules);
+ ShardingSpherePipelineDataSourceConfiguration config = getHostConfiguration(tableRules);
return new ShardingSphereDataSource(DefaultSchema.LOGIC_NAME,
- null, new YamlDataSourceConfigurationSwapper().swapToDataSources(configuration.getRootConfig().getDataSources()),
- new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(configuration.getRootConfig().getRules()), null);
+ null, new YamlDataSourceConfigurationSwapper().swapToDataSources(config.getRootConfig().getDataSources()),
+ new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(config.getRootConfig().getRules()), null);
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
index 8bbb413..a3479bc 100644
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
+++ b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.integration.scaling.test.mysql.env.config;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.shardingsphere.integration.scaling.test.mysql.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import javax.sql.DataSource;
import java.util.Properties;
@@ -34,34 +34,33 @@ public final class TargetConfiguration {
private static final Properties ENGINE_ENV_PROPS = IntegrationTestEnvironment.getInstance().getEngineEnvProps();
/**
- * Get docker standard jdbc configuration.
+ * Get docker standard pipeline configuration.
*
- * @return standard jdbc configuration
+ * @return standard pipeline configuration
*/
- public static StandardJDBCDataSourceConfiguration getDockerConfiguration() {
+ public static StandardPipelineDataSourceConfiguration getDockerConfiguration() {
return getConfiguration(ENGINE_ENV_PROPS.getProperty("db.host.docker"));
}
/**
- * Get host standard jdbc configuration.
+ * Get host standard pipeline configuration.
*
- * @return standard jdbc configuration
+ * @return standard pipeline configuration
*/
- public static StandardJDBCDataSourceConfiguration getHostConfiguration() {
+ public static StandardPipelineDataSourceConfiguration getHostConfiguration() {
return getConfiguration(ENGINE_ENV_PROPS.getProperty("db.host.host"));
}
- private static StandardJDBCDataSourceConfiguration getConfiguration(final String host) {
- return new StandardJDBCDataSourceConfiguration(String.format(TARGET_JDBC_URL, host), ENGINE_ENV_PROPS.getProperty("db.username"), ENGINE_ENV_PROPS.getProperty("db.password"));
+ private static StandardPipelineDataSourceConfiguration getConfiguration(final String host) {
+ return new StandardPipelineDataSourceConfiguration(String.format(TARGET_JDBC_URL, host), ENGINE_ENV_PROPS.getProperty("db.username"), ENGINE_ENV_PROPS.getProperty("db.password"));
}
/**
- * Create host standard jdbc data source.
+ * Create host standard pipeline data source.
*
* @return data source
*/
public static DataSource createHostDataSource() {
- StandardJDBCDataSourceConfiguration configuration = TargetConfiguration.getHostConfiguration();
- return new HikariDataSource(configuration.getHikariConfig());
+ return new HikariDataSource(TargetConfiguration.getHostConfiguration().getHikariConfig());
}
}
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/api/impl/PipelineJobAPIImplTest.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/api/impl/PipelineJobAPIImplTest.java
index 5fe5f70..eeacd51 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/api/impl/PipelineJobAPIImplTest.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/api/impl/PipelineJobAPIImplTest.java
@@ -31,9 +31,9 @@ import org.apache.shardingsphere.data.pipeline.core.fixture.EmbedTestingServer;
import org.apache.shardingsphere.data.pipeline.core.fixture.FixtureDataConsistencyCheckAlgorithm;
import org.apache.shardingsphere.data.pipeline.core.util.ResourceUtil;
import org.apache.shardingsphere.data.pipeline.core.util.RuleAlteredContextUtil;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfigurationFactory;
-import org.apache.shardingsphere.data.pipeline.core.datasource.creator.JDBCDataSourceCreatorFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreatorFactory;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -193,14 +193,14 @@ public final class PipelineJobAPIImplTest {
@SneakyThrows(SQLException.class)
private void initTableData(final PipelineConfiguration pipelineConfig) {
- JDBCDataSourceConfiguration sourceConfig = JDBCDataSourceConfigurationFactory.newInstance(pipelineConfig.getSource().getType(), pipelineConfig.getSource().getParameter());
- initTableData(JDBCDataSourceCreatorFactory.getInstance(sourceConfig.getType()).createDataSource(sourceConfig.getDataSourceConfiguration()));
- JDBCDataSourceConfiguration targetConfig = JDBCDataSourceConfigurationFactory.newInstance(pipelineConfig.getTarget().getType(), pipelineConfig.getTarget().getParameter());
- initTableData(JDBCDataSourceCreatorFactory.getInstance(targetConfig.getType()).createDataSource(targetConfig.getDataSourceConfiguration()));
+ PipelineDataSourceConfiguration sourceDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(pipelineConfig.getSource().getType(), pipelineConfig.getSource().getParameter());
+ initTableData(PipelineDataSourceCreatorFactory.getInstance(sourceDataSourceConfig.getType()).createPipelineDataSource(sourceDataSourceConfig.getDataSourceConfiguration()));
+ PipelineDataSourceConfiguration targetDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(pipelineConfig.getTarget().getType(), pipelineConfig.getTarget().getParameter());
+ initTableData(PipelineDataSourceCreatorFactory.getInstance(targetDataSourceConfig.getType()).createPipelineDataSource(targetDataSourceConfig.getDataSourceConfiguration()));
}
- private void initTableData(final DataSource dataSource) throws SQLException {
- try (Connection connection = dataSource.getConnection();
+ private void initTableData(final DataSource pipelineDataSource) throws SQLException {
+ try (Connection connection = pipelineDataSource.getConnection();
Statement statement = connection.createStatement()) {
statement.execute("DROP TABLE IF EXISTS t_order");
statement.execute("CREATE TABLE t_order (id INT PRIMARY KEY, user_id VARCHAR(12))");
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImplTest.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImplTest.java
index 7a830ea..5601bde 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImplTest.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImplTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager
import org.apache.shardingsphere.data.pipeline.core.fixture.FixtureDataConsistencyCheckAlgorithm;
import org.apache.shardingsphere.data.pipeline.core.util.ResourceUtil;
import org.apache.shardingsphere.data.pipeline.scenario.rulealtered.RuleAlteredJobContext;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
import org.apache.shardingsphere.scaling.core.job.check.EnvironmentCheckerFactory;
import org.junit.Test;
@@ -57,7 +57,7 @@ public final class DataConsistencyCheckerImplTest {
}
@SneakyThrows(SQLException.class)
- private void initTableData(final JDBCDataSourceConfiguration dataSourceConfig) {
+ private void initTableData(final PipelineDataSourceConfiguration dataSourceConfig) {
DataSource dataSource = new DataSourceManager().getDataSource(dataSourceConfig);
try (Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManagerTest.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManagerTest.java
index d898160..d2f7e15 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManagerTest.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManagerTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.core.datasource;
import org.apache.shardingsphere.data.pipeline.api.config.rulealtered.JobConfiguration;
import org.apache.shardingsphere.data.pipeline.core.util.ReflectionUtil;
import org.apache.shardingsphere.data.pipeline.core.util.ResourceUtil;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfigurationFactory;
import org.junit.Before;
import org.junit.Test;
@@ -46,7 +46,7 @@ public final class DataSourceManagerTest {
public void assertGetDataSource() {
DataSourceManager dataSourceManager = new DataSourceManager();
DataSource actual = dataSourceManager.getDataSource(
- JDBCDataSourceConfigurationFactory.newInstance(jobConfig.getPipelineConfig().getSource().getType(), jobConfig.getPipelineConfig().getSource().getParameter()));
+ PipelineDataSourceConfigurationFactory.newInstance(jobConfig.getPipelineConfig().getSource().getType(), jobConfig.getPipelineConfig().getSource().getParameter()));
assertThat(actual, instanceOf(DataSourceWrapper.class));
}
@@ -54,9 +54,9 @@ public final class DataSourceManagerTest {
public void assertClose() throws NoSuchFieldException, IllegalAccessException {
try (DataSourceManager dataSourceManager = new DataSourceManager()) {
dataSourceManager.createSourceDataSource(
- JDBCDataSourceConfigurationFactory.newInstance(jobConfig.getPipelineConfig().getSource().getType(), jobConfig.getPipelineConfig().getSource().getParameter()));
+ PipelineDataSourceConfigurationFactory.newInstance(jobConfig.getPipelineConfig().getSource().getType(), jobConfig.getPipelineConfig().getSource().getParameter()));
dataSourceManager.createTargetDataSource(
- JDBCDataSourceConfigurationFactory.newInstance(jobConfig.getPipelineConfig().getTarget().getType(), jobConfig.getPipelineConfig().getTarget().getParameter()));
+ PipelineDataSourceConfigurationFactory.newInstance(jobConfig.getPipelineConfig().getTarget().getType(), jobConfig.getPipelineConfig().getTarget().getParameter()));
Map<?, ?> cachedDataSources = ReflectionUtil.getFieldValue(dataSourceManager, "cachedDataSources", Map.class);
assertNotNull(cachedDataSources);
assertThat(cachedDataSources.size(), is(2));
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/importer/AbstractImporterTest.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/importer/AbstractImporterTest.java
index 4a603a1..a3a0809 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/importer/AbstractImporterTest.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/importer/AbstractImporterTest.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager
import org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceWrapper;
import org.apache.shardingsphere.data.pipeline.core.record.RecordUtil;
import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.PipelineSQLBuilder;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -70,7 +70,7 @@ public final class AbstractImporterTest {
private PipelineSQLBuilder pipelineSqlBuilder;
@Mock
- private JDBCDataSourceConfiguration dataSourceConfig;
+ private PipelineDataSourceConfiguration dataSourceConfig;
@Mock
private Channel channel;
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/ResourceUtil.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/ResourceUtil.java
index cea0e1b..1ee20d8 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/ResourceUtil.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/ResourceUtil.java
@@ -23,10 +23,10 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shardingsphere.data.pipeline.api.config.rulealtered.JobConfiguration;
import org.apache.shardingsphere.data.pipeline.api.config.rulealtered.PipelineConfiguration;
import org.apache.shardingsphere.data.pipeline.api.config.rulealtered.WorkflowConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.JDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSphereJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardJDBCDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlJDBCDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.impl.StandardPipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.core.datasource.config.yaml.YamlPipelineDataSourceConfiguration;
import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
import java.io.IOException;
@@ -63,14 +63,14 @@ public final class ResourceUtil {
result.setWorkflowConfig(workflowConfig);
PipelineConfiguration pipelineConfig = new PipelineConfiguration();
result.setPipelineConfig(pipelineConfig);
- pipelineConfig.setSource(createYamlJDBCDataSourceConfiguration(new ShardingSphereJDBCDataSourceConfiguration(readFileToString("/config_sharding_sphere_jdbc_source.yaml"))));
- pipelineConfig.setTarget(createYamlJDBCDataSourceConfiguration(new StandardJDBCDataSourceConfiguration(readFileToString("/config_standard_jdbc_target.yaml"))));
+ pipelineConfig.setSource(createYamlPipelineDataSourceConfiguration(new ShardingSpherePipelineDataSourceConfiguration(readFileToString("/config_sharding_sphere_jdbc_source.yaml"))));
+ pipelineConfig.setTarget(createYamlPipelineDataSourceConfiguration(new StandardPipelineDataSourceConfiguration(readFileToString("/config_standard_jdbc_target.yaml"))));
result.buildHandleConfig();
return result;
}
- private static YamlJDBCDataSourceConfiguration createYamlJDBCDataSourceConfiguration(final JDBCDataSourceConfiguration config) {
- YamlJDBCDataSourceConfiguration result = new YamlJDBCDataSourceConfiguration();
+ private static YamlPipelineDataSourceConfiguration createYamlPipelineDataSourceConfiguration(final PipelineDataSourceConfiguration config) {
+ YamlPipelineDataSourceConfiguration result = new YamlPipelineDataSourceConfiguration();
result.setType(config.getType());
result.setParameter(config.getParameter());
return result;