You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/09/20 14:22:24 UTC
[shardingsphere] branch master updated: Unify metadata to metaData
(#12598)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 6a90676 Unify metadata to metaData (#12598)
6a90676 is described below
commit 6a90676ef0ebcad6409b439f9126b2bab15c2c9a
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Sep 20 22:21:48 2021 +0800
Unify metadata to metaData (#12598)
* Refactor FederateJDBCExecutor
* Refactor FederateJDBCExecutor
* Rename FederateSchemaMetaData
* Refactor OptimizeContextFactory
* Unify metadata to metaData
---
.../jaeger/advice/JDBCExecutorCallbackAdvice.java | 6 +--
.../advice/JDBCExecutorCallbackAdvice.java | 6 +--
.../zipkin/advice/JDBCExecutorCallbackAdvice.java | 6 +--
.../shardingsphere/infra/lock/LockNameUtil.java | 10 ++--
...tadataRefresher.java => MetaDataRefresher.java} | 21 +-------
.../metadata/schema/refresher/SchemaRefresher.java | 4 +-
.../infra/lock/LockNameUtilTest.java | 4 +-
...freshEngine.java => MetaDataRefreshEngine.java} | 34 ++++++------
...rFactory.java => MetaDataRefresherFactory.java} | 12 ++---
...Test.java => MetaDataRefresherFactoryTest.java} | 14 ++---
.../sql/federate/execute/FederateJDBCExecutor.java | 63 ++++++++++------------
.../sql/federate/schema/FederateLogicSchema.java | 10 ++--
.../federate/schema/row/FederateRowExecutor.java | 4 +-
.../schema/table/AbstractFederateTable.java | 6 +--
.../schema/table/FederateFilterableTable.java | 6 +--
.../sql/federate/FederateJDBCExecutorTest.java | 10 ++--
.../optimize/context/OptimizeContextFactory.java | 58 ++++++++++----------
...maMetadata.java => FederateSchemaMetaData.java} | 13 +++--
...Metadatas.java => FederateSchemaMetaDatas.java} | 16 +++---
...bleMetadata.java => FederateTableMetaData.java} | 6 +--
.../core/metadata/refresher/FederateRefresher.java | 8 +--
.../type/AlterTableStatementFederateRefresher.java | 6 +--
.../CreateTableStatementFederateRefresher.java | 4 +-
.../type/DropTableStatementFederateRefresher.java | 4 +-
.../AlterTableStatementFederateRefresherTest.java | 10 ++--
.../CreateTableStatementFederateRefresherTest.java | 8 +--
.../DropTableStatementFederateRefresherTest.java | 10 ++--
.../driver/executor/JDBCLockEngine.java | 12 ++---
...maMetadataNode.java => SchemaMetaDataNode.java} | 30 +++++------
.../service/SchemaMetaDataPersistService.java | 12 ++---
.../service/impl/DataSourcePersistService.java | 8 +--
.../service/impl/SchemaRulePersistService.java | 8 +--
...taNodeTest.java => SchemaMetaDataNodeTest.java} | 14 ++---
.../ClusterContextManagerCoordinator.java | 14 ++---
.../subscriber/ScalingRegistrySubscriber.java | 12 ++---
.../metadata/watcher/MetaDataChangedWatcher.java | 18 +++----
.../ClusterContextManagerCoordinatorTest.java | 4 +-
.../communication/DatabaseCommunicationEngine.java | 6 +--
.../backend/communication/ProxyLockEngine.java | 10 ++--
.../callback/ProxyJDBCExecutorCallback.java | 2 +-
.../DatabaseCommunicationEngineFactoryTest.java | 4 +-
.../DatabaseCommunicationEngineTest.java | 4 +-
.../information/SelectInformationExecutorTest.java | 10 ++--
.../command/MySQLCommandExecutorFactoryTest.java | 4 +-
.../execute/MySQLComStmtExecuteExecutorTest.java | 4 +-
.../postgresql/wal/decode/TestDecodingPlugin.java | 6 +--
.../test/integration/cases/dataset/DataSet.java | 12 ++---
.../{DataSetMetadata.java => DataSetMetaData.java} | 2 +-
.../integration/cases/value/SQLValueGroup.java | 6 +--
.../env/dataset/DataSetEnvironmentManager.java | 18 +++----
.../test/integration/engine/it/BatchITCase.java | 28 +++++-----
.../test/integration/engine/it/dal/BaseDALIT.java | 4 +-
.../test/integration/engine/it/ddl/BaseDDLIT.java | 6 +--
.../test/integration/engine/it/dml/BaseDMLIT.java | 14 ++---
.../test/integration/engine/it/dql/BaseDQLIT.java | 4 +-
.../test/integration/engine/it/rdl/BaseRDLIT.java | 4 +-
.../test/integration/engine/it/rql/BaseRQLIT.java | 4 +-
57 files changed, 310 insertions(+), 333 deletions(-)
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
index ff1c5ca..426a091 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
@@ -53,9 +53,9 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
builder = builder.asChildOf(root);
}
JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
- Method getMetadataMethod = JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class);
- getMetadataMethod.setAccessible(true);
- DataSourceMetaData metaData = (DataSourceMetaData) getMetadataMethod.invoke(target, new Object[]{executionUnit.getStorageResource().getConnection().getMetaData()});
+ Method getMetaDataMethod = JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class);
+ getMetaDataMethod.setAccessible(true);
+ DataSourceMetaData metaData = (DataSourceMetaData) getMetaDataMethod.invoke(target, new Object[]{executionUnit.getStorageResource().getConnection().getMetaData()});
builder.withTag(Tags.COMPONENT.getKey(), JaegerConstants.COMPONENT_NAME)
.withTag(Tags.DB_TYPE.getKey(), JaegerConstants.DB_TYPE_VALUE)
.withTag(Tags.DB_INSTANCE.getKey(), executionUnit.getExecutionUnit().getDataSourceName())
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
index 4c83341..b5d7a0c 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
@@ -56,9 +56,9 @@ public class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdvice {
spanBuilder.setAttribute(OpenTelemetryConstants.COMPONENT, OpenTelemetryConstants.COMPONENT_NAME);
spanBuilder.setAttribute(OpenTelemetryConstants.DB_TYPE, OpenTelemetryConstants.DB_TYPE_VALUE);
JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
- Method getMetadataMethod = JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class);
- getMetadataMethod.setAccessible(true);
- DataSourceMetaData metaData = (DataSourceMetaData) getMetadataMethod.invoke(target, new Object[]{executionUnit.getStorageResource().getConnection().getMetaData()});
+ Method getMetaDataMethod = JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class);
+ getMetaDataMethod.setAccessible(true);
+ DataSourceMetaData metaData = (DataSourceMetaData) getMetaDataMethod.invoke(target, new Object[]{executionUnit.getStorageResource().getConnection().getMetaData()});
spanBuilder.setAttribute(OpenTelemetryConstants.DB_INSTANCE, executionUnit.getExecutionUnit().getDataSourceName())
.setAttribute(OpenTelemetryConstants.PEER_HOSTNAME, metaData.getHostName())
.setAttribute(OpenTelemetryConstants.PEER_PORT, String.valueOf(metaData.getPort()))
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
index 2364be1..26fca42 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
@@ -53,9 +53,9 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
span.tag(ZipkinConstants.Tags.COMPONENT, ZipkinConstants.COMPONENT_NAME);
span.tag(ZipkinConstants.Tags.DB_TYPE, ZipkinConstants.DB_TYPE_VALUE);
JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
- Method getMetadataMethod = JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class);
- getMetadataMethod.setAccessible(true);
- DataSourceMetaData metaData = (DataSourceMetaData) getMetadataMethod.invoke(target, new Object[]{executionUnit.getStorageResource().getConnection().getMetaData()});
+ Method getMetaDataMethod = JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class);
+ getMetaDataMethod.setAccessible(true);
+ DataSourceMetaData metaData = (DataSourceMetaData) getMetaDataMethod.invoke(target, new Object[]{executionUnit.getStorageResource().getConnection().getMetaData()});
span.tag(ZipkinConstants.Tags.DB_INSTANCE, executionUnit.getExecutionUnit().getDataSourceName());
span.tag(ZipkinConstants.Tags.PEER_HOSTNAME, metaData.getHostName());
span.tag(ZipkinConstants.Tags.PEER_PORT, String.valueOf(metaData.getPort()));
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockNameUtil.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockNameUtil.java
index 5b2da52..7adeec2 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockNameUtil.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockNameUtil.java
@@ -24,7 +24,7 @@ import com.google.common.base.Joiner;
*/
public final class LockNameUtil {
- private static final String METADATA_REFRESH_LOCK_NAME = "metadata_refresh";
+ private static final String META_DATA_REFRESH_LOCK_NAME = "meta_data_refresh";
/**
* Get table lock name.
@@ -38,11 +38,11 @@ public final class LockNameUtil {
}
/**
- * Get metadata refresh lock name.
+ * Get meta data refresh lock name.
*
- * @return metadata refresh lock name
+ * @return meta data refresh lock name
*/
- public static String getMetadataRefreshLockName() {
- return METADATA_REFRESH_LOCK_NAME;
+ public static String getMetaDataRefreshLockName() {
+ return META_DATA_REFRESH_LOCK_NAME;
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetadataRefresher.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetaDataRefresher.java
similarity index 56%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetadataRefresher.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetaDataRefresher.java
index a516c24..555dfc5 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetadataRefresher.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetaDataRefresher.java
@@ -17,25 +17,8 @@
package org.apache.shardingsphere.infra.metadata;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-
-import java.util.Collection;
-import java.util.stream.Collectors;
-
/**
- * Metadata refresher.
+ * Meta data refresher.
*/
-public interface MetadataRefresher {
-
- /**
- * Find rules by class.
- *
- * @param rules rules to be find
- * @param clazz target class
- * @param <T> type of rule
- * @return found rules
- */
- default <T extends ShardingSphereRule> Collection<T> findShardingSphereRulesByClass(final Collection<ShardingSphereRule> rules, final Class<T> clazz) {
- return rules.stream().filter(each -> clazz.isAssignableFrom(each.getClass())).map(clazz::cast).collect(Collectors.toList());
- }
+public interface MetaDataRefresher {
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/refresher/SchemaRefresher.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/refresher/SchemaRefresher.java
index 3d0b143..649dbe5 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/refresher/SchemaRefresher.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/refresher/SchemaRefresher.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.metadata.schema.refresher;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
-import org.apache.shardingsphere.infra.metadata.MetadataRefresher;
+import org.apache.shardingsphere.infra.metadata.MetaDataRefresher;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -30,7 +30,7 @@ import java.util.Collection;
*
* @param <T> type of SQL statement
*/
-public interface SchemaRefresher<T extends SQLStatement> extends MetadataRefresher {
+public interface SchemaRefresher<T extends SQLStatement> extends MetaDataRefresher {
/**
* Refresh ShardingSphere schema.
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/lock/LockNameUtilTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/lock/LockNameUtilTest.java
index e0e5205..d7d4771 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/lock/LockNameUtilTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/lock/LockNameUtilTest.java
@@ -30,7 +30,7 @@ public final class LockNameUtilTest {
}
@Test
- public void assertGetMetadataRefreshLockName() {
- assertThat(LockNameUtil.getMetadataRefreshLockName(), is("metadata_refresh"));
+ public void assertGetMetaDataRefreshLockName() {
+ assertThat(LockNameUtil.getMetaDataRefreshLockName(), is("meta_data_refresh"));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetadataRefreshEngine.java b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetaDataRefreshEngine.java
similarity index 77%
rename from shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetadataRefreshEngine.java
rename to shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetaDataRefreshEngine.java
index 3519d50..94f7dea 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetadataRefreshEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetaDataRefreshEngine.java
@@ -19,14 +19,14 @@ package org.apache.shardingsphere.infra.context.refresher;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
-import org.apache.shardingsphere.infra.metadata.MetadataRefresher;
+import org.apache.shardingsphere.infra.metadata.MetaDataRefresher;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.mapper.SQLStatementEventMapper;
import org.apache.shardingsphere.infra.metadata.mapper.SQLStatementEventMapperFactory;
import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMaterials;
import org.apache.shardingsphere.infra.metadata.schema.refresher.SchemaRefresher;
import org.apache.shardingsphere.infra.metadata.schema.refresher.event.SchemaAlteredEvent;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.infra.optimize.core.metadata.refresher.FederateRefresher;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -35,19 +35,19 @@ import java.util.Collection;
import java.util.Optional;
/**
- * Metadata refresh engine.
+ * Meta data refresh engine.
*/
-public final class MetadataRefreshEngine {
+public final class MetaDataRefreshEngine {
- private final ShardingSphereMetaData schemaMetadata;
+ private final ShardingSphereMetaData schemaMetaData;
- private final FederateSchemaMetadata federateMetadata;
+ private final FederateSchemaMetaData federateMetaData;
private final SchemaBuilderMaterials materials;
- public MetadataRefreshEngine(final ShardingSphereMetaData schemaMetaData, final FederateSchemaMetadata federateMetadata, final ConfigurationProperties props) {
- this.schemaMetadata = schemaMetaData;
- this.federateMetadata = federateMetadata;
+ public MetaDataRefreshEngine(final ShardingSphereMetaData schemaMetaData, final FederateSchemaMetaData federateMetaData, final ConfigurationProperties props) {
+ this.schemaMetaData = schemaMetaData;
+ this.federateMetaData = federateMetaData;
materials = new SchemaBuilderMaterials(schemaMetaData.getResource().getDatabaseType(), schemaMetaData.getResource().getDataSources(), schemaMetaData.getRuleMetaData().getRules(), props);
}
@@ -59,9 +59,9 @@ public final class MetadataRefreshEngine {
* @throws SQLException SQL exception
*/
public void refresh(final SQLStatement sqlStatement, final Collection<String> logicDataSourceNames) throws SQLException {
- Collection<MetadataRefresher> metadataRefreshers = MetadataRefresherFactory.newInstance(sqlStatement);
- if (!metadataRefreshers.isEmpty()) {
- refresh(sqlStatement, logicDataSourceNames, metadataRefreshers);
+ Collection<MetaDataRefresher> metaDataRefreshers = MetaDataRefresherFactory.newInstance(sqlStatement);
+ if (!metaDataRefreshers.isEmpty()) {
+ refresh(sqlStatement, logicDataSourceNames, metaDataRefreshers);
}
Optional<SQLStatementEventMapper> sqlStatementEventMapper = SQLStatementEventMapperFactory.newInstance(sqlStatement);
if (sqlStatementEventMapper.isPresent()) {
@@ -71,15 +71,15 @@ public final class MetadataRefreshEngine {
}
@SuppressWarnings({"unchecked", "rawtypes"})
- private void refresh(final SQLStatement sqlStatement, final Collection<String> logicDataSourceNames, final Collection<MetadataRefresher> refreshers) throws SQLException {
- for (MetadataRefresher each : refreshers) {
+ private void refresh(final SQLStatement sqlStatement, final Collection<String> logicDataSourceNames, final Collection<MetaDataRefresher> refreshers) throws SQLException {
+ for (MetaDataRefresher each : refreshers) {
if (each instanceof SchemaRefresher) {
- ((SchemaRefresher) each).refresh(schemaMetadata, logicDataSourceNames, sqlStatement, materials.getProps());
+ ((SchemaRefresher) each).refresh(schemaMetaData, logicDataSourceNames, sqlStatement, materials.getProps());
}
if (each instanceof FederateRefresher) {
- ((FederateRefresher) each).refresh(federateMetadata, logicDataSourceNames, sqlStatement, materials);
+ ((FederateRefresher) each).refresh(federateMetaData, logicDataSourceNames, sqlStatement, materials);
}
}
- ShardingSphereEventBus.getInstance().post(new SchemaAlteredEvent(schemaMetadata.getName(), schemaMetadata.getSchema()));
+ ShardingSphereEventBus.getInstance().post(new SchemaAlteredEvent(schemaMetaData.getName(), schemaMetaData.getSchema()));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetadataRefresherFactory.java b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetaDataRefresherFactory.java
similarity index 93%
rename from shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetadataRefresherFactory.java
rename to shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetaDataRefresherFactory.java
index 03223e1..86f8855 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetadataRefresherFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/MetaDataRefresherFactory.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.context.refresher;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.metadata.MetadataRefresher;
+import org.apache.shardingsphere.infra.metadata.MetaDataRefresher;
import org.apache.shardingsphere.infra.metadata.schema.refresher.type.AlterIndexStatementSchemaRefresher;
import org.apache.shardingsphere.infra.metadata.schema.refresher.type.AlterTableStatementSchemaRefresher;
import org.apache.shardingsphere.infra.metadata.schema.refresher.type.CreateIndexStatementSchemaRefresher;
@@ -49,12 +49,12 @@ import java.util.Map;
import java.util.Map.Entry;
/**
- * ShardingSphere schema refresher factory.
+ * ShardingSphere meta data refresher factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class MetadataRefresherFactory {
+public final class MetaDataRefresherFactory {
- private static final Map<Class<?>, Collection<MetadataRefresher>> REGISTRY = new HashMap<>();
+ private static final Map<Class<?>, Collection<MetaDataRefresher>> REGISTRY = new HashMap<>();
static {
REGISTRY.put(CreateTableStatement.class, new LinkedHashSet<>());
@@ -84,8 +84,8 @@ public final class MetadataRefresherFactory {
* @param sqlStatement SQL statement
* @return instance of schema refresher
*/
- public static Collection<MetadataRefresher> newInstance(final SQLStatement sqlStatement) {
- for (Entry<Class<?>, Collection<MetadataRefresher>> entry : REGISTRY.entrySet()) {
+ public static Collection<MetaDataRefresher> newInstance(final SQLStatement sqlStatement) {
+ for (Entry<Class<?>, Collection<MetaDataRefresher>> entry : REGISTRY.entrySet()) {
if (entry.getKey().isAssignableFrom(sqlStatement.getClass())) {
return entry.getValue();
}
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/refresher/MetadataRefresherFactoryTest.java b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/refresher/MetaDataRefresherFactoryTest.java
similarity index 84%
rename from shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/refresher/MetadataRefresherFactoryTest.java
rename to shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/refresher/MetaDataRefresherFactoryTest.java
index 5cbf89f..c2505dd 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/refresher/MetadataRefresherFactoryTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/refresher/MetaDataRefresherFactoryTest.java
@@ -32,35 +32,35 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@RunWith(MockitoJUnitRunner.class)
-public final class MetadataRefresherFactoryTest {
+public final class MetaDataRefresherFactoryTest {
@Test
public void assertNewInstanceWithCreateTableStatement() {
- assertThat(MetadataRefresherFactory.newInstance(mock(CreateTableStatement.class)).size(), is(2));
+ assertThat(MetaDataRefresherFactory.newInstance(mock(CreateTableStatement.class)).size(), is(2));
}
@Test
public void assertNewInstanceWithAlterTableStatement() {
- assertThat(MetadataRefresherFactory.newInstance(mock(AlterTableStatement.class)).size(), is(2));
+ assertThat(MetaDataRefresherFactory.newInstance(mock(AlterTableStatement.class)).size(), is(2));
}
@Test
public void assertNewInstanceWithDropTableStatement() {
- assertThat(MetadataRefresherFactory.newInstance(mock(DropTableStatement.class)).size(), is(2));
+ assertThat(MetaDataRefresherFactory.newInstance(mock(DropTableStatement.class)).size(), is(2));
}
@Test
public void assertNewInstanceWithCreateIndexStatement() {
- assertThat(MetadataRefresherFactory.newInstance(mock(CreateIndexStatement.class)).size(), is(1));
+ assertThat(MetaDataRefresherFactory.newInstance(mock(CreateIndexStatement.class)).size(), is(1));
}
@Test
public void assertNewInstanceWithDropIndexStatement() {
- assertThat(MetadataRefresherFactory.newInstance(mock(DropIndexStatement.class)).size(), is(1));
+ assertThat(MetaDataRefresherFactory.newInstance(mock(DropIndexStatement.class)).size(), is(1));
}
@Test
public void assertNewInstanceWithAlterIndexStatement() {
- assertThat(MetadataRefresherFactory.newInstance(mock(AlterIndexStatement.class)).size(), is(1));
+ assertThat(MetaDataRefresherFactory.newInstance(mock(AlterIndexStatement.class)).size(), is(1));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/FederateJDBCExecutor.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/FederateJDBCExecutor.java
index eeae82d..f3dd7b2 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/FederateJDBCExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/FederateJDBCExecutor.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.executor.sql.federate.execute;
+import lombok.RequiredArgsConstructor;
import org.apache.calcite.jdbc.CalciteConnection;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
@@ -46,6 +47,7 @@ import java.util.Properties;
/**
* Federate JDBC executor.
*/
+@RequiredArgsConstructor
public final class FederateJDBCExecutor implements FederateExecutor {
public static final String CONNECTION_URL = "jdbc:calcite:";
@@ -70,55 +72,34 @@ public final class FederateJDBCExecutor implements FederateExecutor {
}
}
- public FederateJDBCExecutor(final String schema, final OptimizeContextFactory factory, final ConfigurationProperties props, final JDBCExecutor jdbcExecutor) {
- this.schema = schema;
- this.factory = factory;
- this.props = props;
- this.jdbcExecutor = jdbcExecutor;
- }
-
@Override
public List<QueryResult> executeQuery(final ExecutionContext executionContext, final JDBCExecutorCallback<? extends ExecuteResult> callback,
final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine) throws SQLException {
- QueryResult result = new JDBCStreamQueryResult(execute(executionContext, callback, prepareEngine));
- return Collections.singletonList(result);
- }
-
- @Override
- public void close() throws SQLException {
- if (null != statement && !statement.isClosed()) {
- Connection connection = statement.getConnection();
- statement.close();
- connection.close();
- }
- }
-
- @Override
- public ResultSet getResultSet() throws SQLException {
- return statement.getResultSet();
+ ResultSet resultSet = execute(executionContext, callback, prepareEngine);
+ return Collections.singletonList(new JDBCStreamQueryResult(resultSet));
}
private ResultSet execute(final ExecutionContext executionContext, final JDBCExecutorCallback<? extends ExecuteResult> callback,
final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine) throws SQLException {
SQLUnit sqlUnit = executionContext.getExecutionUnits().iterator().next().getSqlUnit();
- PreparedStatement statement = getConnection(executionContext, callback, prepareEngine).prepareStatement(SQLUtil.trimSemicolon(sqlUnit.getSql()));
- setParameters(statement, sqlUnit.getParameters());
- this.statement = statement;
- return statement.executeQuery();
+ PreparedStatement preparedStatement = createConnection(executionContext, callback, prepareEngine).prepareStatement(SQLUtil.trimSemicolon(sqlUnit.getSql()));
+ setParameters(preparedStatement, sqlUnit.getParameters());
+ this.statement = preparedStatement;
+ return preparedStatement.executeQuery();
}
- private Connection getConnection(final ExecutionContext executionContext, final JDBCExecutorCallback<? extends ExecuteResult> callback,
- final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine) throws SQLException {
- Connection result = DriverManager.getConnection(CONNECTION_URL, getProperties());
+ private Connection createConnection(final ExecutionContext executionContext, final JDBCExecutorCallback<? extends ExecuteResult> callback,
+ final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine) throws SQLException {
+ Connection result = DriverManager.getConnection(CONNECTION_URL, createProperties());
CalciteConnection calciteConnection = result.unwrap(CalciteConnection.class);
addSchema(calciteConnection, executionContext, callback, prepareEngine);
return result;
}
- private Properties getProperties() {
+ private Properties createProperties() {
Properties result = new Properties();
- for (String each : factory.getProperties().stringPropertyNames()) {
- result.setProperty(each, factory.getProperties().getProperty(each));
+ for (String each : factory.getProps().stringPropertyNames()) {
+ result.setProperty(each, factory.getProps().getProperty(each));
}
return result;
}
@@ -126,7 +107,7 @@ public final class FederateJDBCExecutor implements FederateExecutor {
private void addSchema(final CalciteConnection calciteConnection, final ExecutionContext executionContext, final JDBCExecutorCallback<? extends ExecuteResult> callback,
final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine) throws SQLException {
FederateRowExecutor executor = new FederateRowExecutor(props, jdbcExecutor, executionContext, callback, prepareEngine, factory.getDatabaseType().getQuoteCharacter());
- FederateLogicSchema logicSchema = new FederateLogicSchema(factory.getSchemaMetadatas().getSchemaMetadataBySchemaName(schema), executor);
+ FederateLogicSchema logicSchema = new FederateLogicSchema(factory.getSchemaMetaDatas().getSchemaMetaDataBySchemaName(schema), executor);
calciteConnection.getRootSchema().add(schema, logicSchema);
calciteConnection.setSchema(schema);
}
@@ -138,4 +119,18 @@ public final class FederateJDBCExecutor implements FederateExecutor {
count++;
}
}
+
+ @Override
+ public ResultSet getResultSet() throws SQLException {
+ return statement.getResultSet();
+ }
+
+ @Override
+ public void close() throws SQLException {
+ if (null != statement && !statement.isClosed()) {
+ Connection connection = statement.getConnection();
+ statement.close();
+ connection.close();
+ }
+ }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederateLogicSchema.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederateLogicSchema.java
index 2f7a994..5cd62f5 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederateLogicSchema.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederateLogicSchema.java
@@ -23,8 +23,8 @@ import org.apache.calcite.schema.impl.AbstractSchema;
import org.apache.commons.collections4.map.LinkedMap;
import org.apache.shardingsphere.infra.executor.sql.federate.schema.row.FederateRowExecutor;
import org.apache.shardingsphere.infra.executor.sql.federate.schema.table.FederateFilterableTable;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateTableMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateTableMetaData;
import java.util.Map;
@@ -39,13 +39,13 @@ public final class FederateLogicSchema extends AbstractSchema {
private final Map<String, Table> tables = new LinkedMap<>();
- public FederateLogicSchema(final FederateSchemaMetadata metadata, final FederateRowExecutor executor) {
+ public FederateLogicSchema(final FederateSchemaMetaData metadata, final FederateRowExecutor executor) {
this.name = metadata.getName();
initTables(metadata, executor);
}
- private void initTables(final FederateSchemaMetadata metadata, final FederateRowExecutor executor) {
- for (FederateTableMetadata each : metadata.getTables().values()) {
+ private void initTables(final FederateSchemaMetaData metadata, final FederateRowExecutor executor) {
+ for (FederateTableMetaData each : metadata.getTables().values()) {
tables.put(each.getName(), new FederateFilterableTable(each, executor));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/row/FederateRowExecutor.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/row/FederateRowExecutor.java
index 10fb346..dfa8887 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/row/FederateRowExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/row/FederateRowExecutor.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.infra.executor.sql.federate.schema.table.genera
import org.apache.shardingsphere.infra.executor.sql.federate.schema.table.generator.FederateExecutionSQLGenerator;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
import org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateTableMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateTableMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.sql.Connection;
@@ -69,7 +69,7 @@ public final class FederateRowExecutor {
* @param projects projects
* @return a query result list
*/
- public Collection<QueryResult> execute(final FederateTableMetadata metadata, final DataContext root, final List<RexNode> filters, final int[] projects) {
+ public Collection<QueryResult> execute(final FederateTableMetaData metadata, final DataContext root, final List<RexNode> filters, final int[] projects) {
FederateExecutionContextGenerator generator = new FederateExecutionContextGenerator(metadata.getName(), routeExecutionContext,
new FederateExecutionSQLGenerator(root, filters, projects, metadata.getColumnNames(), quoteCharacter));
return execute(generator.generate());
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/AbstractFederateTable.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/AbstractFederateTable.java
index c72a16f..af06b43 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/AbstractFederateTable.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/AbstractFederateTable.java
@@ -24,7 +24,7 @@ import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeFactory;
import org.apache.calcite.schema.impl.AbstractTable;
import org.apache.shardingsphere.infra.executor.sql.federate.schema.row.FederateRowExecutor;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateTableMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateTableMetaData;
/**
* Abstract Federate table.
@@ -33,12 +33,12 @@ import org.apache.shardingsphere.infra.optimize.core.metadata.FederateTableMetad
@RequiredArgsConstructor
public abstract class AbstractFederateTable extends AbstractTable {
- private final FederateTableMetadata metadata;
+ private final FederateTableMetaData metaData;
private final FederateRowExecutor executor;
@Override
public final RelDataType getRowType(final RelDataTypeFactory typeFactory) {
- return metadata.getRelProtoDataType().apply(typeFactory);
+ return metaData.getRelProtoDataType().apply(typeFactory);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FederateFilterableTable.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FederateFilterableTable.java
index f00e207..786b346 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FederateFilterableTable.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FederateFilterableTable.java
@@ -25,7 +25,7 @@ import org.apache.calcite.rex.RexNode;
import org.apache.calcite.schema.ProjectableFilterableTable;
import org.apache.shardingsphere.infra.executor.sql.federate.schema.row.FederateRowEnumerator;
import org.apache.shardingsphere.infra.executor.sql.federate.schema.row.FederateRowExecutor;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateTableMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateTableMetaData;
import java.util.List;
@@ -35,7 +35,7 @@ import java.util.List;
*/
public final class FederateFilterableTable extends AbstractFederateTable implements ProjectableFilterableTable {
- public FederateFilterableTable(final FederateTableMetadata metadata, final FederateRowExecutor executor) {
+ public FederateFilterableTable(final FederateTableMetaData metadata, final FederateRowExecutor executor) {
super(metadata, executor);
}
@@ -44,7 +44,7 @@ public final class FederateFilterableTable extends AbstractFederateTable impleme
return new AbstractEnumerable<Object[]>() {
@Override
public Enumerator<Object[]> enumerator() {
- return new FederateRowEnumerator(getExecutor().execute(getMetadata(), root, filters, projects));
+ return new FederateRowEnumerator(getExecutor().execute(getMetaData(), root, filters, projects));
}
};
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java
index 36c788a..dfeab8a 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java
@@ -37,7 +37,7 @@ import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
import org.apache.shardingsphere.infra.optimize.ShardingSphereOptimizer;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContext;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.builder.schema.SchemaRulesBuilderMaterials;
import org.apache.shardingsphere.infra.rule.builder.schema.SchemaRulesBuilder;
@@ -138,11 +138,11 @@ public final class FederateJDBCExecutorTest {
}
private FederateLogicSchema initializeCalciteSchema(final String schemaName, final Map<String, List<String>> columnMap, final Map<String, List<String>> tableMap) {
- FederateSchemaMetadata federateSchemaMetadata = buildSchemaMetaData(schemaName, tableMap.get(schemaName), columnMap);
- return new FederateLogicSchema(federateSchemaMetadata, null);
+ FederateSchemaMetaData federateSchemaMetaData = buildSchemaMetaData(schemaName, tableMap.get(schemaName), columnMap);
+ return new FederateLogicSchema(federateSchemaMetaData, null);
}
- private FederateSchemaMetadata buildSchemaMetaData(final String schemaName, final List<String> tableNames, final Map<String, List<String>> tableColumns) {
+ private FederateSchemaMetaData buildSchemaMetaData(final String schemaName, final List<String> tableNames, final Map<String, List<String>> tableColumns) {
Map<String, TableMetaData> tableMetaDatas = new HashMap<>();
for (String table: tableNames) {
List<ColumnMetaData> columnMetaDatas = new ArrayList<>();
@@ -154,7 +154,7 @@ public final class FederateJDBCExecutorTest {
TableMetaData tableMetaData = new TableMetaData(table, columnMetaDatas, indexMetaDatas);
tableMetaDatas.put(table, tableMetaData);
}
- return new FederateSchemaMetadata(schemaName, tableMetaDatas);
+ return new FederateSchemaMetaData(schemaName, tableMetaDatas);
}
private OptimizeContextFactory initializeOptimizeContextFactory(final String schemaName, final Map<String, DataSource> actualDataSourceMap) throws SQLException {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/OptimizeContextFactory.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/OptimizeContextFactory.java
index 4a90da1..06f9391 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/OptimizeContextFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/OptimizeContextFactory.java
@@ -53,7 +53,7 @@ import org.apache.shardingsphere.infra.database.type.dialect.SQL92DatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.SQLServerDatabaseType;
import org.apache.shardingsphere.infra.exception.ShardingSphereException;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadatas;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaDatas;
import org.apache.shardingsphere.infra.optimize.core.plan.PlannerInitializer;
import java.util.Collections;
@@ -77,7 +77,7 @@ public final class OptimizeContextFactory {
private final DatabaseType databaseType;
@Getter
- private final Properties properties = new Properties();
+ private final Properties props = new Properties();
private final CalciteConnectionConfig connectionConfig;
@@ -91,7 +91,7 @@ public final class OptimizeContextFactory {
private final RelDataTypeFactory typeFactory;
@Getter
- private final FederateSchemaMetadatas schemaMetadatas;
+ private final FederateSchemaMetaDatas schemaMetaDatas;
private final RelOptCluster cluster;
@@ -100,8 +100,8 @@ public final class OptimizeContextFactory {
initProperties(databaseType);
typeFactory = new JavaTypeFactoryImpl();
cluster = newCluster();
- schemaMetadatas = new FederateSchemaMetadatas(metaDataMap);
- connectionConfig = new CalciteConnectionConfigImpl(properties);
+ schemaMetaDatas = new FederateSchemaMetaDatas(metaDataMap);
+ connectionConfig = new CalciteConnectionConfigImpl(props);
parserConfig = SqlParser.config()
.withLex(connectionConfig.lex())
.withIdentifierMaxLength(SqlParser.DEFAULT_IDENTIFIER_MAX_LENGTH)
@@ -111,50 +111,50 @@ public final class OptimizeContextFactory {
private void initProperties(final DatabaseType databaseType) {
// TODO Logic could be improved.
- properties.setProperty(TIME_ZONE, "UTC");
- if (databaseType instanceof MySQLDatabaseType || databaseType == null) {
- properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
- properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.MYSQL_5.name());
- properties.setProperty(FUN_CAMEL_NAME, SqlLibrary.MYSQL.fun);
+ props.setProperty(TIME_ZONE, "UTC");
+ if (databaseType instanceof MySQLDatabaseType || null == databaseType) {
+ props.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
+ props.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.MYSQL_5.name());
+ props.setProperty(FUN_CAMEL_NAME, SqlLibrary.MYSQL.fun);
return;
}
if (databaseType instanceof H2DatabaseType) {
// TODO No suitable type of Lex
- properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
- properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.LENIENT.name());
- properties.setProperty(FUN_CAMEL_NAME, SqlLibrary.STANDARD.fun);
+ props.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
+ props.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.LENIENT.name());
+ props.setProperty(FUN_CAMEL_NAME, SqlLibrary.STANDARD.fun);
return;
}
if (databaseType instanceof MariaDBDatabaseType) {
- properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
- properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.MYSQL_5.name());
- properties.setProperty(FUN_CAMEL_NAME, SqlLibrary.MYSQL.fun);
+ props.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
+ props.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.MYSQL_5.name());
+ props.setProperty(FUN_CAMEL_NAME, SqlLibrary.MYSQL.fun);
return;
}
if (databaseType instanceof OracleDatabaseType) {
- properties.setProperty(LEX_CAMEL_NAME, Lex.ORACLE.name());
- properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.ORACLE_12.name());
- properties.setProperty(FUN_CAMEL_NAME, SqlLibrary.ORACLE.fun);
+ props.setProperty(LEX_CAMEL_NAME, Lex.ORACLE.name());
+ props.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.ORACLE_12.name());
+ props.setProperty(FUN_CAMEL_NAME, SqlLibrary.ORACLE.fun);
return;
}
if (databaseType instanceof PostgreSQLDatabaseType || databaseType instanceof OpenGaussDatabaseType) {
// TODO No suitable type of Lex and conformance
- properties.setProperty(LEX_CAMEL_NAME, Lex.JAVA.name());
- properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.BABEL.name());
- properties.setProperty(FUN_CAMEL_NAME, SqlLibrary.POSTGRESQL.fun);
+ props.setProperty(LEX_CAMEL_NAME, Lex.JAVA.name());
+ props.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.BABEL.name());
+ props.setProperty(FUN_CAMEL_NAME, SqlLibrary.POSTGRESQL.fun);
return;
}
if (databaseType instanceof SQL92DatabaseType) {
// TODO No suitable type of Lex
- properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
- properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.STRICT_92.name());
- properties.setProperty(FUN_CAMEL_NAME, SqlLibrary.STANDARD.fun);
+ props.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
+ props.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.STRICT_92.name());
+ props.setProperty(FUN_CAMEL_NAME, SqlLibrary.STANDARD.fun);
return;
}
if (databaseType instanceof SQLServerDatabaseType) {
- properties.setProperty(LEX_CAMEL_NAME, Lex.SQL_SERVER.name());
- properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.SQL_SERVER_2008.name());
- properties.setProperty(FUN_CAMEL_NAME, SqlLibrary.STANDARD.fun);
+ props.setProperty(LEX_CAMEL_NAME, Lex.SQL_SERVER.name());
+ props.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.SQL_SERVER_2008.name());
+ props.setProperty(FUN_CAMEL_NAME, SqlLibrary.STANDARD.fun);
return;
}
throw new ShardingSphereException("No matching DatabaseType found");
@@ -177,7 +177,7 @@ public final class OptimizeContextFactory {
CalciteCatalogReader catalogReader = createCalciteCatalogReader(schemaName, connectionConfig, typeFactory, logicSchema);
SqlValidator validator = createSqlValidator(connectionConfig, typeFactory, catalogReader);
SqlToRelConverter relConverter = createSqlToRelConverter(cluster, validator, catalogReader);
- return new OptimizeContext(databaseType, properties, schemaName, logicSchema, parserConfig, validator, relConverter);
+ return new OptimizeContext(databaseType, props, schemaName, logicSchema, parserConfig, validator, relConverter);
}
private CalciteCatalogReader createCalciteCatalogReader(final String schemaName, final CalciteConnectionConfig config,
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetadata.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetaData.java
similarity index 84%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetadata.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetaData.java
index 873c825..ad404f6 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetadata.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetaData.java
@@ -26,20 +26,19 @@ import java.util.Map;
import java.util.Map.Entry;
/**
- * Federate schema metadata.
- *
+ * Federate schema meta data.
*/
@Getter
-public final class FederateSchemaMetadata {
+public final class FederateSchemaMetaData {
private final String name;
- private final Map<String, FederateTableMetadata> tables = new LinkedHashMap<>();
+ private final Map<String, FederateTableMetaData> tables = new LinkedHashMap<>();
- public FederateSchemaMetadata(final String name, final Map<String, TableMetaData> metaData) {
+ public FederateSchemaMetaData(final String name, final Map<String, TableMetaData> metaData) {
this.name = name;
for (Entry<String, TableMetaData> entry : metaData.entrySet()) {
- tables.put(entry.getKey(), new FederateTableMetadata(entry.getValue().getName(), entry.getValue()));
+ tables.put(entry.getKey(), new FederateTableMetaData(entry.getValue().getName(), entry.getValue()));
}
}
@@ -50,7 +49,7 @@ public final class FederateSchemaMetadata {
*/
@Synchronized
public void renew(final TableMetaData metaData) {
- tables.put(metaData.getName().toLowerCase(), new FederateTableMetadata(metaData.getName(), metaData));
+ tables.put(metaData.getName().toLowerCase(), new FederateTableMetaData(metaData.getName(), metaData));
}
/**
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetadatas.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetaDatas.java
similarity index 77%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetadatas.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetaDatas.java
index 82777be..a9782c4 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetadatas.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateSchemaMetaDatas.java
@@ -25,26 +25,26 @@ import java.util.Map;
import java.util.Map.Entry;
/**
- * Federate schema metadatas.
+ * Federate schema meta datas.
*/
@Getter
-public final class FederateSchemaMetadatas {
+public final class FederateSchemaMetaDatas {
- private final Map<String, FederateSchemaMetadata> schemas = new LinkedMap<>();
+ private final Map<String, FederateSchemaMetaData> schemas = new LinkedMap<>();
- public FederateSchemaMetadatas(final Map<String, ShardingSphereMetaData> metaDataMap) {
+ public FederateSchemaMetaDatas(final Map<String, ShardingSphereMetaData> metaDataMap) {
for (Entry<String, ShardingSphereMetaData> each : metaDataMap.entrySet()) {
- schemas.put(each.getKey(), new FederateSchemaMetadata(each.getKey(), each.getValue().getSchema().getTables()));
+ schemas.put(each.getKey(), new FederateSchemaMetaData(each.getKey(), each.getValue().getSchema().getTables()));
}
}
/**
- * Get schema metadata by schema name.
+ * Get schema meta data by schema name.
*
* @param schemaName schema name
- * @return schema metadata
+ * @return schema meta data
*/
- public FederateSchemaMetadata getSchemaMetadataBySchemaName(final String schemaName) {
+ public FederateSchemaMetaData getSchemaMetaDataBySchemaName(final String schemaName) {
return schemas.get(schemaName);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateTableMetadata.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateTableMetaData.java
similarity index 94%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateTableMetadata.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateTableMetaData.java
index 0cbeba3..e844c2d 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateTableMetadata.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/FederateTableMetaData.java
@@ -32,10 +32,10 @@ import java.util.List;
import java.util.stream.Collectors;
/**
- * Federate table metadata.
+ * Federate table meta data.
*/
@Getter
-public final class FederateTableMetadata {
+public final class FederateTableMetaData {
private static final RelDataTypeFactory TYPE_FACTORY = new SqlTypeFactoryImpl(RelDataTypeSystem.DEFAULT);
@@ -45,7 +45,7 @@ public final class FederateTableMetadata {
private final List<String> columnNames = new ArrayList<>();
- public FederateTableMetadata(final String name, final TableMetaData tableMetaData) {
+ public FederateTableMetaData(final String name, final TableMetaData tableMetaData) {
this.name = name;
relProtoDataType = createRelDataType(tableMetaData);
columnNames.addAll(tableMetaData.getColumns().values().stream().map(ColumnMetaData::getName).collect(Collectors.toList()));
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/FederateRefresher.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/FederateRefresher.java
index 69dc0d1..8e7c901 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/FederateRefresher.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/FederateRefresher.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.infra.optimize.core.metadata.refresher;
-import org.apache.shardingsphere.infra.metadata.MetadataRefresher;
+import org.apache.shardingsphere.infra.metadata.MetaDataRefresher;
import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMaterials;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.SQLException;
@@ -30,7 +30,7 @@ import java.util.Collection;
*
* @param <T> type of SQL statement
*/
-public interface FederateRefresher<T extends SQLStatement> extends MetadataRefresher {
+public interface FederateRefresher<T extends SQLStatement> extends MetaDataRefresher {
/**
* Refresh federate schema.
@@ -41,5 +41,5 @@ public interface FederateRefresher<T extends SQLStatement> extends MetadataRefre
* @param materials schema builder materials
* @throws SQLException SQL exception
*/
- void refresh(FederateSchemaMetadata schema, Collection<String> logicDataSourceNames, T sqlStatement, SchemaBuilderMaterials materials) throws SQLException;
+ void refresh(FederateSchemaMetaData schema, Collection<String> logicDataSourceNames, T sqlStatement, SchemaBuilderMaterials materials) throws SQLException;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/AlterTableStatementFederateRefresher.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/AlterTableStatementFederateRefresher.java
index fcde3cc..0210443 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/AlterTableStatementFederateRefresher.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/AlterTableStatementFederateRefresher.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.optimize.core.metadata.refresher.type;
import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMaterials;
import org.apache.shardingsphere.infra.metadata.schema.builder.TableMetaDataBuilder;
import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.infra.optimize.core.metadata.refresher.FederateRefresher;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.AlterTableStatement;
@@ -35,8 +35,8 @@ import java.util.Optional;
public final class AlterTableStatementFederateRefresher implements FederateRefresher<AlterTableStatement> {
@Override
- public void refresh(final FederateSchemaMetadata schema, final Collection<String> logicDataSourceNames,
- final AlterTableStatement sqlStatement, final SchemaBuilderMaterials materials) throws SQLException {
+ public void refresh(final FederateSchemaMetaData schema, final Collection<String> logicDataSourceNames,
+ final AlterTableStatement sqlStatement, final SchemaBuilderMaterials materials) throws SQLException {
String tableName = sqlStatement.getTable().getTableName().getIdentifier().getValue();
if (sqlStatement.getRenameTable().isPresent()) {
String renameTableName = sqlStatement.getRenameTable().get().getTableName().getIdentifier().getValue();
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/CreateTableStatementFederateRefresher.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/CreateTableStatementFederateRefresher.java
index 2903d0f..299604c 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/CreateTableStatementFederateRefresher.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/CreateTableStatementFederateRefresher.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.optimize.core.metadata.refresher.type;
import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMaterials;
import org.apache.shardingsphere.infra.metadata.schema.builder.TableMetaDataBuilder;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.infra.optimize.core.metadata.refresher.FederateRefresher;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
@@ -34,7 +34,7 @@ import java.util.Optional;
public final class CreateTableStatementFederateRefresher implements FederateRefresher<CreateTableStatement> {
@Override
- public void refresh(final FederateSchemaMetadata schema, final Collection<String> logicDataSourceNames,
+ public void refresh(final FederateSchemaMetaData schema, final Collection<String> logicDataSourceNames,
final CreateTableStatement sqlStatement, final SchemaBuilderMaterials materials) throws SQLException {
String tableName = sqlStatement.getTable().getTableName().getIdentifier().getValue();
Optional.ofNullable(TableMetaDataBuilder.load(Collections.singletonList(tableName), materials).get(tableName))
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/DropTableStatementFederateRefresher.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/DropTableStatementFederateRefresher.java
index f4479ac..88cfdbc 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/DropTableStatementFederateRefresher.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/type/DropTableStatementFederateRefresher.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.optimize.core.metadata.refresher.type;
import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMaterials;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.infra.optimize.core.metadata.refresher.FederateRefresher;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropTableStatement;
@@ -31,7 +31,7 @@ import java.util.Collection;
public final class DropTableStatementFederateRefresher implements FederateRefresher<DropTableStatement> {
@Override
- public void refresh(final FederateSchemaMetadata schema, final Collection<String> logicDataSourceNames, final DropTableStatement sqlStatement, final SchemaBuilderMaterials materials)
+ public void refresh(final FederateSchemaMetaData schema, final Collection<String> logicDataSourceNames, final DropTableStatement sqlStatement, final SchemaBuilderMaterials materials)
throws SQLException {
sqlStatement.getTables().forEach(each -> schema.remove(each.getTableName().getIdentifier().getValue()));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/AlterTableStatementFederateRefresherTest.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/AlterTableStatementFederateRefresherTest.java
index aa42cd5..3e8039c 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/AlterTableStatementFederateRefresherTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/AlterTableStatementFederateRefresherTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMate
import org.apache.shardingsphere.infra.metadata.schema.model.ColumnMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.IndexMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.infra.optimize.core.metadata.refresher.type.AlterTableStatementFederateRefresher;
import org.apache.shardingsphere.infra.optimize.core.metadata.rule.CommonFixtureRule;
import org.apache.shardingsphere.infra.rule.identifier.type.TableContainedRule;
@@ -70,7 +70,7 @@ public final class AlterTableStatementFederateRefresherTest {
TableContainedRule rule = mock(TableContainedRule.class);
when(materials.getRules()).thenReturn(Collections.singletonList(rule));
FederateRefresher<AlterTableStatement> federateRefresher = new AlterTableStatementFederateRefresher();
- FederateSchemaMetadata schema = buildSchema();
+ FederateSchemaMetaData schema = buildSchema();
federateRefresher.refresh(schema, Collections.singletonList("ds"), alterTableStatement, materials);
assertTrue(schema.getTables().containsKey("t_order"));
}
@@ -90,15 +90,15 @@ public final class AlterTableStatementFederateRefresherTest {
when(materials.getRules()).thenReturn(Collections.singletonList(new CommonFixtureRule()));
when(materials.getDataSourceMap()).thenReturn(Collections.singletonMap("ds", mock(DataSource.class)));
FederateRefresher<AlterTableStatement> federateRefresher = new AlterTableStatementFederateRefresher();
- FederateSchemaMetadata schema = buildSchema();
+ FederateSchemaMetaData schema = buildSchema();
federateRefresher.refresh(schema, Collections.singletonList("ds"), alterTableStatement, materials);
assertFalse(schema.getTables().containsKey("t_order"));
assertTrue(schema.getTables().containsKey("t_order_new"));
}
- private FederateSchemaMetadata buildSchema() {
+ private FederateSchemaMetaData buildSchema() {
Map<String, TableMetaData> metaData = ImmutableMap.of("t_order", new TableMetaData("t_order", Collections.singletonList(new ColumnMetaData("order_id", 1, false, false, false)),
Collections.singletonList(new IndexMetaData("index"))));
- return new FederateSchemaMetadata("t_order", metaData);
+ return new FederateSchemaMetaData("t_order", metaData);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/CreateTableStatementFederateRefresherTest.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/CreateTableStatementFederateRefresherTest.java
index 2b62352..8fc7f82 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/CreateTableStatementFederateRefresherTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/CreateTableStatementFederateRefresherTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMate
import org.apache.shardingsphere.infra.metadata.schema.model.ColumnMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.IndexMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.infra.optimize.core.metadata.refresher.type.CreateTableStatementFederateRefresher;
import org.apache.shardingsphere.infra.rule.identifier.type.TableContainedRule;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
@@ -83,15 +83,15 @@ public final class CreateTableStatementFederateRefresherTest {
TableContainedRule rule = mock(TableContainedRule.class);
when(materials.getRules()).thenReturn(Collections.singletonList(rule));
FederateRefresher<CreateTableStatement> federateRefresher = new CreateTableStatementFederateRefresher();
- FederateSchemaMetadata schema = buildSchema();
+ FederateSchemaMetaData schema = buildSchema();
federateRefresher.refresh(schema, Collections.singletonList("ds"), createTableStatement, materials);
assertTrue(schema.getTables().containsKey("t_order"));
assertTrue(schema.getTables().get("t_order").getColumnNames().contains("order_id"));
}
- private FederateSchemaMetadata buildSchema() {
+ private FederateSchemaMetaData buildSchema() {
Map<String, TableMetaData> metaData = ImmutableMap.of("t_order", new TableMetaData("t_order", Collections.singletonList(new ColumnMetaData("order_id", 1, false, false, false)),
Collections.singletonList(new IndexMetaData("index"))));
- return new FederateSchemaMetadata("t_order", metaData);
+ return new FederateSchemaMetaData("t_order", metaData);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/DropTableStatementFederateRefresherTest.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/DropTableStatementFederateRefresherTest.java
index 32e2630..10e2a3a 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/DropTableStatementFederateRefresherTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/metadata/refresher/DropTableStatementFederateRefresherTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMate
import org.apache.shardingsphere.infra.metadata.schema.model.ColumnMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.IndexMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.infra.optimize.core.metadata.refresher.type.DropTableStatementFederateRefresher;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment;
@@ -70,7 +70,7 @@ public final class DropTableStatementFederateRefresherTest {
}
private void refresh(final DropTableStatement dropTableStatement) throws SQLException {
- FederateSchemaMetadata schema = buildSchema();
+ FederateSchemaMetaData schema = buildSchema();
FederateRefresher<DropTableStatement> schemaRefresher = new DropTableStatementFederateRefresher();
dropTableStatement.getTables().add(new SimpleTableSegment(new TableNameSegment(1, 3, new IdentifierValue("t_order"))));
schemaRefresher.refresh(schema, Collections.emptyList(), dropTableStatement, mock(SchemaBuilderMaterials.class));
@@ -103,15 +103,15 @@ public final class DropTableStatementFederateRefresherTest {
}
private void refreshWithUnConfigured(final DropTableStatement dropTableStatement) throws SQLException {
- FederateSchemaMetadata schema = buildSchema();
+ FederateSchemaMetaData schema = buildSchema();
FederateRefresher<DropTableStatement> schemaRefresher = new DropTableStatementFederateRefresher();
dropTableStatement.getTables().add(new SimpleTableSegment(new TableNameSegment(1, 3, new IdentifierValue("t_order_item"))));
schemaRefresher.refresh(schema, Collections.singletonList("t_order_item"), dropTableStatement, mock(SchemaBuilderMaterials.class));
}
- private FederateSchemaMetadata buildSchema() {
+ private FederateSchemaMetaData buildSchema() {
Map<String, TableMetaData> metaData = ImmutableMap.of("t_order", new TableMetaData("t_order", Collections.singletonList(new ColumnMetaData("order_id", 1, false, false, false)),
Collections.singletonList(new IndexMetaData("index"))));
- return new FederateSchemaMetadata("t_order", metaData);
+ return new FederateSchemaMetaData("t_order", metaData);
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/JDBCLockEngine.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/JDBCLockEngine.java
index d90a389..1641d6f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/JDBCLockEngine.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/JDBCLockEngine.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.J
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
import org.apache.shardingsphere.infra.lock.LockNameUtil;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
-import org.apache.shardingsphere.infra.context.refresher.MetadataRefreshEngine;
+import org.apache.shardingsphere.infra.context.refresher.MetaDataRefreshEngine;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DDLStatement;
@@ -49,7 +49,7 @@ public final class JDBCLockEngine {
private final JDBCExecutor jdbcExecutor;
- private final MetadataRefreshEngine metadataRefreshEngine;
+ private final MetaDataRefreshEngine metadataRefreshEngine;
private final Collection<String> lockNames = new ArrayList<>();
@@ -57,8 +57,8 @@ public final class JDBCLockEngine {
this.schemaName = schemaName;
this.metaDataContexts = metaDataContexts;
this.jdbcExecutor = jdbcExecutor;
- metadataRefreshEngine = new MetadataRefreshEngine(metaDataContexts.getMetaData(schemaName),
- metaDataContexts.getOptimizeContextFactory().getSchemaMetadatas().getSchemaMetadataBySchemaName(schemaName), metaDataContexts.getProps());
+ metadataRefreshEngine = new MetaDataRefreshEngine(metaDataContexts.getMetaData(schemaName),
+ metaDataContexts.getOptimizeContextFactory().getSchemaMetaDatas().getSchemaMetaDataBySchemaName(schemaName), metaDataContexts.getProps());
}
/**
@@ -114,11 +114,11 @@ public final class JDBCLockEngine {
private <T> List<T> doExecute(final ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext, final Collection<RouteUnit> routeUnits,
final JDBCExecutorCallback<T> callback, final SQLStatement sqlStatement) throws SQLException {
List<T> results = jdbcExecutor.execute(executionGroupContext, callback);
- refreshMetadata(sqlStatement, routeUnits);
+ refreshMetaData(sqlStatement, routeUnits);
return results;
}
- private void refreshMetadata(final SQLStatement sqlStatement, final Collection<RouteUnit> routeUnits) throws SQLException {
+ private void refreshMetaData(final SQLStatement sqlStatement, final Collection<RouteUnit> routeUnits) throws SQLException {
metadataRefreshEngine.refresh(sqlStatement, routeUnits.stream().map(each -> each.getDataSourceMapper().getLogicName()).collect(Collectors.toList()));
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetadataNode.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetaDataNode.java
similarity index 81%
rename from shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetadataNode.java
rename to shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetaDataNode.java
index c96545b..f9b5e69 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetadataNode.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetaDataNode.java
@@ -24,10 +24,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Schema metadata node.
+ * Schema meta data node.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SchemaMetadataNode {
+public final class SchemaMetaDataNode {
private static final String ROOT_NODE = "metadata";
@@ -38,21 +38,21 @@ public final class SchemaMetadataNode {
private static final String SCHEMA_NODE = "schema";
/**
- * Get metadata data source path.
+ * Get meta data data source path.
*
* @param schemaName schema name
* @return data source path
*/
- public static String getMetadataDataSourcePath(final String schemaName) {
- return getFullMetadataPath(schemaName, DATA_SOURCE_NODE);
+ public static String getMetaDataDataSourcePath(final String schemaName) {
+ return getFullMetaDataPath(schemaName, DATA_SOURCE_NODE);
}
/**
- * Get metadata node path.
+ * Get meta data node path.
*
- * @return metadata node path
+ * @return meta data node path
*/
- public static String getMetadataNodePath() {
+ public static String getMetaDataNodePath() {
return String.join("/", "", ROOT_NODE);
}
@@ -73,20 +73,20 @@ public final class SchemaMetadataNode {
* @return rule path
*/
public static String getRulePath(final String schemaName) {
- return getFullMetadataPath(schemaName, RULE_NODE);
+ return getFullMetaDataPath(schemaName, RULE_NODE);
}
/**
- * Get metadata schema path.
+ * Get meta data schema path.
*
* @param schemaName schema name
* @return schema path
*/
- public static String getMetadataSchemaPath(final String schemaName) {
- return getFullMetadataPath(schemaName, SCHEMA_NODE);
+ public static String getMetaDataSchemaPath(final String schemaName) {
+ return getFullMetaDataPath(schemaName, SCHEMA_NODE);
}
- private static String getFullMetadataPath(final String schemaName, final String node) {
+ private static String getFullMetaDataPath(final String schemaName, final String node) {
return String.join("/", "", ROOT_NODE, schemaName, node);
}
@@ -97,7 +97,7 @@ public final class SchemaMetadataNode {
* @return schema name
*/
public static String getSchemaName(final String configurationNodeFullPath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/(\\w+)" + "(/datasource|/rule|/schema)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/(\\w+)" + "(/datasource|/rule|/schema)?", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(configurationNodeFullPath);
return matcher.find() ? matcher.group(1) : "";
}
@@ -109,7 +109,7 @@ public final class SchemaMetadataNode {
* @return schema name
*/
public static String getSchemaNameBySchemaPath(final String schemaPath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/(\\w+)$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/(\\w+)$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(schemaPath);
return matcher.find() ? matcher.group(1) : "";
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistService.java
index 2e8939d..ae1f89f 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistService.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.metadata.persist.service;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.persist.PersistRepository;
-import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetaDataNode;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlSchema;
@@ -43,7 +43,7 @@ public final class SchemaMetaDataPersistService {
* @param schemaName schema name to be persisted
*/
public void persist(final String schemaName) {
- repository.persist(SchemaMetadataNode.getSchemaNamePath(schemaName), "");
+ repository.persist(SchemaMetaDataNode.getSchemaNamePath(schemaName), "");
}
/**
@@ -54,7 +54,7 @@ public final class SchemaMetaDataPersistService {
*/
public void persist(final String schemaName, final ShardingSphereSchema schema) {
String content = null == schema ? "" : YamlEngine.marshal(new SchemaYamlSwapper().swapToYamlConfiguration(schema));
- repository.persist(SchemaMetadataNode.getMetadataSchemaPath(schemaName), content);
+ repository.persist(SchemaMetaDataNode.getMetaDataSchemaPath(schemaName), content);
}
/**
@@ -63,7 +63,7 @@ public final class SchemaMetaDataPersistService {
* @param schemaName schema name to be deleted
*/
public void delete(final String schemaName) {
- repository.delete(SchemaMetadataNode.getSchemaNamePath(schemaName));
+ repository.delete(SchemaMetaDataNode.getSchemaNamePath(schemaName));
}
/**
@@ -73,7 +73,7 @@ public final class SchemaMetaDataPersistService {
* @return Loaded schema
*/
public Optional<ShardingSphereSchema> load(final String schemaName) {
- String path = repository.get(SchemaMetadataNode.getMetadataSchemaPath(schemaName));
+ String path = repository.get(SchemaMetaDataNode.getMetaDataSchemaPath(schemaName));
return Strings.isNullOrEmpty(path) ? Optional.empty() : Optional.of(new SchemaYamlSwapper().swapToObject(YamlEngine.unmarshal(path, YamlSchema.class)));
}
@@ -83,6 +83,6 @@ public final class SchemaMetaDataPersistService {
* @return all schema names
*/
public Collection<String> loadAllNames() {
- return repository.getChildrenKeys(SchemaMetadataNode.getMetadataNodePath());
+ return repository.getChildrenKeys(SchemaMetaDataNode.getMetaDataNodePath());
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/DataSourcePersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/DataSourcePersistService.java
index a9d01e3..d791cae 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/DataSourcePersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/DataSourcePersistService.java
@@ -21,7 +21,7 @@ import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.mode.persist.PersistRepository;
-import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetaDataNode;
import org.apache.shardingsphere.mode.metadata.persist.service.SchemaBasedPersistService;
import org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigurationSwapper;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
@@ -49,7 +49,7 @@ public final class DataSourcePersistService implements SchemaBasedPersistService
@Override
public void persist(final String schemaName, final Map<String, DataSourceConfiguration> dataSourceConfigs) {
- repository.persist(SchemaMetadataNode.getMetadataDataSourcePath(schemaName), YamlEngine.marshal(swapYamlDataSourceConfiguration(dataSourceConfigs)));
+ repository.persist(SchemaMetaDataNode.getMetaDataDataSourcePath(schemaName), YamlEngine.marshal(swapYamlDataSourceConfiguration(dataSourceConfigs)));
}
private Map<String, Map<String, Object>> swapYamlDataSourceConfiguration(final Map<String, DataSourceConfiguration> dataSourceConfigs) {
@@ -59,7 +59,7 @@ public final class DataSourcePersistService implements SchemaBasedPersistService
@Override
public Map<String, DataSourceConfiguration> load(final String schemaName) {
- return isExisted(schemaName) ? getDataSourceConfigurations(repository.get(SchemaMetadataNode.getMetadataDataSourcePath(schemaName))) : new LinkedHashMap<>();
+ return isExisted(schemaName) ? getDataSourceConfigurations(repository.get(SchemaMetaDataNode.getMetaDataDataSourcePath(schemaName))) : new LinkedHashMap<>();
}
@SuppressWarnings("unchecked")
@@ -75,7 +75,7 @@ public final class DataSourcePersistService implements SchemaBasedPersistService
@Override
public boolean isExisted(final String schemaName) {
- return !Strings.isNullOrEmpty(repository.get(SchemaMetadataNode.getMetadataDataSourcePath(schemaName)));
+ return !Strings.isNullOrEmpty(repository.get(SchemaMetaDataNode.getMetaDataDataSourcePath(schemaName)));
}
/**
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/SchemaRulePersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/SchemaRulePersistService.java
index 666b565..21a9df3 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/SchemaRulePersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/SchemaRulePersistService.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRuleConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.mode.persist.PersistRepository;
-import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetaDataNode;
import org.apache.shardingsphere.mode.metadata.persist.service.SchemaBasedPersistService;
import java.util.Collection;
@@ -47,7 +47,7 @@ public final class SchemaRulePersistService implements SchemaBasedPersistService
@Override
public void persist(final String schemaName, final Collection<RuleConfiguration> configs) {
- repository.persist(SchemaMetadataNode.getRulePath(schemaName), YamlEngine.marshal(createYamlRuleConfigurations(configs)));
+ repository.persist(SchemaMetaDataNode.getRulePath(schemaName), YamlEngine.marshal(createYamlRuleConfigurations(configs)));
}
private Collection<YamlRuleConfiguration> createYamlRuleConfigurations(final Collection<RuleConfiguration> ruleConfigs) {
@@ -59,12 +59,12 @@ public final class SchemaRulePersistService implements SchemaBasedPersistService
public Collection<RuleConfiguration> load(final String schemaName) {
return isExisted(schemaName)
// TODO process algorithm provided configuration
- ? new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(repository.get(SchemaMetadataNode.getRulePath(schemaName)), Collection.class))
+ ? new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(repository.get(SchemaMetaDataNode.getRulePath(schemaName)), Collection.class))
: new LinkedList<>();
}
@Override
public boolean isExisted(final String schemaName) {
- return !Strings.isNullOrEmpty(repository.get(SchemaMetadataNode.getRulePath(schemaName)));
+ return !Strings.isNullOrEmpty(repository.get(SchemaMetaDataNode.getRulePath(schemaName)));
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetadataNodeTest.java b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetaDataNodeTest.java
similarity index 79%
rename from shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetadataNodeTest.java
rename to shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetaDataNodeTest.java
index cc32b02..ec0443e 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetadataNodeTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/SchemaMetaDataNodeTest.java
@@ -23,30 +23,30 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public class SchemaMetadataNodeTest {
+public class SchemaMetaDataNodeTest {
@Test
public void assertGetRulePath() {
- assertThat(SchemaMetadataNode.getRulePath(DefaultSchema.LOGIC_NAME), is("/metadata/logic_db/rules"));
+ assertThat(SchemaMetaDataNode.getRulePath(DefaultSchema.LOGIC_NAME), is("/metadata/logic_db/rules"));
}
@Test
public void assertGetSchemaName() {
- assertThat(SchemaMetadataNode.getSchemaName("/metadata/logic_db/rules"), is(DefaultSchema.LOGIC_NAME));
+ assertThat(SchemaMetaDataNode.getSchemaName("/metadata/logic_db/rules"), is(DefaultSchema.LOGIC_NAME));
}
@Test
public void assertGetSchemaNamePath() {
- assertThat(SchemaMetadataNode.getSchemaNamePath("sharding_db"), is("/metadata/sharding_db"));
+ assertThat(SchemaMetaDataNode.getSchemaNamePath("sharding_db"), is("/metadata/sharding_db"));
}
@Test
- public void assertGetMetadataSchemaPath() {
- assertThat(SchemaMetadataNode.getMetadataSchemaPath("sharding_db"), is("/metadata/sharding_db/schema"));
+ public void assertGetMetaDataSchemaPath() {
+ assertThat(SchemaMetaDataNode.getMetaDataSchemaPath("sharding_db"), is("/metadata/sharding_db/schema"));
}
@Test
public void assertGetSchemaNameBySchemaPath() {
- assertThat(SchemaMetadataNode.getSchemaNameBySchemaPath("/metadata/logic_db"), is(DefaultSchema.LOGIC_NAME));
+ assertThat(SchemaMetaDataNode.getSchemaNameBySchemaPath("/metadata/logic_db"), is(DefaultSchema.LOGIC_NAME));
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
index d98b17b..b4968d6 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadata;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder;
import org.apache.shardingsphere.infra.rule.event.impl.DataSourceNameDisabledEvent;
@@ -98,7 +98,7 @@ public final class ClusterContextManagerCoordinator {
public synchronized void renew(final SchemaAddedEvent event) throws SQLException {
persistSchema(event.getSchemaName());
ShardingSphereMetaData metaData = buildMetaData(event.getSchemaName());
- contextManager.getMetaDataContexts().getOptimizeContextFactory().getSchemaMetadatas().getSchemas().put(event.getSchemaName(), new FederateSchemaMetadata(event.getSchemaName(),
+ contextManager.getMetaDataContexts().getOptimizeContextFactory().getSchemaMetaDatas().getSchemas().put(event.getSchemaName(), new FederateSchemaMetaData(event.getSchemaName(),
metaData.getSchema().getTables()));
contextManager.getMetaDataContexts().getMetaDataMap().put(event.getSchemaName(), metaData);
contextManager.renewMetaDataContexts(rebuildMetaDataContexts(contextManager.getMetaDataContexts().getMetaDataMap()));
@@ -117,7 +117,7 @@ public final class ClusterContextManagerCoordinator {
closeDataSources(schemaName);
Map<String, ShardingSphereMetaData> schemaMetaData = new HashMap<>(contextManager.getMetaDataContexts().getMetaDataMap());
schemaMetaData.remove(schemaName);
- contextManager.getMetaDataContexts().getOptimizeContextFactory().getSchemaMetadatas().getSchemas().remove(schemaName);
+ contextManager.getMetaDataContexts().getOptimizeContextFactory().getSchemaMetaDatas().getSchemas().remove(schemaName);
contextManager.renewMetaDataContexts(rebuildMetaDataContexts(schemaMetaData));
ShardingSphereEventBus.getInstance().post(new DataSourceDeletedEvent(schemaName));
}
@@ -159,12 +159,12 @@ public final class ClusterContextManagerCoordinator {
ShardingSphereMetaData originalMetaData = entry.getValue();
ShardingSphereMetaData metaData = event.getSchemaName().equals(schemaName) ? getChangedMetaData(originalMetaData, event.getSchema(), schemaName) : originalMetaData;
schemaMetaData.put(schemaName, metaData);
- contextManager.getMetaDataContexts().getOptimizeContextFactory().getSchemaMetadatas().getSchemas().put(event.getSchemaName(),
- new FederateSchemaMetadata(event.getSchemaName(), metaData.getSchema().getTables()));
+ contextManager.getMetaDataContexts().getOptimizeContextFactory().getSchemaMetaDatas().getSchemas().put(event.getSchemaName(),
+ new FederateSchemaMetaData(event.getSchemaName(), metaData.getSchema().getTables()));
}
contextManager.renewMetaDataContexts(rebuildMetaDataContexts(schemaMetaData));
} finally {
- ShardingSphereEventBus.getInstance().post(new InnerLockReleasedEvent(LockNameUtil.getMetadataRefreshLockName()));
+ ShardingSphereEventBus.getInstance().post(new InnerLockReleasedEvent(LockNameUtil.getMetaDataRefreshLockName()));
}
}
@@ -273,7 +273,7 @@ public final class ClusterContextManagerCoordinator {
private Map<String, ShardingSphereMetaData> rebuildSchemaMetaData(final String schemaName, final ShardingSphereMetaData metaData) {
Map<String, ShardingSphereMetaData> result = new HashMap<>(contextManager.getMetaDataContexts().getMetaDataMap());
result.put(schemaName, metaData);
- contextManager.getMetaDataContexts().getOptimizeContextFactory().getSchemaMetadatas().getSchemas().put(schemaName, new FederateSchemaMetadata(schemaName, metaData.getSchema().getTables()));
+ contextManager.getMetaDataContexts().getOptimizeContextFactory().getSchemaMetaDatas().getSchemas().put(schemaName, new FederateSchemaMetaData(schemaName, metaData.getSchema().getTables()));
return result;
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/cache/subscriber/ScalingRegistrySubscriber.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/cache/subscriber/ScalingRegistrySubscriber.java
index 11a2408..f77c7cf 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/cache/subscriber/ScalingRegistrySubscriber.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/cache/subscriber/ScalingRegistrySubscriber.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.confi
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.SwitchRuleConfigurationEvent;
import org.apache.shardingsphere.mode.metadata.persist.service.impl.DataSourcePersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.impl.SchemaRulePersistService;
-import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetaDataNode;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
@@ -72,13 +72,13 @@ public final class ScalingRegistrySubscriber {
@Subscribe
public void switchRuleConfiguration(final SwitchRuleConfigurationEvent event) {
persistService.persist(event.getSchemaName(), loadCachedRuleConfigurations(event.getSchemaName(), event.getRuleConfigurationCacheId()));
- registryCacheManager.deleteCache(SchemaMetadataNode.getRulePath(event.getSchemaName()), event.getRuleConfigurationCacheId());
+ registryCacheManager.deleteCache(SchemaMetaDataNode.getRulePath(event.getSchemaName()), event.getRuleConfigurationCacheId());
}
@SuppressWarnings("unchecked")
private Collection<RuleConfiguration> loadCachedRuleConfigurations(final String schemaName, final String ruleConfigCacheId) {
return new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(
- YamlEngine.unmarshal(registryCacheManager.loadCache(SchemaMetadataNode.getRulePath(schemaName), ruleConfigCacheId), Collection.class));
+ YamlEngine.unmarshal(registryCacheManager.loadCache(SchemaMetaDataNode.getRulePath(schemaName), ruleConfigCacheId), Collection.class));
}
/**
@@ -89,9 +89,9 @@ public final class ScalingRegistrySubscriber {
@Subscribe
public void cacheRuleConfiguration(final RuleConfigurationCachedEvent event) {
StartScalingEvent startScalingEvent = new StartScalingEvent(event.getSchemaName(),
- repository.get(SchemaMetadataNode.getMetadataDataSourcePath(event.getSchemaName())),
- repository.get(SchemaMetadataNode.getRulePath(event.getSchemaName())),
- registryCacheManager.loadCache(SchemaMetadataNode.getRulePath(event.getSchemaName()), event.getCacheId()), event.getCacheId());
+ repository.get(SchemaMetaDataNode.getMetaDataDataSourcePath(event.getSchemaName())),
+ repository.get(SchemaMetaDataNode.getRulePath(event.getSchemaName())),
+ registryCacheManager.loadCache(SchemaMetaDataNode.getRulePath(event.getSchemaName()), event.getCacheId()), event.getCacheId());
ShardingSphereEventBus.getInstance().post(startScalingEvent);
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
index 0b98f3c..39c5a61 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.confi
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.RuleConfigurationCachedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.RuleConfigurationsChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.SchemaChangedEvent;
-import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.SchemaMetaDataNode;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaDeletedEvent;
import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlSchema;
@@ -51,13 +51,13 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Metadata changed watcher.
+ * Meta data changed watcher.
*/
public final class MetaDataChangedWatcher implements GovernanceWatcher<GovernanceEvent> {
@Override
public Collection<String> getWatchingKeys() {
- return Collections.singleton(SchemaMetadataNode.getMetadataNodePath());
+ return Collections.singleton(SchemaMetaDataNode.getMetaDataNodePath());
}
@Override
@@ -67,7 +67,7 @@ public final class MetaDataChangedWatcher implements GovernanceWatcher<Governanc
@Override
public Optional<GovernanceEvent> createGovernanceEvent(final DataChangedEvent event) {
- String schemaName = SchemaMetadataNode.getSchemaNameBySchemaPath(event.getKey());
+ String schemaName = SchemaMetaDataNode.getSchemaNameBySchemaPath(event.getKey());
if (!Strings.isNullOrEmpty(schemaName)) {
return buildGovernanceEvent(schemaName, event);
}
@@ -88,7 +88,7 @@ public final class MetaDataChangedWatcher implements GovernanceWatcher<Governanc
}
private Optional<GovernanceEvent> buildGovernanceEvent(final DataChangedEvent event) {
- String schemaName = SchemaMetadataNode.getSchemaName(event.getKey());
+ String schemaName = SchemaMetaDataNode.getSchemaName(event.getKey());
if (Strings.isNullOrEmpty(schemaName) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
@@ -109,7 +109,7 @@ public final class MetaDataChangedWatcher implements GovernanceWatcher<Governanc
}
private boolean isDataSourceChangedEvent(final String schemaName, final String eventPath) {
- return SchemaMetadataNode.getMetadataDataSourcePath(schemaName).equals(eventPath);
+ return SchemaMetaDataNode.getMetaDataDataSourcePath(schemaName).equals(eventPath);
}
@SuppressWarnings("unchecked")
@@ -122,11 +122,11 @@ public final class MetaDataChangedWatcher implements GovernanceWatcher<Governanc
}
private boolean isRuleChangedEvent(final String schemaName, final String eventPath) {
- return SchemaMetadataNode.getRulePath(schemaName).equals(eventPath);
+ return SchemaMetaDataNode.getRulePath(schemaName).equals(eventPath);
}
private Optional<String> getRuleCacheId(final String schemaName, final String key) {
- return CacheNode.getCacheId(SchemaMetadataNode.getRulePath(schemaName), key);
+ return CacheNode.getCacheId(SchemaMetaDataNode.getRulePath(schemaName), key);
}
private GovernanceEvent createRuleChangedEvent(final String schemaName, final DataChangedEvent event) {
@@ -141,7 +141,7 @@ public final class MetaDataChangedWatcher implements GovernanceWatcher<Governanc
}
private boolean isSchemaChangedEvent(final String schemaName, final String key) {
- return SchemaMetadataNode.getMetadataSchemaPath(schemaName).equals(key);
+ return SchemaMetaDataNode.getMetaDataSchemaPath(schemaName).equals(key);
}
private GovernanceEvent createSchemaChangedEvent(final String schemaName, final DataChangedEvent event) {
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
index 9031935..8cf22df 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadatas;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaDatas;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder;
@@ -275,7 +275,7 @@ public final class ClusterContextManagerCoordinatorTest {
private OptimizeContextFactory mockOptimizeContextFactory() {
OptimizeContextFactory result = mock(OptimizeContextFactory.class);
- when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
+ when(result.getSchemaMetaDatas()).thenReturn(new FederateSchemaMetaDatas(Collections.emptyMap()));
return result;
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
index 51a815b..d5ed2af 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.binder.LogicSQL;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.context.kernel.KernelProcessor;
-import org.apache.shardingsphere.infra.context.refresher.MetadataRefreshEngine;
+import org.apache.shardingsphere.infra.context.refresher.MetaDataRefreshEngine;
import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
@@ -88,8 +88,8 @@ public final class DatabaseCommunicationEngine {
this.logicSQL = logicSQL;
proxySQLExecutor = new ProxySQLExecutor(driverType, backendConnection, this);
kernelProcessor = new KernelProcessor();
- proxyLockEngine = new ProxyLockEngine(proxySQLExecutor, new MetadataRefreshEngine(metaData,
- ProxyContext.getInstance().getContextManager().getMetaDataContexts().getOptimizeContextFactory().getSchemaMetadatas().getSchemas().get(backendConnection.getSchemaName()),
+ proxyLockEngine = new ProxyLockEngine(proxySQLExecutor, new MetaDataRefreshEngine(metaData,
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getOptimizeContextFactory().getSchemaMetaDatas().getSchemas().get(backendConnection.getSchemaName()),
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getProps()), backendConnection.getSchemaName());
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxyLockEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxyLockEngine.java
index af3c173..d8770f8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxyLockEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxyLockEngine.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.lock.LockNameUtil;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
-import org.apache.shardingsphere.infra.context.refresher.MetadataRefreshEngine;
+import org.apache.shardingsphere.infra.context.refresher.MetaDataRefreshEngine;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.TableLockWaitTimeoutException;
import org.apache.shardingsphere.proxy.backend.exception.TableLockedException;
@@ -42,13 +42,13 @@ public final class ProxyLockEngine {
private final ProxySQLExecutor proxySQLExecutor;
- private final MetadataRefreshEngine metadataRefreshEngine;
+ private final MetaDataRefreshEngine metadataRefreshEngine;
private final String schemaName;
private final Collection<String> lockNames = new ArrayList<>();
- public ProxyLockEngine(final ProxySQLExecutor proxySQLExecutor, final MetadataRefreshEngine metadataRefreshEngine, final String schemaName) {
+ public ProxyLockEngine(final ProxySQLExecutor proxySQLExecutor, final MetaDataRefreshEngine metadataRefreshEngine, final String schemaName) {
this.proxySQLExecutor = proxySQLExecutor;
this.metadataRefreshEngine = metadataRefreshEngine;
this.schemaName = schemaName;
@@ -101,11 +101,11 @@ public final class ProxyLockEngine {
private Collection<ExecuteResult> doExecute(final ExecutionContext executionContext) throws SQLException {
Collection<ExecuteResult> result = proxySQLExecutor.execute(executionContext);
- refreshMetadata(executionContext);
+ refreshMetaData(executionContext);
return result;
}
- private void refreshMetadata(final ExecutionContext executionContext) throws SQLException {
+ private void refreshMetaData(final ExecutionContext executionContext) throws SQLException {
SQLStatement sqlStatement = executionContext.getSqlStatementContext().getSqlStatement();
metadataRefreshEngine.refresh(sqlStatement, executionContext.getRouteContext().getRouteUnits().stream().map(each -> each.getDataSourceMapper().getLogicName()).collect(Collectors.toList()));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
index 99ba05b..b8e7129 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
@@ -68,7 +68,7 @@ public abstract class ProxyJDBCExecutorCallback extends JDBCExecutorCallback<Exe
return executeSQL(sql, statement, connectionMode, false);
}
- private ExecuteResult executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode, final boolean withMetadata) throws SQLException {
+ private ExecuteResult executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode, final boolean withMetaData) throws SQLException {
databaseCommunicationEngine.add(statement);
if (execute(sql, statement, isReturnGeneratedKeys)) {
ResultSet resultSet = statement.getResultSet();
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
index e1bdbf7..f94cedf 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadatas;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaDatas;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.junit.Before;
@@ -69,7 +69,7 @@ public final class DatabaseCommunicationEngineFactoryTest {
private OptimizeContextFactory mockOptimizeContextFactory() {
OptimizeContextFactory result = mock(OptimizeContextFactory.class);
- when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
+ when(result.getSchemaMetaDatas()).thenReturn(new FederateSchemaMetaDatas(Collections.emptyMap()));
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
index 1b6f502..3545833 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.infra.metadata.schema.model.ColumnMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.IndexMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadatas;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaDatas;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
@@ -105,7 +105,7 @@ public final class DatabaseCommunicationEngineTest {
private OptimizeContextFactory mockOptimizeContextFactory() {
OptimizeContextFactory result = mock(OptimizeContextFactory.class, RETURNS_DEEP_STUBS);
- when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
+ when(result.getSchemaMetaDatas()).thenReturn(new FederateSchemaMetaDatas(Collections.emptyMap()));
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
index 696c25a..77a2898 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
@@ -182,11 +182,11 @@ public final class SelectInformationExecutorTest {
mockResultSet(mockMap, false);
Map<String, ShardingSphereMetaData> metaDataMap = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataMap();
metaDataMap.put("sharding_db", getMetaData());
- DefaultSelectInformationExecutor defaultSelectMetadataExecutor = new DefaultSelectInformationExecutor(sql);
- defaultSelectMetadataExecutor.execute(mock(BackendConnection.class));
- assertThat(defaultSelectMetadataExecutor.getQueryResultMetaData().getColumnCount(), is(mockMap.size()));
- while (defaultSelectMetadataExecutor.getMergedResult().next()) {
- assertThat(defaultSelectMetadataExecutor.getMergedResult().getValue(1, String.class), is("0"));
+ DefaultSelectInformationExecutor defaultSelectMetaDataExecutor = new DefaultSelectInformationExecutor(sql);
+ defaultSelectMetaDataExecutor.execute(mock(BackendConnection.class));
+ assertThat(defaultSelectMetaDataExecutor.getQueryResultMetaData().getColumnCount(), is(mockMap.size()));
+ while (defaultSelectMetaDataExecutor.getMergedResult().next()) {
+ assertThat(defaultSelectMetaDataExecutor.getMergedResult().getValue(1, String.class), is("0"));
}
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java
index a25ad3f..9e7b391 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadatas;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaDatas;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -96,7 +96,7 @@ public final class MySQLCommandExecutorFactoryTest {
private OptimizeContextFactory mockOptimizeContextFactory() {
OptimizeContextFactory result = mock(OptimizeContextFactory.class, RETURNS_DEEP_STUBS);
- when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
+ when(result.getSchemaMetaDatas()).thenReturn(new FederateSchemaMetaDatas(Collections.emptyMap()));
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
index 73a65a8..77494b2 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
-import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetadatas;
+import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMetaDatas;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -83,7 +83,7 @@ public final class MySQLComStmtExecuteExecutorTest {
private OptimizeContextFactory mockOptimizeContextFactory() {
OptimizeContextFactory result = mock(OptimizeContextFactory.class);
- when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
+ when(result.getSchemaMetaDatas()).thenReturn(new FederateSchemaMetaDatas(Collections.emptyMap()));
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/decode/TestDecodingPlugin.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/decode/TestDecodingPlugin.java
index 4997c61..125481c 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/decode/TestDecodingPlugin.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/decode/TestDecodingPlugin.java
@@ -76,9 +76,9 @@ public final class TestDecodingPlugin implements DecodingPlugin {
default:
throw new ScalingTaskExecuteException("");
}
- String[] tableMetadata = tableName.split("\\.");
- result.setSchemaName(tableMetadata[0]);
- result.setTableName(tableMetadata[1].substring(0, tableMetadata[1].length() - 1));
+ String[] tableMetaData = tableName.split("\\.");
+ result.setSchemaName(tableMetaData[0]);
+ result.setTableName(tableMetaData[1].substring(0, tableMetaData[1].length() - 1));
return result;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSet.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSet.java
index c037100..eb08dbd 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSet.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSet.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.cases.dataset;
import lombok.Getter;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.sharding.support.InlineExpressionParser;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import javax.xml.bind.annotation.XmlAttribute;
@@ -42,7 +42,7 @@ public final class DataSet {
private int updateCount;
@XmlElement(name = "metadata")
- private final List<DataSetMetadata> metadataList = new LinkedList<>();
+ private final List<DataSetMetaData> metaDataList = new LinkedList<>();
@XmlElement(name = "row")
private final List<DataSetRow> rows = new LinkedList<>();
@@ -53,8 +53,8 @@ public final class DataSet {
* @param tableName table name
* @return data set meta data belong to current table
*/
- public DataSetMetadata findMetadata(final String tableName) {
- Optional<DataSetMetadata> result = metadataList.stream().filter(each -> tableName.equals(each.getTableName())).findFirst();
+ public DataSetMetaData findMetaData(final String tableName) {
+ Optional<DataSetMetaData> result = metaDataList.stream().filter(each -> tableName.equals(each.getTableName())).findFirst();
if (result.isPresent()) {
return result.get();
}
@@ -67,8 +67,8 @@ public final class DataSet {
* @param dataNode data node
* @return data set meta data belong to current data node
*/
- public DataSetMetadata findMetadata(final DataNode dataNode) {
- Optional<DataSetMetadata> result = metadataList.stream().filter(each -> contains(new InlineExpressionParser(each.getDataNodes()).splitAndEvaluate(), dataNode)).findFirst();
+ public DataSetMetaData findMetaData(final DataNode dataNode) {
+ Optional<DataSetMetaData> result = metaDataList.stream().filter(each -> contains(new InlineExpressionParser(each.getDataNodes()).splitAndEvaluate(), dataNode)).findFirst();
if (result.isPresent()) {
return result.get();
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/metadata/DataSetMetadata.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/metadata/DataSetMetaData.java
similarity index 97%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/metadata/DataSetMetadata.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/metadata/DataSetMetaData.java
index ab98f68..eedd6e5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/metadata/DataSetMetadata.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/metadata/DataSetMetaData.java
@@ -30,7 +30,7 @@ import java.util.List;
@Getter
@Setter
@XmlAccessorType(XmlAccessType.FIELD)
-public final class DataSetMetadata {
+public final class DataSetMetaData {
@XmlAttribute(name = "data-nodes")
private String dataNodes;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/value/SQLValueGroup.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/value/SQLValueGroup.java
index 923a686..d2347be 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/value/SQLValueGroup.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/cases/value/SQLValueGroup.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.integration.cases.value;
import lombok.Getter;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import java.text.ParseException;
import java.util.Collection;
@@ -33,11 +33,11 @@ public final class SQLValueGroup {
private final Collection<SQLValue> values;
- public SQLValueGroup(final DataSetMetadata metadata, final List<String> values) throws ParseException {
+ public SQLValueGroup(final DataSetMetaData metadata, final List<String> values) throws ParseException {
this.values = createSQLValues(metadata, values);
}
- private Collection<SQLValue> createSQLValues(final DataSetMetadata metadata, final List<String> values) throws ParseException {
+ private Collection<SQLValue> createSQLValues(final DataSetMetaData metadata, final List<String> values) throws ParseException {
Collection<SQLValue> result = new LinkedList<>();
int count = 0;
for (String each : values) {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/env/dataset/DataSetEnvironmentManager.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/env/dataset/DataSetEnvironmentManager.java
index ed21134..fef264a 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/env/dataset/DataSetEnvironmentManager.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/env/dataset/DataSetEnvironmentManager.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorServiceMan
import org.apache.shardingsphere.sharding.support.InlineExpressionParser;
import org.apache.shardingsphere.test.integration.cases.dataset.DataSet;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.cases.value.SQLValueGroup;
@@ -78,15 +78,15 @@ public final class DataSetEnvironmentManager {
for (Entry<DataNode, List<DataSetRow>> entry : dataNodeListMap.entrySet()) {
DataNode dataNode = entry.getKey();
List<DataSetRow> dataSetRows = entry.getValue();
- DataSetMetadata dataSetMetadata = dataSet.findMetadata(dataNode);
+ DataSetMetaData dataSetMetaData = dataSet.findMetaData(dataNode);
List<SQLValueGroup> sqlValueGroups = new LinkedList<>();
for (DataSetRow row : dataSetRows) {
- sqlValueGroups.add(new SQLValueGroup(dataSetMetadata, row.getValues()));
+ sqlValueGroups.add(new SQLValueGroup(dataSetMetaData, row.getValues()));
}
String insertSQL;
try (Connection connection = actualDataSources.get(dataNode.getDataSourceName()).getConnection()) {
DatabaseType databaseType = DatabaseTypeRegistry.getDatabaseTypeByURL(connection.getMetaData().getURL());
- insertSQL = generateInsertSQL(databaseType.getQuoteCharacter().wrap(dataNode.getTableName()), dataSetMetadata.getColumns());
+ insertSQL = generateInsertSQL(databaseType.getQuoteCharacter().wrap(dataNode.getTableName()), dataSetMetaData.getColumns());
}
fillDataTasks.add(new InsertTask(actualDataSources.get(dataNode.getDataSourceName()), insertSQL, sqlValueGroups));
}
@@ -110,10 +110,10 @@ public final class DataSetEnvironmentManager {
return result;
}
- private String generateInsertSQL(final String tableName, final Collection<DataSetColumn> columnMetadata) {
+ private String generateInsertSQL(final String tableName, final Collection<DataSetColumn> columnMetaData) {
List<String> columnNames = new LinkedList<>();
List<String> placeholders = new LinkedList<>();
- for (DataSetColumn each : columnMetadata) {
+ for (DataSetColumn each : columnMetaData) {
columnNames.add(each.getName());
placeholders.add("?");
}
@@ -139,7 +139,7 @@ public final class DataSetEnvironmentManager {
private Map<String, Collection<String>> getDataNodeMap() {
Map<String, Collection<String>> result = new LinkedHashMap<>();
- for (DataSetMetadata each : dataSet.getMetadataList()) {
+ for (DataSetMetaData each : dataSet.getMetaDataList()) {
for (Entry<String, Collection<String>> entry : getDataNodeMap(each).entrySet()) {
if (!result.containsKey(entry.getKey())) {
result.put(entry.getKey(), new LinkedList<>());
@@ -150,9 +150,9 @@ public final class DataSetEnvironmentManager {
return result;
}
- private Map<String, Collection<String>> getDataNodeMap(final DataSetMetadata dataSetMetadata) {
+ private Map<String, Collection<String>> getDataNodeMap(final DataSetMetaData dataSetMetaData) {
Map<String, Collection<String>> result = new LinkedHashMap<>();
- for (String each : new InlineExpressionParser(dataSetMetadata.getDataNodes()).splitAndEvaluate()) {
+ for (String each : new InlineExpressionParser(dataSetMetaData.getDataNodes()).splitAndEvaluate()) {
DataNode dataNode = new DataNode(each);
if (!result.containsKey(dataNode.getDataSourceName())) {
result.put(dataNode.getDataSourceName(), new LinkedList<>());
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchITCase.java
index 99f4b19..03667ee 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchITCase.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTes
import org.apache.shardingsphere.test.integration.cases.dataset.DataSet;
import org.apache.shardingsphere.test.integration.cases.dataset.DataSetLoader;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
import org.apache.shardingsphere.test.integration.env.dataset.DataSetEnvironmentManager;
@@ -88,15 +88,15 @@ public abstract class BatchITCase extends BaseITCase {
protected final void assertDataSets(final int[] actualUpdateCounts) throws SQLException {
DataSet expected = getDataSet(actualUpdateCounts);
- assertThat("Only support single table for DML.", expected.getMetadataList().size(), is(1));
- DataSetMetadata expectedDataSetMetadata = expected.getMetadataList().get(0);
- for (String each : new InlineExpressionParser(expectedDataSetMetadata.getDataNodes()).splitAndEvaluate()) {
+ assertThat("Only support single table for DML.", expected.getMetaDataList().size(), is(1));
+ DataSetMetaData expectedDataSetMetaData = expected.getMetaDataList().get(0);
+ for (String each : new InlineExpressionParser(expectedDataSetMetaData.getDataNodes()).splitAndEvaluate()) {
DataNode dataNode = new DataNode(each);
DataSource dataSource = getCompose() instanceof GovernanceContainerCompose
? getDataSourceForReader() : getStorageContainer().getDataSourceMap().get(dataNode.getDataSourceName());
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(String.format("SELECT * FROM %s ORDER BY 1", dataNode.getTableName()))) {
- assertDataSet(preparedStatement, expected.findRows(dataNode), expectedDataSetMetadata);
+ assertDataSet(preparedStatement, expected.findRows(dataNode), expectedDataSetMetaData);
}
}
}
@@ -117,16 +117,16 @@ public abstract class BatchITCase extends BaseITCase {
DataSet result = new DataSet();
Set<DataSetRow> existedRows = new HashSet<>();
for (DataSet each : dataSets) {
- mergeMetadata(each, result);
+ mergeMetaData(each, result);
mergeRow(each, result, existedRows);
}
sortRow(result);
return result;
}
- private void mergeMetadata(final DataSet original, final DataSet dist) {
- if (dist.getMetadataList().isEmpty()) {
- dist.getMetadataList().addAll(original.getMetadataList());
+ private void mergeMetaData(final DataSet original, final DataSet dist) {
+ if (dist.getMetaDataList().isEmpty()) {
+ dist.getMetaDataList().addAll(original.getMetaDataList());
}
}
@@ -142,17 +142,17 @@ public abstract class BatchITCase extends BaseITCase {
dataSet.getRows().sort(Comparator.comparingInt(o -> Integer.parseInt(o.getValues().get(0))));
}
- private void assertDataSet(final PreparedStatement actualPreparedStatement, final List<DataSetRow> expectedDataSetRows, final DataSetMetadata expectedDataSetMetadata) throws SQLException {
+ private void assertDataSet(final PreparedStatement actualPreparedStatement, final List<DataSetRow> expectedDataSetRows, final DataSetMetaData expectedDataSetMetaData) throws SQLException {
try (ResultSet actualResultSet = actualPreparedStatement.executeQuery()) {
- assertMetaData(actualResultSet.getMetaData(), expectedDataSetMetadata.getColumns());
+ assertMetaData(actualResultSet.getMetaData(), expectedDataSetMetaData.getColumns());
assertRows(actualResultSet, expectedDataSetRows);
}
}
- private void assertMetaData(final ResultSetMetaData actualMetaData, final Collection<DataSetColumn> columnMetadataList) throws SQLException {
- assertThat(actualMetaData.getColumnCount(), is(columnMetadataList.size()));
+ private void assertMetaData(final ResultSetMetaData actualMetaData, final Collection<DataSetColumn> columnMetaDataList) throws SQLException {
+ assertThat(actualMetaData.getColumnCount(), is(columnMetaDataList.size()));
int index = 1;
- for (DataSetColumn each : columnMetadataList) {
+ for (DataSetColumn each : columnMetaDataList) {
assertThat(actualMetaData.getColumnLabel(index++), is(each.getName()));
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dal/BaseDALIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dal/BaseDALIT.java
index bad17d3..63b4250 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dal/BaseDALIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dal/BaseDALIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.integration.engine.it.dal;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.it.SingleITCase;
import org.apache.shardingsphere.test.integration.junit.param.model.AssertionParameterizedArray;
@@ -49,7 +49,7 @@ public abstract class BaseDALIT extends SingleITCase {
private Collection<DataSetColumn> getExpectedColumns() {
Collection<DataSetColumn> result = new LinkedList<>();
- for (DataSetMetadata each : getDataSet().getMetadataList()) {
+ for (DataSetMetaData each : getDataSet().getMetaDataList()) {
result.addAll(each.getColumns());
}
return result;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
index 392170f..b9417ad 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sharding.route.engine.exception.NoSuchTableExce
import org.apache.shardingsphere.sharding.support.InlineExpressionParser;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetIndex;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.engine.it.SingleITCase;
import org.apache.shardingsphere.test.integration.junit.compose.GovernanceContainerCompose;
import org.apache.shardingsphere.test.integration.junit.param.model.AssertionParameterizedArray;
@@ -82,7 +82,7 @@ public abstract class BaseDDLIT extends SingleITCase {
protected final void assertTableMetaData() throws SQLException {
String tableName = getAssertion().getInitialSQL().getAffectedTable();
- DataSetMetadata expected = getDataSet().findMetadata(tableName);
+ DataSetMetaData expected = getDataSet().findMetaData(tableName);
Collection<DataNode> dataNodes = new InlineExpressionParser(expected.getDataNodes()).splitAndEvaluate().stream().map(DataNode::new).collect(Collectors.toList());
if (expected.getColumns().isEmpty()) {
assertNotContainsTable(dataNodes);
@@ -91,7 +91,7 @@ public abstract class BaseDDLIT extends SingleITCase {
assertTableMetaData(getActualColumns(dataNodes), getActualIndexes(dataNodes), expected);
}
- private void assertTableMetaData(final List<DataSetColumn> actualColumns, final List<DataSetIndex> actualIndexes, final DataSetMetadata expected) {
+ private void assertTableMetaData(final List<DataSetColumn> actualColumns, final List<DataSetIndex> actualIndexes, final DataSetMetaData expected) {
assertColumnMetaData(actualColumns, expected.getColumns());
assertIndexMetaData(actualIndexes, expected.getIndexes());
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java
index e0723c7..1e3b6fc 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseT
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.sharding.support.InlineExpressionParser;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.it.SingleITCase;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
@@ -69,24 +69,24 @@ public abstract class BaseDMLIT extends SingleITCase {
}
protected final void assertDataSet(final int actualUpdateCount) throws SQLException {
- assertThat("Only support single table for DML.", getDataSet().getMetadataList().size(), is(1));
+ assertThat("Only support single table for DML.", getDataSet().getMetaDataList().size(), is(1));
assertThat(actualUpdateCount, is(getDataSet().getUpdateCount()));
- DataSetMetadata expectedDataSetMetadata = getDataSet().getMetadataList().get(0);
- for (String each : new InlineExpressionParser(expectedDataSetMetadata.getDataNodes()).splitAndEvaluate()) {
+ DataSetMetaData expectedDataSetMetaData = getDataSet().getMetaDataList().get(0);
+ for (String each : new InlineExpressionParser(expectedDataSetMetaData.getDataNodes()).splitAndEvaluate()) {
DataNode dataNode = new DataNode(each);
DataSource dataSource = getCompose() instanceof GovernanceContainerCompose
? getDataSourceForReader() : getStorageContainer().getDataSourceMap().get(dataNode.getDataSourceName());
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(generateFetchActualDataSQL(dataNode))) {
- assertDataSet(preparedStatement, expectedDataSetMetadata, getDataSet().findRows(dataNode));
+ assertDataSet(preparedStatement, expectedDataSetMetaData, getDataSet().findRows(dataNode));
}
}
}
- private void assertDataSet(final PreparedStatement actualPreparedStatement, final DataSetMetadata expectedDataSetMetadata, final List<DataSetRow> expectedDataSetRows) throws SQLException {
+ private void assertDataSet(final PreparedStatement actualPreparedStatement, final DataSetMetaData expectedDataSetMetaData, final List<DataSetRow> expectedDataSetRows) throws SQLException {
try (ResultSet actualResultSet = actualPreparedStatement.executeQuery()) {
- assertMetaData(actualResultSet.getMetaData(), expectedDataSetMetadata.getColumns());
+ assertMetaData(actualResultSet.getMetaData(), expectedDataSetMetaData.getColumns());
assertRows(actualResultSet, expectedDataSetRows);
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
index d5fa001..96fdb36 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.integration.engine.it.dql;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.it.SingleITCase;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
@@ -69,7 +69,7 @@ public abstract class BaseDQLIT extends SingleITCase {
private Collection<DataSetColumn> getExpectedColumns() {
Collection<DataSetColumn> result = new LinkedList<>();
- for (DataSetMetadata each : getDataSet().getMetadataList()) {
+ for (DataSetMetaData each : getDataSet().getMetaDataList()) {
result.addAll(each.getColumns());
}
return result;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/rdl/BaseRDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/rdl/BaseRDLIT.java
index cc9458f..f16be65 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/rdl/BaseRDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/rdl/BaseRDLIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.it.rdl;
import com.google.common.base.Splitter;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.it.SingleITCase;
import org.apache.shardingsphere.test.integration.junit.param.model.AssertionParameterizedArray;
@@ -86,7 +86,7 @@ public abstract class BaseRDLIT extends SingleITCase {
private Collection<DataSetColumn> getExpectedColumns() {
Collection<DataSetColumn> result = new LinkedList<>();
- for (DataSetMetadata each : getDataSet().getMetadataList()) {
+ for (DataSetMetaData each : getDataSet().getMetaDataList()) {
result.addAll(each.getColumns());
}
return result;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/rql/BaseRQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/rql/BaseRQLIT.java
index d494125..002933e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/rql/BaseRQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/rql/BaseRQLIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.integration.engine.it.rql;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
-import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
+import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.it.SingleITCase;
import org.apache.shardingsphere.test.integration.junit.param.model.AssertionParameterizedArray;
@@ -47,7 +47,7 @@ public abstract class BaseRQLIT extends SingleITCase {
private Collection<DataSetColumn> getExpectedColumns() {
Collection<DataSetColumn> result = new LinkedList<>();
- for (DataSetMetadata each : getDataSet().getMetadataList()) {
+ for (DataSetMetaData each : getDataSet().getMetaDataList()) {
result.addAll(each.getColumns());
}
return result;