You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/06/08 13:05:52 UTC
[shardingsphere] branch master updated: Rename OriginalFilterableExecutor and AdvancedFederationExecutor (#18249)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c8afc55be50 Rename OriginalFilterableExecutor and AdvancedFederationExecutor (#18249)
c8afc55be50 is described below
commit c8afc55be5023dc5b9b42d6ca7b2135ebf4ed1ea
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Jun 8 21:05:46 2022 +0800
Rename OriginalFilterableExecutor and AdvancedFederationExecutor (#18249)
---
.../infra/federation/executor/FederationExecutorFactory.java | 6 +++---
...mizedFilterableExecutor.java => AdvancedFederationExecutor.java} | 6 +++---
...ginalFilterableExecutor.java => OriginalFederationExecutor.java} | 4 ++--
...terableExecutorTest.java => AdvancedFederationExecutorTest.java} | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/FederationExecutorFactory.java b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/FederationExecutorFactory.java
index 984e654f5c4..fd1696dbd86 100644
--- a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/FederationExecutorFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/FederationExecutorFactory.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
-import org.apache.shardingsphere.infra.federation.executor.original.OriginalFilterableExecutor;
+import org.apache.shardingsphere.infra.federation.executor.original.OriginalFederationExecutor;
import org.apache.shardingsphere.infra.federation.optimizer.context.OptimizerContext;
/**
@@ -42,7 +42,7 @@ public final class FederationExecutorFactory {
*/
public static FederationExecutor newInstance(final String databaseName, final String schemaName, final OptimizerContext optimizerContext,
final ConfigurationProperties props, final JDBCExecutor jdbcExecutor) {
- // TODO Consider about CustomizedFilterableExecutor
- return new OriginalFilterableExecutor(databaseName, schemaName, optimizerContext, props, jdbcExecutor);
+ // TODO Consider about AdvancedFederationExecutor
+ return new OriginalFederationExecutor(databaseName, schemaName, optimizerContext, props, jdbcExecutor);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/customized/CustomizedFilterableExecutor.java b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/customized/AdvancedFederationExecutor.java
similarity index 95%
rename from shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/customized/CustomizedFilterableExecutor.java
rename to shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/customized/AdvancedFederationExecutor.java
index 120adc0e992..7f835dc389e 100644
--- a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/customized/CustomizedFilterableExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/customized/AdvancedFederationExecutor.java
@@ -44,9 +44,9 @@ import java.sql.ResultSet;
import java.sql.SQLException;
/**
- * Customized filterable executor.
+ * Advanced federation executor.
*/
-public final class CustomizedFilterableExecutor implements FederationExecutor {
+public final class AdvancedFederationExecutor implements FederationExecutor {
private final String databaseName;
@@ -58,7 +58,7 @@ public final class CustomizedFilterableExecutor implements FederationExecutor {
private ResultSet federationResultSet;
- public CustomizedFilterableExecutor(final String databaseName, final String schemaName, final OptimizerContext optimizerContext) {
+ public AdvancedFederationExecutor(final String databaseName, final String schemaName, final OptimizerContext optimizerContext) {
this.databaseName = databaseName;
this.schemaName = schemaName;
this.optimizerContext = optimizerContext;
diff --git a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/OriginalFilterableExecutor.java b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/OriginalFederationExecutor.java
similarity index 98%
rename from shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/OriginalFilterableExecutor.java
rename to shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/OriginalFederationExecutor.java
index 845f51f9fe5..1a9cda32256 100644
--- a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/OriginalFilterableExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/OriginalFederationExecutor.java
@@ -42,10 +42,10 @@ import java.sql.Statement;
import java.util.List;
/**
- * Original filterable executor.
+ * Original federation executor.
*/
@RequiredArgsConstructor
-public final class OriginalFilterableExecutor implements FederationExecutor {
+public final class OriginalFederationExecutor implements FederationExecutor {
public static final String CONNECTION_URL = "jdbc:calcite:";
diff --git a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/test/java/org/apache/shardingsphere/infra/federation/executor/customized/CustomizedFilterableExecutorTest.java b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/test/java/org/apache/shardingsphere/infra/federation/executor/customized/AdvancedFederationExecutorTest.java
similarity index 96%
rename from shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/test/java/org/apache/shardingsphere/infra/federation/executor/customized/CustomizedFilterableExecutorTest.java
rename to shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/test/java/org/apache/shardingsphere/infra/federation/executor/customized/AdvancedFederationExecutorTest.java
index 3b42e93eb28..a1fadfe84cd 100644
--- a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/test/java/org/apache/shardingsphere/infra/federation/executor/customized/CustomizedFilterableExecutorTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/test/java/org/apache/shardingsphere/infra/federation/executor/customized/AdvancedFederationExecutorTest.java
@@ -42,9 +42,9 @@ import java.util.Map;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class CustomizedFilterableExecutorTest {
+public class AdvancedFederationExecutorTest {
- private CustomizedFilterableExecutor executor;
+ private AdvancedFederationExecutor executor;
@Before
public void init() throws Exception {
@@ -56,7 +56,7 @@ public class CustomizedFilterableExecutorTest {
Map<String, ShardingSphereSchema> schemas = Collections.singletonMap(databaseName, new ShardingSphereSchema(tables));
ShardingSphereDatabase metaData = new ShardingSphereDatabase(schemaName, new H2DatabaseType(), mockResource(), null, schemas);
OptimizerContext optimizerContext = OptimizerContextFactory.create(Collections.singletonMap(schemaName, metaData), createGlobalRuleMetaData());
- executor = new CustomizedFilterableExecutor(databaseName, schemaName, optimizerContext);
+ executor = new AdvancedFederationExecutor(databaseName, schemaName, optimizerContext);
}
private ShardingSphereRuleMetaData createGlobalRuleMetaData() {