You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/04/11 02:24:34 UTC
[shardingsphere] branch master updated: Decouple RuleAlteredJobConfigurationPreparer and SingletonSPI (#16722)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 2a144cc4716 Decouple RuleAlteredJobConfigurationPreparer and SingletonSPI (#16722)
2a144cc4716 is described below
commit 2a144cc4716c0601989b4bba6ae2f1225e09d7aa
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Apr 11 10:24:25 2022 +0800
Decouple RuleAlteredJobConfigurationPreparer and SingletonSPI (#16722)
---
.../scenario/rulealtered/RuleAlteredJobWorker.java | 16 ++------
.../api/config/rulealtered/JobConfiguration.java | 11 +-----
.../RuleAlteredJobConfigurationPreparer.java | 3 +-
...RuleAlteredJobConfigurationPreparerFactory.java | 44 ++++++++++++++++++++++
4 files changed, 51 insertions(+), 23 deletions(-)
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 5489e4763cc..baf115eab29 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
@@ -40,7 +40,7 @@ import org.apache.shardingsphere.data.pipeline.core.execute.PipelineJobExecutor;
import org.apache.shardingsphere.data.pipeline.core.lock.PipelineSimpleLock;
import org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredDetector;
import org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredDetectorFactory;
-import org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredJobConfigurationPreparer;
+import org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredJobConfigurationPreparerFactory;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.rulealtered.OnRuleAlteredActionConfiguration;
import org.apache.shardingsphere.infra.database.metadata.url.JdbcUrlAppender;
@@ -57,8 +57,6 @@ import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.cache.event.StartScalingEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.ScalingReleaseSchemaNameLockEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.ScalingTaskFinishedEvent;
-import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.required.RequiredSPIRegistry;
import java.util.Collection;
import java.util.HashMap;
@@ -78,11 +76,6 @@ import java.util.stream.Collectors;
@Slf4j
public final class RuleAlteredJobWorker {
- static {
- ShardingSphereServiceLoader.register(RuleAlteredDetector.class);
- ShardingSphereServiceLoader.register(RuleAlteredJobConfigurationPreparer.class);
- }
-
private static final RuleAlteredJobWorker INSTANCE = new RuleAlteredJobWorker();
private static final YamlRuleConfigurationSwapperEngine SWAPPER_ENGINE = new YamlRuleConfigurationSwapperEngine();
@@ -291,10 +284,9 @@ public final class RuleAlteredJobWorker {
* @param onRuleAlteredActionConfig action configuration
* @return task configuration
*/
- public static TaskConfiguration buildTaskConfig(final PipelineConfiguration pipelineConfig, final HandleConfiguration handleConfig,
- final OnRuleAlteredActionConfiguration onRuleAlteredActionConfig) {
- RuleAlteredJobConfigurationPreparer preparer = RequiredSPIRegistry.getRegisteredService(RuleAlteredJobConfigurationPreparer.class);
- return preparer.createTaskConfiguration(pipelineConfig, handleConfig, onRuleAlteredActionConfig);
+ public static TaskConfiguration buildTaskConfig(final PipelineConfiguration pipelineConfig,
+ final HandleConfiguration handleConfig, final OnRuleAlteredActionConfiguration onRuleAlteredActionConfig) {
+ return RuleAlteredJobConfigurationPreparerFactory.newInstance().createTaskConfiguration(pipelineConfig, handleConfig, onRuleAlteredActionConfig);
}
private boolean isUncompletedJobOfSameSchemaInJobList(final String schema) {
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
index 10dab7ca2d8..73168fbbcd6 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
@@ -28,9 +28,7 @@ import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDat
import org.apache.shardingsphere.data.pipeline.api.job.JobSubType;
import org.apache.shardingsphere.data.pipeline.api.job.JobType;
import org.apache.shardingsphere.data.pipeline.api.job.RuleAlteredJobId;
-import org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredJobConfigurationPreparer;
-import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.required.RequiredSPIRegistry;
+import org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredJobConfigurationPreparerFactory;
import java.util.Collections;
@@ -45,10 +43,6 @@ import java.util.Collections;
// TODO share for totally new scenario
public final class JobConfiguration {
- static {
- ShardingSphereServiceLoader.register(RuleAlteredJobConfigurationPreparer.class);
- }
-
private WorkflowConfiguration workflowConfig;
private PipelineConfiguration pipelineConfig;
@@ -67,8 +61,7 @@ public final class JobConfiguration {
PipelineConfiguration pipelineConfig = getPipelineConfig();
HandleConfiguration handleConfig = getHandleConfig();
if (null == handleConfig || null == handleConfig.getJobShardingDataNodes()) {
- RuleAlteredJobConfigurationPreparer preparer = RequiredSPIRegistry.getRegisteredService(RuleAlteredJobConfigurationPreparer.class);
- handleConfig = preparer.createHandleConfiguration(pipelineConfig, getWorkflowConfig());
+ handleConfig = RuleAlteredJobConfigurationPreparerFactory.newInstance().createHandleConfiguration(pipelineConfig, getWorkflowConfig());
this.handleConfig = handleConfig;
}
if (null == handleConfig.getJobId()) {
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
index 491834fa17f..557c86fac46 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
@@ -23,12 +23,11 @@ import org.apache.shardingsphere.data.pipeline.api.config.rulealtered.TaskConfig
import org.apache.shardingsphere.data.pipeline.api.config.rulealtered.WorkflowConfiguration;
import org.apache.shardingsphere.infra.config.rulealtered.OnRuleAlteredActionConfiguration;
import org.apache.shardingsphere.spi.type.required.RequiredSPI;
-import org.apache.shardingsphere.spi.type.singleton.SingletonSPI;
/**
* Rule altered job configuration preparer.
*/
-public interface RuleAlteredJobConfigurationPreparer extends RequiredSPI, SingletonSPI {
+public interface RuleAlteredJobConfigurationPreparer extends RequiredSPI {
/**
* Create handle configuration, used to build job configuration.
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparerFactory.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparerFactory.java
new file mode 100644
index 00000000000..abf86d4804c
--- /dev/null
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparerFactory.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.data.pipeline.spi.rulealtered;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.spi.type.required.RequiredSPIRegistry;
+
+/**
+ * Rule altered job configuration preparer factory.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class RuleAlteredJobConfigurationPreparerFactory {
+
+ static {
+ ShardingSphereServiceLoader.register(RuleAlteredJobConfigurationPreparer.class);
+ }
+
+ /**
+ * Create new instance of rule altered job configuration preparer.
+ *
+ * @return new instance of rule altered job configuration preparer
+ */
+ // TODO RuleAlteredJobConfigurationPreparer should be TypedSPI or OrderedSPI
+ public static RuleAlteredJobConfigurationPreparer newInstance() {
+ return RequiredSPIRegistry.getRegisteredService(RuleAlteredJobConfigurationPreparer.class);
+ }
+}