You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/04/27 15:54:22 UTC
[shardingsphere] branch master updated: Add ResultProcessEngineFactory (#17158)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 912488dbed8 Add ResultProcessEngineFactory (#17158)
912488dbed8 is described below
commit 912488dbed87b2e1b329e3910f6d8519cab3c637
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Apr 27 23:54:13 2022 +0800
Add ResultProcessEngineFactory (#17158)
* Add ResultProcessEngineFactory
* Fix checkstyle
---
.../merge/EncryptResultDecoratorEngineTest.java | 21 ++++------
.../shardingsphere/infra/merge/MergeEngine.java | 9 +---
.../merge/engine/ResultProcessEngineFactory.java | 49 ++++++++++++++++++++++
3 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/merge/EncryptResultDecoratorEngineTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/merge/EncryptResultDecoratorEngineTest.java
index 99d6d27f543..024424d0209 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/merge/EncryptResultDecoratorEngineTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/merge/EncryptResultDecoratorEngineTest.java
@@ -27,12 +27,10 @@ import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementConte
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.merge.engine.ResultProcessEngine;
+import org.apache.shardingsphere.infra.merge.engine.ResultProcessEngineFactory;
import org.apache.shardingsphere.infra.merge.engine.decorator.ResultDecorator;
import org.apache.shardingsphere.infra.merge.engine.decorator.impl.TransparentResultDecorator;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
-import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.ordered.OrderedSPIRegistry;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.ExplainStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLExplainStatement;
import org.junit.Test;
@@ -51,10 +49,6 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class EncryptResultDecoratorEngineTest {
- static {
- ShardingSphereServiceLoader.register(ResultProcessEngine.class);
- }
-
@Mock
private EncryptRule rule;
@@ -66,8 +60,9 @@ public final class EncryptResultDecoratorEngineTest {
@Test
public void assertNewInstanceWithSelectStatement() {
- EncryptResultDecoratorEngine engine = (EncryptResultDecoratorEngine) OrderedSPIRegistry.getRegisteredServices(ResultProcessEngine.class, Collections.singleton(rule)).get(rule);
- ResultDecorator actual = engine.newInstance(databaseType, DefaultSchema.LOGIC_NAME, schema, rule, mock(ConfigurationProperties.class), mock(SelectStatementContext.class, RETURNS_DEEP_STUBS));
+ EncryptResultDecoratorEngine engine = (EncryptResultDecoratorEngine) ResultProcessEngineFactory.newInstance(Collections.singleton(rule)).get(rule);
+ ResultDecorator<?> actual = engine.newInstance(
+ databaseType, DefaultSchema.LOGIC_NAME, schema, rule, mock(ConfigurationProperties.class), mock(SelectStatementContext.class, RETURNS_DEEP_STUBS));
assertThat(actual, instanceOf(EncryptDQLResultDecorator.class));
}
@@ -75,15 +70,15 @@ public final class EncryptResultDecoratorEngineTest {
public void assertNewInstanceWithDALStatement() {
SQLStatementContext<ExplainStatement> sqlStatementContext = mock(ExplainStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(MySQLExplainStatement.class));
- EncryptResultDecoratorEngine engine = (EncryptResultDecoratorEngine) OrderedSPIRegistry.getRegisteredServices(ResultProcessEngine.class, Collections.singleton(rule)).get(rule);
- ResultDecorator actual = engine.newInstance(databaseType, DefaultSchema.LOGIC_NAME, schema, rule, mock(ConfigurationProperties.class), sqlStatementContext);
+ EncryptResultDecoratorEngine engine = (EncryptResultDecoratorEngine) ResultProcessEngineFactory.newInstance(Collections.singleton(rule)).get(rule);
+ ResultDecorator<?> actual = engine.newInstance(databaseType, DefaultSchema.LOGIC_NAME, schema, rule, mock(ConfigurationProperties.class), sqlStatementContext);
assertThat(actual, instanceOf(EncryptDALResultDecorator.class));
}
@Test
public void assertNewInstanceWithOtherStatement() {
- EncryptResultDecoratorEngine engine = (EncryptResultDecoratorEngine) OrderedSPIRegistry.getRegisteredServices(ResultProcessEngine.class, Collections.singleton(rule)).get(rule);
- ResultDecorator actual = engine.newInstance(databaseType, DefaultSchema.LOGIC_NAME, schema, rule, mock(ConfigurationProperties.class), mock(InsertStatementContext.class));
+ EncryptResultDecoratorEngine engine = (EncryptResultDecoratorEngine) ResultProcessEngineFactory.newInstance(Collections.singleton(rule)).get(rule);
+ ResultDecorator<?> actual = engine.newInstance(databaseType, DefaultSchema.LOGIC_NAME, schema, rule, mock(ConfigurationProperties.class), mock(InsertStatementContext.class));
assertThat(actual, instanceOf(TransparentResultDecorator.class));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/MergeEngine.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/MergeEngine.java
index dcb4ac83c25..7e6ac19ae75 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/MergeEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/MergeEngine.java
@@ -22,6 +22,7 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import org.apache.shardingsphere.infra.merge.engine.ResultProcessEngine;
+import org.apache.shardingsphere.infra.merge.engine.ResultProcessEngineFactory;
import org.apache.shardingsphere.infra.merge.engine.decorator.ResultDecorator;
import org.apache.shardingsphere.infra.merge.engine.decorator.ResultDecoratorEngine;
import org.apache.shardingsphere.infra.merge.engine.merger.ResultMerger;
@@ -30,8 +31,6 @@ import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.merge.result.impl.transparent.TransparentMergedResult;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.ordered.OrderedSPIRegistry;
import java.sql.SQLException;
import java.util.Collection;
@@ -45,10 +44,6 @@ import java.util.Optional;
*/
public final class MergeEngine {
- static {
- ShardingSphereServiceLoader.register(ResultProcessEngine.class);
- }
-
private final String schemaName;
private final DatabaseType databaseType;
@@ -65,7 +60,7 @@ public final class MergeEngine {
this.databaseType = databaseType;
this.schema = schema;
this.props = props;
- engines = OrderedSPIRegistry.getRegisteredServices(ResultProcessEngine.class, rules);
+ engines = ResultProcessEngineFactory.newInstance(rules);
}
/**
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/ResultProcessEngineFactory.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/ResultProcessEngineFactory.java
new file mode 100644
index 00000000000..bcb9136a09f
--- /dev/null
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/ResultProcessEngineFactory.java
@@ -0,0 +1,49 @@
+/*
+ * 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.infra.merge.engine;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
+import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.spi.type.ordered.OrderedSPIRegistry;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Result process engine factory.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class ResultProcessEngineFactory {
+
+ static {
+ ShardingSphereServiceLoader.register(ResultProcessEngine.class);
+ }
+
+ /**
+ * Create new instance of result process engine.
+ *
+ * @param rules ShardingSphere rules
+ * @return new instance of result process engine
+ */
+ @SuppressWarnings("rawtypes")
+ public static Map<ShardingSphereRule, ResultProcessEngine> newInstance(final Collection<ShardingSphereRule> rules) {
+ return OrderedSPIRegistry.getRegisteredServices(ResultProcessEngine.class, rules);
+ }
+}