You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/12/07 16:45:42 UTC
[shardingsphere] branch master updated: Unify Metadata to MetaData (#22734)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new fb25925f76c Unify Metadata to MetaData (#22734)
fb25925f76c is described below
commit fb25925f76c1157c1250b24850f18633867718b7
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Dec 8 00:45:34 2022 +0800
Unify Metadata to MetaData (#22734)
---
.../AbstractJDBCExecutorCallbackAdviceTest.java | 4 +-
.../prepare/MySQLComStmtPrepareOKPacket.java | 2 +-
.../core/kernel/KernelDistSQLStatementVisitor.java | 14 ++--
...tement.java => ShowTableMetaDataStatement.java} | 4 +-
....java => RefreshDatabaseMetaDataStatement.java} | 4 +-
...ent.java => RefreshTableMetaDataStatement.java} | 6 +-
.../metadata/ShardingSchemaMetaDataDecorator.java | 4 +-
.../infra/binder/decider/SQLFederationDecider.java | 2 +-
.../config/props/ConfigurationPropertyKey.java | 2 +-
.../internal/InternalConfigurationPropertyKey.java | 4 +-
.../schema/builder/GenericSchemaBuilder.java | 2 +-
.../schema/loader/SchemaMetaDataLoaderEngine.java | 2 +-
.../config/props/ConfigurationPropertiesTest.java | 6 +-
.../type/AlterIndexStatementSchemaRefresher.java | 2 +-
.../driver/executor/DriverJDBCExecutor.java | 6 +-
.../metadata/CircuitBreakerDatabaseMetaData.java | 2 +-
.../resultset/CircuitBreakerResultSetMetaData.java | 2 +-
.../api/metadata/model/PipelineTableMetaData.java | 10 +--
.../core/execute/ShardingSphereDataJobWorker.java | 2 +-
.../metadata/loader/PipelineTableMetaDataUtil.java | 2 +-
.../StandardPipelineTableMetaDataLoader.java | 6 +-
.../core/metadata/node/PipelineMetaDataNode.java | 4 +-
.../core/prepare/InventoryTaskSplitter.java | 2 +-
.../singletable/route/SingleTableSQLRouter.java | 6 +-
...ator.java => SingleTableMetaDataValidator.java} | 4 +-
...va => SingleTableMetaDataValidatorFactory.java} | 12 +--
...=> SingleTableDropSchemaMetaDataValidator.java} | 6 +-
.../ddl/SingleTableDropTableValidator.java | 4 +-
...> SingleTableMetaDataValidatorFactoryTest.java} | 6 +-
...ingleTableDropSchemaMetaDataValidatorTest.java} | 8 +-
.../transaction/rule/TransactionRuleTest.java | 40 +++++-----
.../data/ShardingSphereDataPersistService.java | 2 +-
.../mode/metadata/MetaDataContextsFactoryTest.java | 4 +-
.../repository/cluster/nacos/NacosRepository.java | 56 +++++++-------
.../cluster/nacos/entity/ServiceController.java | 10 +--
.../{ServiceMetadata.java => ServiceMetaData.java} | 4 +-
.../cluster/nacos/NacosRepositoryTest.java | 90 +++++++++++-----------
.../communication/DatabaseCommunicationEngine.java | 6 +-
....java => AbstractDatabaseMetaDataExecutor.java} | 12 ++-
.../MySQLInformationSchemaExecutorFactory.java | 4 +-
.../SelectInformationSchemataExecutor.java | 10 +--
.../postgresql/PostgreSQLAdminExecutorCreator.java | 4 +-
.../executor/SelectDatabaseExecutor.java | 8 +-
.../postgresql/executor/SelectTableExecutor.java | 8 +-
.../distsql/ral/RALBackendHandlerFactory.java | 18 ++---
...aHandler.java => ShowTableMetaDataHandler.java} | 4 +-
.../distsql/ral/updatable/ApplyDistSQLHandler.java | 2 +-
.../ral/updatable/DiscardDistSQLHandler.java | 2 +-
.../ral/updatable/PrepareDistSQLHandler.java | 2 +-
...er.java => RefreshDatabaseMetaDataHandler.java} | 17 ++--
...ndler.java => RefreshTableMetaDataHandler.java} | 6 +-
...va => DefaultDatabaseMetaDataExecutorTest.java} | 8 +-
.../admin/mysql/MySQLAdminExecutorCreatorTest.java | 4 +-
...Test.java => ShowTableMetaDataHandlerTest.java} | 10 +--
...t.java => RefreshTableMetaDataHandlerTest.java} | 24 +++---
.../framework/watcher/PipelineWatcher.java | 2 +-
.../test/e2e/cases/value/SQLValueGroup.java | 8 +-
.../ral/impl/QueryableRALStatementAssert.java | 10 +--
.../ral/impl/UpdatableRALStatementAssert.java | 10 +--
....java => ShowTableMetaDataStatementAssert.java} | 18 ++---
...va => RefreshTableMetaDataStatementAssert.java} | 16 ++--
.../cases/parser/jaxb/RootSQLParserTestCases.java | 8 +-
... => RefreshTableMetaDataStatementTestCase.java} | 4 +-
...ava => ShowTableMetaDataStatementTestCase.java} | 4 +-
64 files changed, 285 insertions(+), 290 deletions(-)
diff --git a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
index e65095e8dcb..f4a07c620b2 100644
--- a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
+++ b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
@@ -82,9 +82,9 @@ public abstract class AbstractJDBCExecutorCallbackAdviceTest implements AdviceTe
return invocation.callRealMethod();
}
});
- Map<String, DataSourceMetaData> cachedDatasourceMetadata =
+ Map<String, DataSourceMetaData> cachedDatasourceMetaData =
(Map<String, DataSourceMetaData>) new FieldReader(mock, JDBCExecutorCallback.class.getDeclaredField("CACHED_DATASOURCE_METADATA")).read();
- cachedDatasourceMetadata.put("mock_url", new MockDataSourceMetaData());
+ cachedDatasourceMetaData.put("mock_url", new MockDataSourceMetaData());
Map<String, DatabaseType> storageTypes = new LinkedHashMap<>(1, 1);
storageTypes.put("mock.db", new MySQLDatabaseType());
ReflectiveUtil.setField(mock, "storageTypes", storageTypes);
diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/query/binary/prepare/MySQLComStmtPrepareOKPacket.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/query/binary/prepare/MySQLComStmtPrepareOKPacket.java
index 21b8dbf92d5..0b81af5ea81 100644
--- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/query/binary/prepare/MySQLComStmtPrepareOKPacket.java
+++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/query/binary/prepare/MySQLComStmtPrepareOKPacket.java
@@ -47,7 +47,7 @@ public final class MySQLComStmtPrepareOKPacket implements MySQLPacket {
public void write(final MySQLPacketPayload payload) {
payload.writeInt1(STATUS);
payload.writeInt4(statementId);
- // TODO Column Definition Block should be added in future when the metadata of the columns is cached.
+ // TODO Column Definition Block should be added in future when the meta data of the columns is cached.
payload.writeInt2(columnCount);
payload.writeInt2(parameterCount);
payload.writeReserved(1);
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
index 0bd2aeeb029..d3e809afcc6 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
@@ -82,7 +82,7 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComp
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariablesStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowMigrationRuleStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.AlterComputeNodeStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.AlterInventoryIncrementalRuleStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ApplyDistSQLStatement;
@@ -90,8 +90,8 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.DiscardD
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportDatabaseConfigurationStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LabelComputeNodeStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.PrepareDistSQLStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetadataStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetaDataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetInstanceStatusStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelComputeNodeStatement;
@@ -131,7 +131,7 @@ public final class KernelDistSQLStatementVisitor extends KernelDistSQLStatementB
@Override
public ASTNode visitShowTableMetadata(final ShowTableMetadataContext ctx) {
Collection<String> tableNames = ctx.tableName().stream().map(this::getIdentifierValue).collect(Collectors.toSet());
- return new ShowTableMetadataStatement(tableNames, null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
+ return new ShowTableMetaDataStatement(tableNames, null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -272,13 +272,13 @@ public final class KernelDistSQLStatementVisitor extends KernelDistSQLStatementB
@Override
public ASTNode visitRefreshDatabaseMetadata(final RefreshDatabaseMetadataContext ctx) {
- return new RefreshDatabaseMetadataStatement(null == ctx.databaseName() ? null : getIdentifierValue(ctx.databaseName()));
+ return new RefreshDatabaseMetaDataStatement(null == ctx.databaseName() ? null : getIdentifierValue(ctx.databaseName()));
}
@Override
public ASTNode visitRefreshTableMetadata(final RefreshTableMetadataContext ctx) {
if (null == ctx.refreshScope()) {
- return new RefreshTableMetadataStatement();
+ return new RefreshTableMetaDataStatement();
}
String storageUnitName = null;
String schemaName = null;
@@ -288,7 +288,7 @@ public final class KernelDistSQLStatementVisitor extends KernelDistSQLStatementB
storageUnitName = getIdentifierValue(fromSegment.storageUnitName());
schemaName = null == fromSegment.schemaName() ? null : getIdentifierValue(fromSegment.schemaName());
}
- return new RefreshTableMetadataStatement(tableName, storageUnitName, schemaName);
+ return new RefreshTableMetaDataStatement(tableName, storageUnitName, schemaName);
}
@Override
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetadataStatement.java b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java
similarity index 94%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetadataStatement.java
rename to distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java
index c12b615492c..8f9f1e6bce0 100644
--- a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetadataStatement.java
+++ b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java
@@ -27,10 +27,10 @@ import java.util.Collection;
import java.util.Optional;
/**
- * Show table metadata statement.
+ * Show table meta data statement.
*/
@RequiredArgsConstructor
-public final class ShowTableMetadataStatement extends QueryableRALStatement implements FromDatabaseAvailable {
+public final class ShowTableMetaDataStatement extends QueryableRALStatement implements FromDatabaseAvailable {
@Getter
private final Collection<String> tableNames;
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetadataStatement.java b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
similarity index 92%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetadataStatement.java
rename to distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
index 462a39737a7..9a3668a65e5 100644
--- a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetadataStatement.java
+++ b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
@@ -24,11 +24,11 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatem
import java.util.Optional;
/**
- * Refresh database metadata statement.
+ * Refresh database meta data statement.
*/
@RequiredArgsConstructor
@Getter
-public final class RefreshDatabaseMetadataStatement extends UpdatableRALStatement {
+public final class RefreshDatabaseMetaDataStatement extends UpdatableRALStatement {
private final String databaseName;
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetadataStatement.java b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java
similarity index 92%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetadataStatement.java
rename to distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java
index 40752b0249b..aeffc04eab1 100644
--- a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetadataStatement.java
+++ b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java
@@ -23,10 +23,10 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatem
import java.util.Optional;
/**
- * Refresh table metadata statement.
+ * Refresh table meta data statement.
*/
@RequiredArgsConstructor
-public final class RefreshTableMetadataStatement extends UpdatableRALStatement {
+public final class RefreshTableMetaDataStatement extends UpdatableRALStatement {
private final String tableName;
@@ -34,7 +34,7 @@ public final class RefreshTableMetadataStatement extends UpdatableRALStatement {
private final String schemaName;
- public RefreshTableMetadataStatement() {
+ public RefreshTableMetaDataStatement() {
this(null, null, null);
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataDecorator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataDecorator.java
index d133444eb3c..97fbf624f31 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataDecorator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataDecorator.java
@@ -48,11 +48,11 @@ public final class ShardingSchemaMetaDataDecorator implements RuleBasedSchemaMet
@Override
public Map<String, SchemaMetaData> decorate(final Map<String, SchemaMetaData> schemaMetaDataMap, final ShardingRule rule, final GenericSchemaBuilderMaterial material) {
Map<String, SchemaMetaData> result = new LinkedHashMap<>(schemaMetaDataMap.size(), 1);
- boolean checkTableMetadataEnabled = material.getProps().getValue(ConfigurationPropertyKey.CHECK_TABLE_METADATA_ENABLED);
+ boolean checkTableMetaDataEnabled = material.getProps().getValue(ConfigurationPropertyKey.CHECK_TABLE_META_DATA_ENABLED);
for (Entry<String, SchemaMetaData> entry : schemaMetaDataMap.entrySet()) {
Collection<TableMetaData> tables = new LinkedList<>();
for (Entry<String, Collection<TableMetaData>> tableEntry : getLogicTableMetaDataMap(entry.getValue(), rule).entrySet()) {
- if (checkTableMetadataEnabled) {
+ if (checkTableMetaDataEnabled) {
checkUniformed(tableEntry.getKey(), tableEntry.getValue());
}
tables.add(tableEntry.getValue().iterator().next());
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/decider/SQLFederationDecider.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/decider/SQLFederationDecider.java
index 4fd410ed583..b0619bed83d 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/decider/SQLFederationDecider.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/decider/SQLFederationDecider.java
@@ -36,7 +36,7 @@ public interface SQLFederationDecider<T extends ShardingSphereRule> extends Orde
*
* @param deciderContext decider context
* @param queryContext query context
- * @param database database metadata
+ * @param database database
* @param rule rule
* @param props props
*/
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
index f0e3e803cf5..0f9ba44f021 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
@@ -55,7 +55,7 @@ public enum ConfigurationPropertyKey implements TypedPropertyKey {
/**
* Whether validate table meta data consistency when application startup or updated.
*/
- CHECK_TABLE_METADATA_ENABLED("check-table-metadata-enabled", String.valueOf(Boolean.FALSE), boolean.class, false),
+ CHECK_TABLE_META_DATA_ENABLED("check-table-metadata-enabled", String.valueOf(Boolean.FALSE), boolean.class, false),
/**
* SQL federation type.
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/internal/InternalConfigurationPropertyKey.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/internal/InternalConfigurationPropertyKey.java
index f309a32574e..e0134e391fb 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/internal/InternalConfigurationPropertyKey.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/internal/InternalConfigurationPropertyKey.java
@@ -29,9 +29,9 @@ import org.apache.shardingsphere.infra.util.props.TypedPropertyKey;
public enum InternalConfigurationPropertyKey implements TypedPropertyKey {
/**
- * Proxy metadata collector enabled.
+ * Proxy meta data collector enabled.
*/
- PROXY_METADATA_COLLECTOR_ENABLED("proxy-metadata-collector-enabled", String.valueOf(Boolean.TRUE), boolean.class, true);
+ PROXY_META_DATA_COLLECTOR_ENABLED("proxy-meta-data-collector-enabled", String.valueOf(Boolean.TRUE), boolean.class, true);
private final String key;
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
index 2dd029643cf..d29122bdbd4 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
@@ -95,7 +95,7 @@ public final class GenericSchemaBuilder {
}
private static Map<String, SchemaMetaData> loadSchemas(final Collection<String> tableNames, final GenericSchemaBuilderMaterial material) throws SQLException {
- boolean checkMetaDataEnable = material.getProps().getValue(ConfigurationPropertyKey.CHECK_TABLE_METADATA_ENABLED);
+ boolean checkMetaDataEnable = material.getProps().getValue(ConfigurationPropertyKey.CHECK_TABLE_META_DATA_ENABLED);
Collection<SchemaMetaDataLoaderMaterial> schemaMetaDataLoaderMaterials = SchemaMetaDataUtil.getSchemaMetaDataLoaderMaterials(tableNames, material, checkMetaDataEnable);
if (schemaMetaDataLoaderMaterials.isEmpty()) {
return Collections.emptyMap();
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/SchemaMetaDataLoaderEngine.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/SchemaMetaDataLoaderEngine.java
index 46085710942..cab51ae80cf 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/SchemaMetaDataLoaderEngine.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/SchemaMetaDataLoaderEngine.java
@@ -80,7 +80,7 @@ public final class SchemaMetaDataLoaderEngine {
if (dialectSchemaMetaDataLoader.isPresent()) {
try {
return dialectSchemaMetaDataLoader.get().load(material.getDataSource(), material.getActualTableNames(), material.getDefaultSchemaName());
- // TODO replace Exception to SQLException when all dialect loader can handle metadata load normally
+ // TODO replace Exception to SQLException when all dialect loader can handle meta data load normally
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertiesTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertiesTest.java
index 29481b62f06..a9c4eb14c4e 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertiesTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertiesTest.java
@@ -35,7 +35,7 @@ public final class ConfigurationPropertiesTest {
assertTrue(actual.getValue(ConfigurationPropertyKey.SQL_SIMPLE));
assertThat(actual.getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE), is(20));
assertThat(actual.getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY), is(20));
- assertTrue(actual.getValue(ConfigurationPropertyKey.CHECK_TABLE_METADATA_ENABLED));
+ assertTrue(actual.getValue(ConfigurationPropertyKey.CHECK_TABLE_META_DATA_ENABLED));
assertThat(actual.getValue(ConfigurationPropertyKey.SQL_FEDERATION_TYPE), is("ORIGINAL"));
assertThat(actual.getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE), is("PostgreSQL"));
assertThat(actual.getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD), is(20));
@@ -56,7 +56,7 @@ public final class ConfigurationPropertiesTest {
result.setProperty(ConfigurationPropertyKey.SQL_SIMPLE.getKey(), Boolean.TRUE.toString());
result.setProperty(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE.getKey(), "20");
result.setProperty(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY.getKey(), "20");
- result.setProperty(ConfigurationPropertyKey.CHECK_TABLE_METADATA_ENABLED.getKey(), Boolean.TRUE.toString());
+ result.setProperty(ConfigurationPropertyKey.CHECK_TABLE_META_DATA_ENABLED.getKey(), Boolean.TRUE.toString());
result.setProperty(ConfigurationPropertyKey.SQL_FEDERATION_TYPE.getKey(), "ORIGINAL");
result.setProperty(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE.getKey(), "PostgreSQL");
result.setProperty(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD.getKey(), "20");
@@ -79,7 +79,7 @@ public final class ConfigurationPropertiesTest {
assertFalse(actual.getValue(ConfigurationPropertyKey.SQL_SIMPLE));
assertThat(actual.getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE), is(0));
assertThat(actual.getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY), is(1));
- assertFalse(actual.getValue(ConfigurationPropertyKey.CHECK_TABLE_METADATA_ENABLED));
+ assertFalse(actual.getValue(ConfigurationPropertyKey.CHECK_TABLE_META_DATA_ENABLED));
assertThat(actual.getValue(ConfigurationPropertyKey.SQL_FEDERATION_TYPE), is("NONE"));
assertThat(actual.getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE), is(""));
assertThat(actual.getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD), is(128));
diff --git a/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterIndexStatementSchemaRefresher.java b/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterIndexStatementSchemaRefresher.java
index 500f278562d..f7068b31a78 100644
--- a/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterIndexStatementSchemaRefresher.java
+++ b/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterIndexStatementSchemaRefresher.java
@@ -50,7 +50,7 @@ public final class AlterIndexStatementSchemaRefresher implements MetaDataRefresh
Optional<String> logicTableName = findLogicTableName(database.getSchema(actualSchemaName), indexName);
if (logicTableName.isPresent()) {
ShardingSphereTable table = database.getSchema(actualSchemaName).getTable(logicTableName.get());
- Preconditions.checkNotNull(table, "Can not get the table '%s' metadata!", logicTableName.get());
+ Preconditions.checkNotNull(table, "Can not get the table '%s' meta data!", logicTableName.get());
table.getIndexes().remove(indexName);
String renameIndexName = renameIndex.get().getIndexName().getIdentifier().getValue();
table.getIndexes().put(renameIndexName, new ShardingSphereIndex(renameIndexName));
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
index bd595960d98..cba0a66c175 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
@@ -53,7 +53,7 @@ public final class DriverJDBCExecutor {
private final JDBCExecutor jdbcExecutor;
- private final MetaDataRefreshEngine metadataRefreshEngine;
+ private final MetaDataRefreshEngine metaDataRefreshEngine;
private final EventBusContext eventBusContext;
@@ -63,7 +63,7 @@ public final class DriverJDBCExecutor {
this.jdbcExecutor = jdbcExecutor;
metaDataContexts = contextManager.getMetaDataContexts();
eventBusContext = contextManager.getInstanceContext().getEventBusContext();
- metadataRefreshEngine = new MetaDataRefreshEngine(metaDataContexts.getMetaData().getDatabase(databaseName), metaDataContexts.getMetaData().getProps());
+ metaDataRefreshEngine = new MetaDataRefreshEngine(metaDataContexts.getMetaData().getDatabase(databaseName), metaDataContexts.getMetaData().getProps());
}
/**
@@ -159,7 +159,7 @@ public final class DriverJDBCExecutor {
}
private void refreshMetaData(final SQLStatementContext<?> sqlStatementContext, final Collection<RouteUnit> routeUnits) throws SQLException {
- Optional<MetaDataRefreshedEvent> event = metadataRefreshEngine.refresh(sqlStatementContext, routeUnits);
+ Optional<MetaDataRefreshedEvent> event = metaDataRefreshEngine.refresh(sqlStatementContext, routeUnits);
if (contextManager.getInstanceContext().isCluster() && event.isPresent()) {
eventBusContext.post(event.get());
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaData.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaData.java
index 5c0793d5988..f18e68f5c6b 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaData.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaData.java
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
import java.sql.RowIdLifetime;
/**
- * Circuit breaker metadata.
+ * Circuit breaker meta data.
*/
public final class CircuitBreakerDatabaseMetaData implements DatabaseMetaData {
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSetMetaData.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSetMetaData.java
index ad409d77d0d..40a3a6bdd5c 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSetMetaData.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSetMetaData.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.driver.state.circuit.resultset;
import java.sql.ResultSetMetaData;
/**
- * Circuit breaker result set metadata.
+ * Circuit breaker result set meta data.
*/
public final class CircuitBreakerResultSetMetaData implements ResultSetMetaData {
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineTableMetaData.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineTableMetaData.java
index 96c6a67b410..7fd41b6c96e 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineTableMetaData.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineTableMetaData.java
@@ -63,25 +63,25 @@ public final class PipelineTableMetaData {
}
/**
- * Get column metadata.
+ * Get column meta data.
*
* @param columnIndex the first column is 1, the second is 2, ...
- * @return column metadata
+ * @return column meta data
*/
public PipelineColumnMetaData getColumnMetaData(final int columnIndex) {
return getColumnMetaData(columnNames.get(columnIndex - 1));
}
/**
- * Get column metadata.
+ * Get column meta data.
*
* @param columnName column name
- * @return column metadata
+ * @return column meta data
*/
public PipelineColumnMetaData getColumnMetaData(final String columnName) {
PipelineColumnMetaData result = columnMetaDataMap.get(columnName);
if (null == result) {
- log.warn("getColumnMetaData, can not get column metadata for column name '{}', columnNames={}", columnName, columnNames);
+ log.warn("Can not get column meta data for column name '{}', columnNames={}", columnName, columnNames);
}
return result;
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataJobWorker.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataJobWorker.java
index be877333ee3..5fbd4496a73 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataJobWorker.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataJobWorker.java
@@ -42,7 +42,7 @@ public final class ShardingSphereDataJobWorker {
if (WORKER_INITIALIZED.get()) {
return;
}
- boolean collectorEnabled = contextManager.getMetaDataContexts().getMetaData().getInternalProps().getValue(InternalConfigurationPropertyKey.PROXY_METADATA_COLLECTOR_ENABLED);
+ boolean collectorEnabled = contextManager.getMetaDataContexts().getMetaData().getInternalProps().getValue(InternalConfigurationPropertyKey.PROXY_META_DATA_COLLECTOR_ENABLED);
if (collectorEnabled) {
startScheduleThread(contextManager);
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/PipelineTableMetaDataUtil.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/PipelineTableMetaDataUtil.java
index 80d49351208..23fc21a0087 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/PipelineTableMetaDataUtil.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/PipelineTableMetaDataUtil.java
@@ -49,7 +49,7 @@ public final class PipelineTableMetaDataUtil {
}
private static PipelineColumnMetaData mustGetAnAppropriateUniqueKeyColumn(final PipelineTableMetaData tableMetaData, final String tableName) {
- ShardingSpherePreconditions.checkNotNull(tableMetaData, () -> new SplitPipelineJobByRangeException(tableName, "can not get table metadata"));
+ ShardingSpherePreconditions.checkNotNull(tableMetaData, () -> new SplitPipelineJobByRangeException(tableName, "Can not get table meta data"));
List<String> primaryKeys = tableMetaData.getPrimaryKeyColumns();
if (1 == primaryKeys.size()) {
return tableMetaData.getColumnMetaData(tableMetaData.getPrimaryKeyColumns().get(0));
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoader.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoader.java
index 659159ce6b3..f317f77bff7 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoader.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoader.java
@@ -43,7 +43,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
/**
- * Standard pipeline table metadata loader.
+ * Standard pipeline table meta data loader.
*/
@RequiredArgsConstructor
@Slf4j
@@ -63,11 +63,11 @@ public final class StandardPipelineTableMetaDataLoader implements PipelineTableM
try {
loadTableMetaData(schemaName, tableName);
} catch (final SQLException ex) {
- throw new RuntimeException(String.format("Load metadata for schema '%s' and table '%s' failed", schemaName, tableName), ex);
+ throw new RuntimeException(String.format("Load meta data for schema '%s' and table '%s' failed", schemaName, tableName), ex);
}
result = tableMetaDataMap.get(new TableName(tableName));
if (null == result) {
- log.warn("getTableMetaData, can not load metadata for table '{}'", tableName);
+ log.warn("getTableMetaData, can not load meta data for table '{}'", tableName);
}
return result;
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
index 14659824fc6..9556bfce838 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
@@ -37,7 +37,7 @@ public final class PipelineMetaDataNode {
public static final Pattern BARRIER_PATTERN = Pattern.compile(JOB_PATTERN_PREFIX + "/barrier/(enable|disable)/\\d+");
/**
- * Get metadata data sources path.
+ * Get meta data data sources path.
*
* @param jobType job type
* @return data sources path
@@ -53,7 +53,7 @@ public final class PipelineMetaDataNode {
}
/**
- * Get metadata process configuration path.
+ * Get meta data process configuration path.
*
* @param jobType job type
* @return data sources path
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java
index a4e9fc2a66b..ff838675850 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java
@@ -95,7 +95,7 @@ public final class InventoryTaskSplitter {
Collection<InventoryDumperConfiguration> result = new LinkedList<>();
dumperConfig.getTableNameMap().forEach((key, value) -> {
InventoryDumperConfiguration inventoryDumperConfig = new InventoryDumperConfiguration(dumperConfig);
- // use original table name, for metadata loader, since some database table name case-sensitive
+ // use original table name, for meta data loader, since some database table name case-sensitive
inventoryDumperConfig.setActualTableName(key.getOriginal());
inventoryDumperConfig.setLogicTableName(value.getOriginal());
inventoryDumperConfig.setPosition(new PlaceholderPosition());
diff --git a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouter.java b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouter.java
index 003ff3cff7f..b27d5c3ddfb 100644
--- a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouter.java
+++ b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouter.java
@@ -36,8 +36,8 @@ import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.singletable.constant.SingleTableOrder;
import org.apache.shardingsphere.singletable.route.engine.SingleTableRouteEngineFactory;
-import org.apache.shardingsphere.singletable.route.validator.SingleTableMetadataValidator;
-import org.apache.shardingsphere.singletable.route.validator.SingleTableMetadataValidatorFactory;
+import org.apache.shardingsphere.singletable.route.validator.SingleTableMetaDataValidator;
+import org.apache.shardingsphere.singletable.route.validator.SingleTableMetaDataValidatorFactory;
import org.apache.shardingsphere.singletable.rule.SingleTableRule;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
@@ -61,7 +61,7 @@ public final class SingleTableSQLRouter implements SQLRouter<SingleTableRule> {
}
RouteContext result = new RouteContext();
SQLStatementContext<?> sqlStatementContext = queryContext.getSqlStatementContext();
- Optional<SingleTableMetadataValidator> validator = SingleTableMetadataValidatorFactory.newInstance(sqlStatementContext.getSqlStatement());
+ Optional<SingleTableMetaDataValidator> validator = SingleTableMetaDataValidatorFactory.newInstance(sqlStatementContext.getSqlStatement());
validator.ifPresent(optional -> optional.validate(rule, sqlStatementContext, database));
Collection<QualifiedTable> singleTableNames = getSingleTableNames(sqlStatementContext, database, rule, result);
if (!singleTableNames.isEmpty()) {
diff --git a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetadataValidator.java b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetaDataValidator.java
similarity index 93%
rename from kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetadataValidator.java
rename to kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetaDataValidator.java
index ecafe80dec8..b4b6f75ffd6 100644
--- a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetadataValidator.java
+++ b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetaDataValidator.java
@@ -23,11 +23,11 @@ import org.apache.shardingsphere.singletable.rule.SingleTableRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
- * Single table metadata validator.
+ * Single table meta data validator.
*
* @param <T> type of SQL statement
*/
-public interface SingleTableMetadataValidator<T extends SQLStatement> {
+public interface SingleTableMetaDataValidator<T extends SQLStatement> {
/**
* Validate single table meta data.
diff --git a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetadataValidatorFactory.java b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetaDataValidatorFactory.java
similarity index 85%
rename from kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetadataValidatorFactory.java
rename to kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetaDataValidatorFactory.java
index 391988d910d..c9c06a69502 100644
--- a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetadataValidatorFactory.java
+++ b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetaDataValidatorFactory.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.singletable.route.validator;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.singletable.route.validator.ddl.SingleTableDropSchemaMetadataValidator;
+import org.apache.shardingsphere.singletable.route.validator.ddl.SingleTableDropSchemaMetaDataValidator;
import org.apache.shardingsphere.singletable.route.validator.ddl.SingleTableDropTableValidator;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropSchemaStatement;
@@ -28,21 +28,21 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropTableSt
import java.util.Optional;
/**
- * Single table metadata validator factory.
+ * Single table meta data validator factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SingleTableMetadataValidatorFactory {
+public final class SingleTableMetaDataValidatorFactory {
/**
- * New instance of single table metadata validator.
+ * New instance of single table meta data validator.
*
* @param sqlStatement SQL statement
* @return created instance
*/
@SuppressWarnings("rawtypes")
- public static Optional<SingleTableMetadataValidator> newInstance(final SQLStatement sqlStatement) {
+ public static Optional<SingleTableMetaDataValidator> newInstance(final SQLStatement sqlStatement) {
if (sqlStatement instanceof DropSchemaStatement) {
- return Optional.of(new SingleTableDropSchemaMetadataValidator());
+ return Optional.of(new SingleTableDropSchemaMetaDataValidator());
}
if (sqlStatement instanceof DropTableStatement) {
return Optional.of(new SingleTableDropTableValidator());
diff --git a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetadataValidator.java b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetaDataValidator.java
similarity index 92%
rename from kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetadataValidator.java
rename to kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetaDataValidator.java
index c13e7582fe0..1490f4c5c2c 100644
--- a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetadataValidator.java
+++ b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetaDataValidator.java
@@ -23,16 +23,16 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.singletable.exception.DropNotEmptySchemaException;
-import org.apache.shardingsphere.singletable.route.validator.SingleTableMetadataValidator;
+import org.apache.shardingsphere.singletable.route.validator.SingleTableMetaDataValidator;
import org.apache.shardingsphere.singletable.rule.SingleTableRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropSchemaStatement;
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.sql.dialect.handler.ddl.DropSchemaStatementHandler;
/**
- * Single table drop schema metadata validator.
+ * Single table drop schema meta data validator.
*/
-public final class SingleTableDropSchemaMetadataValidator implements SingleTableMetadataValidator<DropSchemaStatement> {
+public final class SingleTableDropSchemaMetaDataValidator implements SingleTableMetaDataValidator<DropSchemaStatement> {
@Override
public void validate(final SingleTableRule rule, final SQLStatementContext<DropSchemaStatement> sqlStatementContext, final ShardingSphereDatabase database) {
diff --git a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropTableValidator.java b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropTableValidator.java
index 19e9c145ab8..5675426a717 100644
--- a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropTableValidator.java
+++ b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropTableValidator.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.singletable.route.validator.ddl;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.singletable.exception.UnsupportedDropCascadeTableException;
-import org.apache.shardingsphere.singletable.route.validator.SingleTableMetadataValidator;
+import org.apache.shardingsphere.singletable.route.validator.SingleTableMetaDataValidator;
import org.apache.shardingsphere.singletable.rule.SingleTableRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropTableStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.handler.ddl.DropTableStatementHandler;
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.handler.ddl.DropTableSta
/**
* Single table drop table validator.
*/
-public final class SingleTableDropTableValidator implements SingleTableMetadataValidator<DropTableStatement> {
+public final class SingleTableDropTableValidator implements SingleTableMetaDataValidator<DropTableStatement> {
@Override
public void validate(final SingleTableRule rule, final SQLStatementContext<DropTableStatement> sqlStatementContext, final ShardingSphereDatabase database) {
diff --git a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetadataValidatorFactoryTest.java b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetaDataValidatorFactoryTest.java
similarity index 88%
rename from kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetadataValidatorFactoryTest.java
rename to kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetaDataValidatorFactoryTest.java
index 89fe6495af8..8b6c126cea5 100644
--- a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetadataValidatorFactoryTest.java
+++ b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/SingleTableMetaDataValidatorFactoryTest.java
@@ -25,15 +25,15 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
-public final class SingleTableMetadataValidatorFactoryTest {
+public final class SingleTableMetaDataValidatorFactoryTest {
@Test
public void assertNewInstanceForDropSchemaStatement() {
- assertTrue(SingleTableMetadataValidatorFactory.newInstance(mock(DropSchemaStatement.class)).isPresent());
+ assertTrue(SingleTableMetaDataValidatorFactory.newInstance(mock(DropSchemaStatement.class)).isPresent());
}
@Test
public void assertNewInstanceForNotDropSchemaStatement() {
- assertFalse(SingleTableMetadataValidatorFactory.newInstance(mock(SQLStatement.class)).isPresent());
+ assertFalse(SingleTableMetaDataValidatorFactory.newInstance(mock(SQLStatement.class)).isPresent());
}
}
diff --git a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetadataValidatorTest.java b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetaDataValidatorTest.java
similarity index 93%
rename from kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetadataValidatorTest.java
rename to kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetaDataValidatorTest.java
index 4b401230d6d..67dbd63f9c9 100644
--- a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetadataValidatorTest.java
+++ b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/validator/ddl/SingleTableDropSchemaMetaDataValidatorTest.java
@@ -36,23 +36,23 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class SingleTableDropSchemaMetadataValidatorTest {
+public final class SingleTableDropSchemaMetaDataValidatorTest {
@Test(expected = DropNotEmptySchemaException.class)
public void assertValidateWithoutCascadeSchema() {
- new SingleTableDropSchemaMetadataValidator().validate(mock(SingleTableRule.class, RETURNS_DEEP_STUBS), createSQLStatementContext("foo_schema", false), mockDatabase());
+ new SingleTableDropSchemaMetaDataValidator().validate(mock(SingleTableRule.class, RETURNS_DEEP_STUBS), createSQLStatementContext("foo_schema", false), mockDatabase());
}
@Test(expected = SchemaNotFoundException.class)
public void assertValidateWithNotExistedSchema() {
ShardingSphereDatabase database = mockDatabase();
when(database.getSchema("not_existed_schema")).thenReturn(null);
- new SingleTableDropSchemaMetadataValidator().validate(mock(SingleTableRule.class, RETURNS_DEEP_STUBS), createSQLStatementContext("not_existed_schema", true), database);
+ new SingleTableDropSchemaMetaDataValidator().validate(mock(SingleTableRule.class, RETURNS_DEEP_STUBS), createSQLStatementContext("not_existed_schema", true), database);
}
@Test
public void assertValidate() {
- new SingleTableDropSchemaMetadataValidator().validate(mock(SingleTableRule.class, RETURNS_DEEP_STUBS), createSQLStatementContext("foo_schema", true), mockDatabase());
+ new SingleTableDropSchemaMetaDataValidator().validate(mock(SingleTableRule.class, RETURNS_DEEP_STUBS), createSQLStatementContext("foo_schema", true), mockDatabase());
}
private ShardingSphereDatabase mockDatabase() {
diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
index e47a7e10591..cc90eb8cc22 100644
--- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
+++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
@@ -43,49 +43,49 @@ import static org.mockito.Mockito.when;
public final class TransactionRuleTest {
- private static final String SHARDING_DB = "sharding_db";
+ private static final String SHARDING_DB_1 = "sharding_db_1";
- private static final String SHARDING_DB2 = "sharding_db2";
+ private static final String SHARDING_DB_2 = "sharding_db_2";
@Test
public void assertInitTransactionRuleWithMultiDatabaseType() {
- TransactionRule actual = new TransactionRule(createTransactionRuleConfiguration(), Collections.singletonMap(SHARDING_DB, createDatabase()));
+ TransactionRule actual = new TransactionRule(createTransactionRuleConfiguration(), Collections.singletonMap(SHARDING_DB_1, createDatabase()));
assertNotNull(actual.getResource());
assertThat(actual.getResource().getTransactionManager(TransactionType.XA), instanceOf(ShardingSphereTransactionManagerFixture.class));
}
@Test
public void assertAddResource() {
- TransactionRule actual = new TransactionRule(createTransactionRuleConfiguration(), Collections.singletonMap(SHARDING_DB, createDatabase()));
+ TransactionRule actual = new TransactionRule(createTransactionRuleConfiguration(), Collections.singletonMap(SHARDING_DB_1, createDatabase()));
actual.addResource(createAddDatabase());
assertNotNull(actual.getResource());
assertThat(actual.getDatabases().size(), is(2));
- assertTrue(actual.getDatabases().containsKey(SHARDING_DB));
- ShardingSphereResourceMetaData shardingMetadata = actual.getDatabases().get(SHARDING_DB).getResourceMetaData();
- assertThat(shardingMetadata.getDataSources().size(), is(2));
- assertTrue(shardingMetadata.getDataSources().containsKey("ds_0"));
- assertTrue(shardingMetadata.getDataSources().containsKey("ds_1"));
- assertThat(shardingMetadata.getStorageTypes().size(), is(2));
- assertTrue(actual.getDatabases().containsKey(SHARDING_DB2));
- ShardingSphereResourceMetaData shardingMetadata2 = actual.getDatabases().get(SHARDING_DB2).getResourceMetaData();
- assertThat(shardingMetadata2.getDataSources().size(), is(2));
- assertTrue(shardingMetadata2.getDataSources().containsKey("ds_0"));
- assertTrue(shardingMetadata2.getDataSources().containsKey("ds_1"));
- assertThat(shardingMetadata2.getStorageTypes().size(), is(2));
+ assertTrue(actual.getDatabases().containsKey(SHARDING_DB_1));
+ ShardingSphereResourceMetaData resourceMetaData1 = actual.getDatabases().get(SHARDING_DB_1).getResourceMetaData();
+ assertThat(resourceMetaData1.getDataSources().size(), is(2));
+ assertTrue(resourceMetaData1.getDataSources().containsKey("ds_0"));
+ assertTrue(resourceMetaData1.getDataSources().containsKey("ds_1"));
+ assertThat(resourceMetaData1.getStorageTypes().size(), is(2));
+ assertTrue(actual.getDatabases().containsKey(SHARDING_DB_2));
+ ShardingSphereResourceMetaData resourceMetaData2 = actual.getDatabases().get(SHARDING_DB_2).getResourceMetaData();
+ assertThat(resourceMetaData2.getDataSources().size(), is(2));
+ assertTrue(resourceMetaData2.getDataSources().containsKey("ds_0"));
+ assertTrue(resourceMetaData2.getDataSources().containsKey("ds_1"));
+ assertThat(resourceMetaData2.getStorageTypes().size(), is(2));
assertThat(actual.getResource().getTransactionManager(TransactionType.XA), instanceOf(ShardingSphereTransactionManagerFixture.class));
}
@Test
public void assertCloseStaleResource() {
- TransactionRule actual = new TransactionRule(createTransactionRuleConfiguration(), Collections.singletonMap(SHARDING_DB, createDatabase()));
- actual.closeStaleResource(SHARDING_DB);
+ TransactionRule actual = new TransactionRule(createTransactionRuleConfiguration(), Collections.singletonMap(SHARDING_DB_1, createDatabase()));
+ actual.closeStaleResource(SHARDING_DB_1);
assertTrue(actual.getDatabases().isEmpty());
assertThat(actual.getResource().getTransactionManager(TransactionType.XA), instanceOf(ShardingSphereTransactionManagerFixture.class));
}
@Test
public void assertCloseAllStaleResources() {
- TransactionRule actual = new TransactionRule(createTransactionRuleConfiguration(), Collections.singletonMap(SHARDING_DB, createDatabase()));
+ TransactionRule actual = new TransactionRule(createTransactionRuleConfiguration(), Collections.singletonMap(SHARDING_DB_1, createDatabase()));
actual.closeStaleResource();
assertTrue(actual.getDatabases().isEmpty());
assertThat(actual.getResource().getTransactionManager(TransactionType.XA), instanceOf(ShardingSphereTransactionManagerFixture.class));
@@ -116,7 +116,7 @@ public final class TransactionRuleTest {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class);
ShardingSphereResourceMetaData resourceMetaData = createAddResourceMetaData();
when(result.getResourceMetaData()).thenReturn(resourceMetaData);
- when(result.getName()).thenReturn(SHARDING_DB2);
+ when(result.getName()).thenReturn(SHARDING_DB_2);
return result;
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereDataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereDataPersistService.java
index 5829f1e97d4..d48e4c9c125 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereDataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereDataPersistService.java
@@ -53,7 +53,7 @@ public final class ShardingSphereDataPersistService {
/**
* Load.
*
- * @param metaData metadata
+ * @param metaData meta data
* @return ShardingSphere data
*/
public Optional<ShardingSphereData> load(final ShardingSphereMetaData metaData) {
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
index ba6ab5a6adf..73a1fab8b9b 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
@@ -127,7 +127,7 @@ public final class MetaDataContextsFactoryTest {
}
@Test
- public void assertCreateWithJDBCInstanceMetadata() throws SQLException {
+ public void assertCreateWithJDBCInstanceMetaData() throws SQLException {
InstanceContext instanceContext = mock(InstanceContext.class, RETURNS_DEEP_STUBS);
when(instanceContext.getInstance().getMetaData()).thenReturn(jdbcInstanceMetaData);
try (MetaDataContexts actual = MetaDataContextsFactory.create(metaDataPersistService, createContextManagerBuilderParameter(), instanceContext)) {
@@ -139,7 +139,7 @@ public final class MetaDataContextsFactoryTest {
}
@Test
- public void assertCreateWithProxyInstanceMetadata() throws SQLException {
+ public void assertCreateWithProxyInstanceMetaData() throws SQLException {
when(databaseMetaDataPersistService.loadAllDatabaseNames()).thenReturn(Collections.singletonList("foo_db"));
when(metaDataPersistService.getDatabaseMetaDataService()).thenReturn(databaseMetaDataPersistService);
try (MetaDataContexts actual = MetaDataContextsFactory.create(metaDataPersistService, createContextManagerBuilderParameter(), mock(InstanceContext.class, RETURNS_DEEP_STUBS))) {
diff --git a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
index 708ab1438b7..dc433ca27b7 100644
--- a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
+++ b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEve
import org.apache.shardingsphere.mode.repository.cluster.lock.holder.DistributedLockHolder;
import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.KeyValue;
import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.ServiceController;
-import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.ServiceMetadata;
+import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.ServiceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.nacos.listener.NamingEventListener;
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosProperties;
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosPropertyKey;
@@ -71,7 +71,7 @@ public final class NacosRepository implements ClusterPersistRepository {
public void init(final ClusterPersistRepositoryConfiguration config) {
nacosProps = new NacosProperties(config.getProps());
client = createClient(config);
- initServiceMetadata();
+ initServiceMetaData();
}
private NamingService createClient(final ClusterPersistRepositoryConfiguration config) {
@@ -85,12 +85,12 @@ public final class NacosRepository implements ClusterPersistRepository {
}
}
- private void initServiceMetadata() {
+ private void initServiceMetaData() {
try {
String clusterIp = nacosProps.getValue(NacosPropertyKey.CLUSTER_IP);
String ip = Strings.isNullOrEmpty(clusterIp) ? IpUtils.getIp() : clusterIp;
serviceController = new ServiceController();
- for (ServiceMetadata each : serviceController.getAllServices()) {
+ for (ServiceMetaData each : serviceController.getAllServices()) {
Integer port = client.getAllInstances(each.getServiceName(), false).stream()
.filter(instance -> StringUtils.equals(instance.getIp(), ip)).map(Instance::getPort).max(Comparator.naturalOrder()).orElse(Integer.MIN_VALUE);
each.setIp(ip);
@@ -132,7 +132,7 @@ public final class NacosRepository implements ClusterPersistRepository {
@Override
public void watch(final String key, final DataChangedEventListener listener) {
try {
- for (ServiceMetadata each : serviceController.getAllServices()) {
+ for (ServiceMetaData each : serviceController.getAllServices()) {
NamingEventListener eventListener = each.getListener();
if (null != eventListener) {
eventListener.put(key, listener);
@@ -151,7 +151,7 @@ public final class NacosRepository implements ClusterPersistRepository {
@Override
public String getDirectly(final String key) {
try {
- for (ServiceMetadata each : serviceController.getAllServices()) {
+ for (ServiceMetaData each : serviceController.getAllServices()) {
Optional<Instance> instance = findExistedInstance(key, each.isEphemeral()).stream().max(Comparator.comparing(NacosMetaDataUtil::getTimestamp));
if (instance.isPresent()) {
return NacosMetaDataUtil.getValue(instance.get());
@@ -167,7 +167,7 @@ public final class NacosRepository implements ClusterPersistRepository {
public List<String> getChildrenKeys(final String key) {
try {
Stream<String> concatKeys = Stream.empty();
- for (ServiceMetadata each : serviceController.getAllServices()) {
+ for (ServiceMetaData each : serviceController.getAllServices()) {
Stream<String> keys = findExistedInstance(each.isEphemeral()).stream()
.map(instance -> {
String fullPath = NacosMetaDataUtil.getKey(instance);
@@ -211,12 +211,12 @@ public final class NacosRepository implements ClusterPersistRepository {
}
private void update(final Instance instance, final String value) throws NacosException {
- Map<String, String> metadataMap = instance.getMetadata();
+ Map<String, String> metaDataMap = instance.getMetadata();
String key = NacosMetaDataUtil.getKey(instance);
- metadataMap.put(key, value);
- metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetaDataUtil.getTimestamp()));
- instance.setMetadata(metadataMap);
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ metaDataMap.put(key, value);
+ metaDataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetaDataUtil.getTimestamp()));
+ instance.setMetadata(metaDataMap);
+ ServiceMetaData persistentService = serviceController.getPersistentService();
client.registerInstance(persistentService.getServiceName(), instance);
Collection<KeyValue> keyValues = new LinkedList<>();
keyValues.add(new KeyValue(key, value, instance.isEphemeral()));
@@ -225,19 +225,19 @@ public final class NacosRepository implements ClusterPersistRepository {
private void put(final String key, final String value, final boolean ephemeral) throws NacosException {
final Collection<KeyValue> keyValues = buildParentPath(key);
- ServiceMetadata serviceMetadata = serviceController.getService(ephemeral);
+ ServiceMetaData serviceMetaData = serviceController.getService(ephemeral);
Instance instance = new Instance();
- instance.setIp(serviceMetadata.getIp());
- instance.setPort(serviceMetadata.getPort());
+ instance.setIp(serviceMetaData.getIp());
+ instance.setPort(serviceMetaData.getPort());
instance.setEphemeral(ephemeral);
Map<String, String> metadataMap = new HashMap<>(5, 1);
if (ephemeral) {
- fillEphemeralMetadata(metadataMap);
+ fillEphemeralMetaData(metadataMap);
}
metadataMap.put(key, value);
metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetaDataUtil.getTimestamp()));
instance.setMetadata(metadataMap);
- client.registerInstance(serviceMetadata.getServiceName(), instance);
+ client.registerInstance(serviceMetaData.getServiceName(), instance);
keyValues.add(new KeyValue(key, value, ephemeral));
waitValue(keyValues);
}
@@ -259,31 +259,31 @@ public final class NacosRepository implements ClusterPersistRepository {
Collection<KeyValue> result = new LinkedList<>();
if (findExistedInstance(key, false).isEmpty()) {
Instance instance = new Instance();
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ ServiceMetaData persistentService = serviceController.getPersistentService();
instance.setIp(persistentService.getIp());
instance.setPort(persistentService.getPort());
instance.setEphemeral(false);
- Map<String, String> metadataMap = new HashMap<>(2, 1);
- metadataMap.put(key, "");
- metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetaDataUtil.getTimestamp()));
- instance.setMetadata(metadataMap);
+ Map<String, String> metaDataMap = new HashMap<>(2, 1);
+ metaDataMap.put(key, "");
+ metaDataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetaDataUtil.getTimestamp()));
+ instance.setMetadata(metaDataMap);
client.registerInstance(persistentService.getServiceName(), instance);
result.add(new KeyValue(key, "", false));
}
return result;
}
- private void fillEphemeralMetadata(final Map<String, String> metadataMap) {
+ private void fillEphemeralMetaData(final Map<String, String> metaDataMap) {
int timeToLiveSeconds = nacosProps.getValue(NacosPropertyKey.TIME_TO_LIVE_SECONDS);
- metadataMap.put(PreservedMetadataKeys.HEART_BEAT_INTERVAL, String.valueOf(timeToLiveSeconds * 1000 / 3));
- metadataMap.put(PreservedMetadataKeys.HEART_BEAT_TIMEOUT, String.valueOf(timeToLiveSeconds * 1000 * 2 / 3));
- metadataMap.put(PreservedMetadataKeys.IP_DELETE_TIMEOUT, String.valueOf(timeToLiveSeconds * 1000));
+ metaDataMap.put(PreservedMetadataKeys.HEART_BEAT_INTERVAL, String.valueOf(timeToLiveSeconds * 1000 / 3));
+ metaDataMap.put(PreservedMetadataKeys.HEART_BEAT_TIMEOUT, String.valueOf(timeToLiveSeconds * 1000 * 2 / 3));
+ metaDataMap.put(PreservedMetadataKeys.IP_DELETE_TIMEOUT, String.valueOf(timeToLiveSeconds * 1000));
}
@Override
public void delete(final String key) {
try {
- for (ServiceMetadata each : serviceController.getAllServices()) {
+ for (ServiceMetaData each : serviceController.getAllServices()) {
Collection<Instance> instances = findExistedInstance(each.isEphemeral()).stream()
.filter(instance -> {
String fullPath = NacosMetaDataUtil.getKey(instance);
@@ -329,7 +329,7 @@ public final class NacosRepository implements ClusterPersistRepository {
private boolean isAvailable(final Collection<KeyValue> keyValues) throws NacosException {
Map<Boolean, List<KeyValue>> keyValueMap = keyValues.stream().collect(Collectors.groupingBy(KeyValue::isEphemeral));
for (Entry<Boolean, List<KeyValue>> entry : keyValueMap.entrySet()) {
- ServiceMetadata service = serviceController.getService(entry.getKey());
+ ServiceMetaData service = serviceController.getService(entry.getKey());
Map<String, List<Instance>> instanceMap = client.getAllInstances(service.getServiceName(), false).stream().collect(Collectors.groupingBy(NacosMetaDataUtil::getKey));
keyValues.removeIf(keyValue -> {
Collection<Instance> instances = instanceMap.get(keyValue.getKey());
diff --git a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceController.java b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceController.java
index 37addf8eac3..5b613961ecf 100644
--- a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceController.java
+++ b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceController.java
@@ -35,19 +35,19 @@ public final class ServiceController {
private static final String EPHEMERAL_SERVICE_NAME = "EPHEMERAL";
@Getter
- private final ServiceMetadata persistentService = new ServiceMetadata(PERSISTENT_SERVICE_NAME, false);
+ private final ServiceMetaData persistentService = new ServiceMetaData(PERSISTENT_SERVICE_NAME, false);
@Getter
- private final ServiceMetadata ephemeralService = new ServiceMetadata(EPHEMERAL_SERVICE_NAME, true);
+ private final ServiceMetaData ephemeralService = new ServiceMetaData(EPHEMERAL_SERVICE_NAME, true);
- private final Map<Boolean, ServiceMetadata> serviceMap = Stream.of(persistentService, ephemeralService).collect(Collectors.toMap(ServiceMetadata::isEphemeral, Function.identity()));
+ private final Map<Boolean, ServiceMetaData> serviceMap = Stream.of(persistentService, ephemeralService).collect(Collectors.toMap(ServiceMetaData::isEphemeral, Function.identity()));
/**
* Get all services.
*
* @return all services
*/
- public Collection<ServiceMetadata> getAllServices() {
+ public Collection<ServiceMetaData> getAllServices() {
return serviceMap.values();
}
@@ -57,7 +57,7 @@ public final class ServiceController {
* @param ephemeral is ephemeral service
* @return ephemeral service or persistent service
*/
- public ServiceMetadata getService(final boolean ephemeral) {
+ public ServiceMetaData getService(final boolean ephemeral) {
return serviceMap.get(ephemeral);
}
}
diff --git a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceMetadata.java b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceMetaData.java
similarity index 96%
rename from mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceMetadata.java
rename to mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceMetaData.java
index 3da23488c17..3038d62598b 100644
--- a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceMetadata.java
+++ b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/entity/ServiceMetaData.java
@@ -25,12 +25,12 @@ import org.apache.shardingsphere.mode.repository.cluster.nacos.listener.NamingEv
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Service metadata.
+ * Service meta data.
*/
@RequiredArgsConstructor
@Getter
@Setter
-public final class ServiceMetadata {
+public final class ServiceMetaData {
private final String serviceName;
diff --git a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
index 1d493d30786..9f62317ce72 100644
--- a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
+++ b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.mode.persist.PersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.exception.ClusterPersistRepositoryException;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.ServiceController;
-import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.ServiceMetadata;
+import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.ServiceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosProperties;
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosPropertyKey;
import org.apache.shardingsphere.mode.repository.cluster.nacos.utils.NacosMetaDataUtil;
@@ -81,7 +81,7 @@ public final class NacosRepositoryTest {
MemberAccessor accessor = Plugins.getMemberAccessor();
accessor.set(REPOSITORY.getClass().getDeclaredField("nacosProps"), REPOSITORY, new NacosProperties(new Properties()));
accessor.set(REPOSITORY.getClass().getDeclaredField("client"), REPOSITORY, client);
- accessor.invoke(REPOSITORY.getClass().getDeclaredMethod("initServiceMetadata"), REPOSITORY);
+ accessor.invoke(REPOSITORY.getClass().getDeclaredMethod("initServiceMetaData"), REPOSITORY);
serviceController = (ServiceController) accessor.get(REPOSITORY.getClass().getDeclaredField("serviceController"), REPOSITORY);
}
@@ -92,13 +92,13 @@ public final class NacosRepositoryTest {
List<Instance> instances = new LinkedList<>();
for (int count = 1; count <= total; count++) {
Instance instance = new Instance();
- Map<String, String> metadataMap = new HashMap<>(2, 1);
- metadataMap.put(key, "value" + count);
- metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(count));
- instance.setMetadata(metadataMap);
+ Map<String, String> metaDataMap = new HashMap<>(2, 1);
+ metaDataMap.put(key, "value" + count);
+ metaDataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(count));
+ instance.setMetadata(metaDataMap);
instances.add(instance);
}
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ ServiceMetaData persistentService = serviceController.getPersistentService();
when(client.getAllInstances(persistentService.getServiceName(), false)).thenReturn(instances);
String value = REPOSITORY.getDirectly(key);
assertThat(value, is("value2"));
@@ -109,12 +109,12 @@ public final class NacosRepositoryTest {
Instance instance = new Instance();
String key = "/test/children/keys/persistent/0";
instance.setMetadata(Collections.singletonMap(key, "value0"));
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ ServiceMetaData persistentService = serviceController.getPersistentService();
when(client.getAllInstances(persistentService.getServiceName(), false)).thenReturn(Collections.singletonList(instance));
instance = new Instance();
key = "/test/children/keys/ephemeral/0";
instance.setMetadata(Collections.singletonMap(key, "value0"));
- ServiceMetadata ephemeralService = serviceController.getEphemeralService();
+ ServiceMetaData ephemeralService = serviceController.getEphemeralService();
when(client.getAllInstances(ephemeralService.getServiceName(), false)).thenReturn(Collections.singletonList(instance));
List<String> childrenKeys = REPOSITORY.getChildrenKeys("/test/children/keys");
assertThat(childrenKeys.size(), is(2));
@@ -132,7 +132,7 @@ public final class NacosRepositoryTest {
verify(client, times(5)).registerInstance(stringArgumentCaptor.capture(), instanceArgumentCaptor.capture());
Instance registerInstance = instanceArgumentCaptor.getValue();
String registerType = stringArgumentCaptor.getValue();
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ ServiceMetaData persistentService = serviceController.getPersistentService();
assertThat(registerType, is(persistentService.getServiceName()));
assertThat(registerInstance.isEphemeral(), is(false));
assertThat(NacosMetaDataUtil.getValue(registerInstance), is("value4"));
@@ -145,13 +145,13 @@ public final class NacosRepositoryTest {
instance.setIp(ip);
instance.setEphemeral(false);
String key = "/test/children/keys/persistent/0";
- Map<String, String> metadataMap = new HashMap<>(1, 1);
- metadataMap.put(key, "value0");
- instance.setMetadata(metadataMap);
+ Map<String, String> metaDataMap = new HashMap<>(1, 1);
+ metaDataMap.put(key, "value0");
+ instance.setMetadata(metaDataMap);
List<Instance> instances = new LinkedList<>();
buildParentPath(key, instances);
instances.add(instance);
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ ServiceMetaData persistentService = serviceController.getPersistentService();
when(client.getAllInstances(persistentService.getServiceName(), false)).thenReturn(instances);
doAnswer(AdditionalAnswers.answerVoid(getRegisterInstanceAnswer())).when(client).registerInstance(anyString(), any(Instance.class));
REPOSITORY.persist(key, "value4");
@@ -171,19 +171,19 @@ public final class NacosRepositoryTest {
final String key = "/test/children/keys/ephemeral/1";
final Instance instance = new Instance();
instance.setEphemeral(true);
- Map<String, String> metadataMap = new HashMap<>(4, 1);
- metadataMap.put(PreservedMetadataKeys.HEART_BEAT_INTERVAL, String.valueOf(2000));
- metadataMap.put(PreservedMetadataKeys.HEART_BEAT_TIMEOUT, String.valueOf(4000));
- metadataMap.put(PreservedMetadataKeys.IP_DELETE_TIMEOUT, String.valueOf(6000));
- metadataMap.put(key, "value0");
- instance.setMetadata(metadataMap);
+ Map<String, String> metaDataMap = new HashMap<>(4, 1);
+ metaDataMap.put(PreservedMetadataKeys.HEART_BEAT_INTERVAL, String.valueOf(2000));
+ metaDataMap.put(PreservedMetadataKeys.HEART_BEAT_TIMEOUT, String.valueOf(4000));
+ metaDataMap.put(PreservedMetadataKeys.IP_DELETE_TIMEOUT, String.valueOf(6000));
+ metaDataMap.put(key, "value0");
+ instance.setMetadata(metaDataMap);
List<Instance> instances = new LinkedList<>();
buildParentPath(key, instances);
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ ServiceMetaData persistentService = serviceController.getPersistentService();
when(client.getAllInstances(persistentService.getServiceName(), false)).thenReturn(instances);
instances = new LinkedList<>();
instances.add(instance);
- ServiceMetadata ephemeralService = serviceController.getEphemeralService();
+ ServiceMetaData ephemeralService = serviceController.getEphemeralService();
when(client.getAllInstances(ephemeralService.getServiceName(), false)).thenReturn(instances);
doAnswer(AdditionalAnswers.answerVoid(getDeregisterInstanceAnswer())).when(client).deregisterInstance(anyString(), any(Instance.class));
doAnswer(AdditionalAnswers.answerVoid(getRegisterInstanceAnswer())).when(client).registerInstance(anyString(), any(Instance.class));
@@ -197,11 +197,11 @@ public final class NacosRepositoryTest {
assertThat(registerType, is(ephemeralService.getServiceName()));
assertThat(registerInstance.isEphemeral(), is(true));
assertThat(NacosMetaDataUtil.getValue(registerInstance), is("value4"));
- Map<String, String> metadata = registerInstance.getMetadata();
+ Map<String, String> metaData = registerInstance.getMetadata();
long timeToLiveSeconds = Long.parseLong(NacosPropertyKey.TIME_TO_LIVE_SECONDS.getDefaultValue());
- assertThat(metadata.get(PreservedMetadataKeys.HEART_BEAT_INTERVAL), is(String.valueOf(timeToLiveSeconds * 1000 / 3)));
- assertThat(metadata.get(PreservedMetadataKeys.HEART_BEAT_TIMEOUT), is(String.valueOf(timeToLiveSeconds * 1000 * 2 / 3)));
- assertThat(metadata.get(PreservedMetadataKeys.IP_DELETE_TIMEOUT), is(String.valueOf(timeToLiveSeconds * 1000)));
+ assertThat(metaData.get(PreservedMetadataKeys.HEART_BEAT_INTERVAL), is(String.valueOf(timeToLiveSeconds * 1000 / 3)));
+ assertThat(metaData.get(PreservedMetadataKeys.HEART_BEAT_TIMEOUT), is(String.valueOf(timeToLiveSeconds * 1000 * 2 / 3)));
+ assertThat(metaData.get(PreservedMetadataKeys.IP_DELETE_TIMEOUT), is(String.valueOf(timeToLiveSeconds * 1000)));
}
private void buildParentPath(final String key, final List<Instance> instances) {
@@ -228,15 +228,15 @@ public final class NacosRepositoryTest {
verify(client, times(5)).registerInstance(stringArgumentCaptor.capture(), instanceArgumentCaptor.capture());
Instance registerInstance = instanceArgumentCaptor.getValue();
String registerType = stringArgumentCaptor.getValue();
- ServiceMetadata ephemeralService = serviceController.getEphemeralService();
+ ServiceMetaData ephemeralService = serviceController.getEphemeralService();
assertThat(registerType, is(ephemeralService.getServiceName()));
assertThat(registerInstance.isEphemeral(), is(true));
assertThat(NacosMetaDataUtil.getValue(registerInstance), is("value0"));
- Map<String, String> metadata = registerInstance.getMetadata();
+ Map<String, String> metaData = registerInstance.getMetadata();
long timeToLiveSeconds = Long.parseLong(NacosPropertyKey.TIME_TO_LIVE_SECONDS.getDefaultValue());
- assertThat(metadata.get(PreservedMetadataKeys.HEART_BEAT_INTERVAL), is(String.valueOf(timeToLiveSeconds * 1000 / 3)));
- assertThat(metadata.get(PreservedMetadataKeys.HEART_BEAT_TIMEOUT), is(String.valueOf(timeToLiveSeconds * 1000 * 2 / 3)));
- assertThat(metadata.get(PreservedMetadataKeys.IP_DELETE_TIMEOUT), is(String.valueOf(timeToLiveSeconds * 1000)));
+ assertThat(metaData.get(PreservedMetadataKeys.HEART_BEAT_INTERVAL), is(String.valueOf(timeToLiveSeconds * 1000 / 3)));
+ assertThat(metaData.get(PreservedMetadataKeys.HEART_BEAT_TIMEOUT), is(String.valueOf(timeToLiveSeconds * 1000 * 2 / 3)));
+ assertThat(metaData.get(PreservedMetadataKeys.IP_DELETE_TIMEOUT), is(String.valueOf(timeToLiveSeconds * 1000)));
}
@Test
@@ -250,7 +250,7 @@ public final class NacosRepositoryTest {
instance.setMetadata(Collections.singletonMap(key, "value" + count));
instances.add(instance);
}
- ServiceMetadata ephemeralService = serviceController.getEphemeralService();
+ ServiceMetaData ephemeralService = serviceController.getEphemeralService();
when(client.getAllInstances(ephemeralService.getServiceName(), false)).thenReturn(instances);
instances = new LinkedList<>();
String key = "/test/children/keys/persistent/0";
@@ -258,7 +258,7 @@ public final class NacosRepositoryTest {
instance.setEphemeral(false);
instance.setMetadata(Collections.singletonMap(key, "value0"));
instances.add(instance);
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ ServiceMetaData persistentService = serviceController.getPersistentService();
when(client.getAllInstances(persistentService.getServiceName(), false)).thenReturn(instances);
doAnswer(AdditionalAnswers.answerVoid(getDeregisterInstanceAnswer())).when(client).deregisterInstance(anyString(), any(Instance.class));
REPOSITORY.delete("/test/children/keys");
@@ -273,7 +273,7 @@ public final class NacosRepositoryTest {
@Test
public void assertWatchAdded() throws NacosException, ExecutionException, InterruptedException {
- ServiceMetadata ephemeralService = serviceController.getEphemeralService();
+ ServiceMetaData ephemeralService = serviceController.getEphemeralService();
ephemeralService.setListener(null);
String key = "key/key";
String value = "value2";
@@ -291,20 +291,20 @@ public final class NacosRepositoryTest {
@Test
public void assertWatchUpdate() throws NacosException, ExecutionException, InterruptedException {
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ ServiceMetaData persistentService = serviceController.getPersistentService();
persistentService.setListener(null);
String key = "key/key";
long epochMilliseconds = NacosMetaDataUtil.getTimestamp();
Instance preInstance = new Instance();
- Map<String, String> metadataMap = new HashMap<>();
- metadataMap.put(key, "value1");
- metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(epochMilliseconds));
- preInstance.setMetadata(metadataMap);
+ Map<String, String> metaDataMap = new HashMap<>();
+ metaDataMap.put(key, "value1");
+ metaDataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(epochMilliseconds));
+ preInstance.setMetadata(metaDataMap);
final Instance instance = new Instance();
- metadataMap = new HashMap<>();
- metadataMap.put(key, "value2");
- metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(epochMilliseconds + 1));
- instance.setMetadata(metadataMap);
+ metaDataMap = new HashMap<>();
+ metaDataMap.put(key, "value2");
+ metaDataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(epochMilliseconds + 1));
+ instance.setMetadata(metaDataMap);
Event event = new NamingEvent(persistentService.getServiceName(), Collections.singletonList(instance));
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(preInstance, event))).when(client).subscribe(anyString(), any(EventListener.class));
SettableFuture<DataChangedEvent> settableFuture = SettableFuture.create();
@@ -317,7 +317,7 @@ public final class NacosRepositoryTest {
@Test
public void assertWatchDelete() throws NacosException, ExecutionException, InterruptedException {
- ServiceMetadata persistentService = serviceController.getPersistentService();
+ ServiceMetaData persistentService = serviceController.getPersistentService();
persistentService.setListener(null);
String key = "key/key";
Instance preInstance = new Instance();
@@ -345,7 +345,7 @@ public final class NacosRepositoryTest {
@Test(expected = IllegalStateException.class)
public void assertExceededMaximum() {
- ServiceMetadata ephemeralService = serviceController.getEphemeralService();
+ ServiceMetaData ephemeralService = serviceController.getEphemeralService();
ephemeralService.setPort(new AtomicInteger(Integer.MAX_VALUE));
REPOSITORY.persistEphemeral("/key2", "value");
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
index d99e1b97844..763a30769e4 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
@@ -74,7 +74,7 @@ public abstract class DatabaseCommunicationEngine implements DatabaseBackendHand
private final KernelProcessor kernelProcessor = new KernelProcessor();
- private final MetaDataRefreshEngine metadataRefreshEngine;
+ private final MetaDataRefreshEngine metaDataRefreshEngine;
private List<QueryHeader> queryHeaders;
@@ -89,7 +89,7 @@ public abstract class DatabaseCommunicationEngine implements DatabaseBackendHand
this.database = database;
this.queryContext = queryContext;
this.backendConnection = backendConnection;
- metadataRefreshEngine = new MetaDataRefreshEngine(database, ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps());
+ metaDataRefreshEngine = new MetaDataRefreshEngine(database, ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps());
if (sqlStatementContext instanceof CursorAvailable) {
prepareCursorStatementContext((CursorAvailable) sqlStatementContext, backendConnection.getConnectionSession());
}
@@ -129,7 +129,7 @@ public abstract class DatabaseCommunicationEngine implements DatabaseBackendHand
}
protected void refreshMetaData(final ExecutionContext executionContext) throws SQLException {
- Optional<MetaDataRefreshedEvent> event = metadataRefreshEngine.refresh(executionContext.getSqlStatementContext(), executionContext.getRouteContext().getRouteUnits());
+ Optional<MetaDataRefreshedEvent> event = metaDataRefreshEngine.refresh(executionContext.getSqlStatementContext(), executionContext.getRouteContext().getRouteUnits());
if (ProxyContext.getInstance().getContextManager().getInstanceContext().isCluster() && event.isPresent()) {
ProxyContext.getInstance().getContextManager().getInstanceContext().getEventBusContext().post(event.get());
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetadataExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
similarity index 96%
rename from proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetadataExecutor.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
index 61b8dd53df8..bfe8cecb4b9 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetadataExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
@@ -55,17 +55,15 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * The abstract class of database metadata, used to define the template.
+ * The abstract class of database meta data, used to define the template.
*/
-public abstract class AbstractDatabaseMetadataExecutor implements DatabaseAdminQueryExecutor {
+@Getter
+public abstract class AbstractDatabaseMetaDataExecutor implements DatabaseAdminQueryExecutor {
- @Getter
private QueryResultMetaData queryResultMetaData;
- @Getter
private MergedResult mergedResult;
- @Getter
private final LinkedList<Map<String, Object>> rows = new LinkedList<>();
@Override
@@ -179,7 +177,7 @@ public abstract class AbstractDatabaseMetadataExecutor implements DatabaseAdminQ
*/
@RequiredArgsConstructor
@Slf4j
- public static class DefaultDatabaseMetadataExecutor extends AbstractDatabaseMetadataExecutor {
+ public static class DefaultDatabaseMetaDataExecutor extends AbstractDatabaseMetaDataExecutor {
private final String sql;
@@ -195,7 +193,7 @@ public abstract class AbstractDatabaseMetadataExecutor implements DatabaseAdminQ
@Override
protected List<String> getDatabaseNames(final ConnectionSession connectionSession) {
Optional<String> database = ProxyContext.getInstance().getAllDatabaseNames().stream().filter(each -> hasAuthority(each, connectionSession.getGrantee()))
- .filter(AbstractDatabaseMetadataExecutor::hasDataSource).findFirst();
+ .filter(AbstractDatabaseMetaDataExecutor::hasDataSource).findFirst();
return database.map(Collections::singletonList).orElse(Collections.emptyList());
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLInformationSchemaExecutorFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLInformationSchemaExecutorFactory.java
index b74bb087946..1233c931b6d 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLInformationSchemaExecutorFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLInformationSchemaExecutorFactory.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.handler.admin.mysql;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import org.apache.shardingsphere.proxy.backend.handler.admin.mysql.executor.information.SelectInformationSchemataExecutor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
@@ -50,7 +50,7 @@ public final class MySQLInformationSchemaExecutorFactory {
return Optional.of(new SelectInformationSchemataExecutor(sqlStatement, sql));
}
if (DEFAULT_EXECUTOR_TABLES.contains(tableName.toUpperCase())) {
- return Optional.of(new DefaultDatabaseMetadataExecutor(sql));
+ return Optional.of(new DefaultDatabaseMetaDataExecutor(sql));
}
return Optional.empty();
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutor.java
index 72d7c096f93..af21c6e483a 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutor.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.proxy.backend.handler.admin.mysql.executor.inf
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ColumnProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ShorthandProjectionSegment;
@@ -41,7 +41,7 @@ import java.util.stream.Stream;
/**
* Schemata query executor, used to query the schemata table.
*/
-public final class SelectInformationSchemataExecutor extends DefaultDatabaseMetadataExecutor {
+public final class SelectInformationSchemataExecutor extends DefaultDatabaseMetaDataExecutor {
public static final String SCHEMA_NAME = "SCHEMA_NAME";
@@ -84,8 +84,8 @@ public final class SelectInformationSchemataExecutor extends DefaultDatabaseMeta
@Override
protected List<String> getDatabaseNames(final ConnectionSession connectionSession) {
Collection<String> databaseNames = ProxyContext.getInstance().getAllDatabaseNames().stream().filter(each -> hasAuthority(each, connectionSession.getGrantee())).collect(Collectors.toList());
- SCHEMA_WITHOUT_DATA_SOURCE.addAll(databaseNames.stream().filter(each -> !AbstractDatabaseMetadataExecutor.hasDataSource(each)).collect(Collectors.toSet()));
- List<String> result = databaseNames.stream().filter(AbstractDatabaseMetadataExecutor::hasDataSource).collect(Collectors.toList());
+ SCHEMA_WITHOUT_DATA_SOURCE.addAll(databaseNames.stream().filter(each -> !AbstractDatabaseMetaDataExecutor.hasDataSource(each)).collect(Collectors.toSet()));
+ List<String> result = databaseNames.stream().filter(AbstractDatabaseMetaDataExecutor::hasDataSource).collect(Collectors.toList());
if (!SCHEMA_WITHOUT_DATA_SOURCE.isEmpty()) {
fillSchemasWithoutDataSource();
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/PostgreSQLAdminExecutorCreator.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/PostgreSQLAdminExecutorCreator.java
index f480f863826..b9cd8f95779 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/PostgreSQLAdminExecutorCreator.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/PostgreSQLAdminExecutorCreator.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.handler.admin.postgresql;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutorCreator;
import org.apache.shardingsphere.proxy.backend.handler.admin.postgresql.executor.SelectDatabaseExecutor;
@@ -86,7 +86,7 @@ public final class PostgreSQLAdminExecutorCreator implements DatabaseAdminExecut
}
for (String each : selectedTableNames) {
if (each.startsWith(PG_PREFIX)) {
- return Optional.of(new DefaultDatabaseMetadataExecutor(sql));
+ return Optional.of(new DefaultDatabaseMetaDataExecutor(sql));
}
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutor.java
index 0480eb72233..a95fb1cc0bf 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutor.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.proxy.backend.handler.admin.postgresql.executo
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ColumnProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
/**
* Database metadata query executor, used to query the schemata database.
*/
-public final class SelectDatabaseExecutor extends DefaultDatabaseMetadataExecutor {
+public final class SelectDatabaseExecutor extends DefaultDatabaseMetaDataExecutor {
private static final String DATABASE_NAME = "databasename";
@@ -81,7 +81,7 @@ public final class SelectDatabaseExecutor extends DefaultDatabaseMetadataExecuto
@Override
protected List<String> getDatabaseNames(final ConnectionSession connectionSession) {
Collection<String> databaseNames = ProxyContext.getInstance().getAllDatabaseNames().stream().filter(each -> hasAuthority(each, connectionSession.getGrantee())).collect(Collectors.toList());
- return databaseNames.stream().filter(AbstractDatabaseMetadataExecutor::hasDataSource).collect(Collectors.toList());
+ return databaseNames.stream().filter(AbstractDatabaseMetaDataExecutor::hasDataSource).collect(Collectors.toList());
}
@Override
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutor.java
index fa710900510..c764e11120c 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutor.java
@@ -21,8 +21,8 @@ import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
/**
* Database metadata query executor, used to query table.
*/
-public final class SelectTableExecutor extends DefaultDatabaseMetadataExecutor {
+public final class SelectTableExecutor extends DefaultDatabaseMetaDataExecutor {
private static final String REL_NAME = "relname";
@@ -62,7 +62,7 @@ public final class SelectTableExecutor extends DefaultDatabaseMetadataExecutor {
@Override
protected List<String> getDatabaseNames(final ConnectionSession connectionSession) {
Collection<String> databaseNames = ProxyContext.getInstance().getAllDatabaseNames().stream().filter(each -> hasAuthority(each, connectionSession.getGrantee())).collect(Collectors.toList());
- return databaseNames.stream().filter(AbstractDatabaseMetadataExecutor::hasDataSource).collect(Collectors.toList());
+ return databaseNames.stream().filter(AbstractDatabaseMetaDataExecutor::hasDataSource).collect(Collectors.toList());
}
@Override
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
index 0a9bf8031a6..364f61a03bc 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComp
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodesStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariablesStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.scaling.QueryableScalingRALStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.scaling.UpdatableScalingRALStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ApplyDistSQLStatement;
@@ -38,8 +38,8 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.DiscardD
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportDatabaseConfigurationStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LabelComputeNodeStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.PrepareDistSQLStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetadataStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetaDataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetInstanceStatusStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelComputeNodeStatement;
@@ -60,15 +60,15 @@ import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.Sho
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowDistVariableHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowDistVariablesHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowStatusFromReadwriteSplittingRulesHandler;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowTableMetadataHandler;
+import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowTableMetaDataHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.AlterReadwriteSplittingStorageUnitStatusStatementHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.ApplyDistSQLHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.DiscardDistSQLHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.ImportDatabaseConfigurationHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.LabelComputeNodeHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.PrepareDistSQLHandler;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.RefreshDatabaseMetadataHandler;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.RefreshTableMetadataHandler;
+import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.RefreshDatabaseMetaDataHandler;
+import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.RefreshTableMetaDataHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.SetDistVariableHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.SetInstanceStatusHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.UnlabelComputeNodeHandler;
@@ -93,8 +93,8 @@ public final class RALBackendHandlerFactory {
HANDLERS.put(SetInstanceStatusStatement.class, SetInstanceStatusHandler.class);
HANDLERS.put(SetDistVariableStatement.class, SetDistVariableHandler.class);
HANDLERS.put(AlterReadwriteSplittingStorageUnitStatusStatement.class, AlterReadwriteSplittingStorageUnitStatusStatementHandler.class);
- HANDLERS.put(RefreshDatabaseMetadataStatement.class, RefreshDatabaseMetadataHandler.class);
- HANDLERS.put(RefreshTableMetadataStatement.class, RefreshTableMetadataHandler.class);
+ HANDLERS.put(RefreshDatabaseMetaDataStatement.class, RefreshDatabaseMetaDataHandler.class);
+ HANDLERS.put(RefreshTableMetaDataStatement.class, RefreshTableMetaDataHandler.class);
HANDLERS.put(PrepareDistSQLStatement.class, PrepareDistSQLHandler.class);
HANDLERS.put(ApplyDistSQLStatement.class, ApplyDistSQLHandler.class);
HANDLERS.put(DiscardDistSQLStatement.class, DiscardDistSQLHandler.class);
@@ -103,7 +103,7 @@ public final class RALBackendHandlerFactory {
HANDLERS.put(ShowDistVariableStatement.class, ShowDistVariableHandler.class);
HANDLERS.put(ShowDistVariablesStatement.class, ShowDistVariablesHandler.class);
HANDLERS.put(ShowStatusFromReadwriteSplittingRulesStatement.class, ShowStatusFromReadwriteSplittingRulesHandler.class);
- HANDLERS.put(ShowTableMetadataStatement.class, ShowTableMetadataHandler.class);
+ HANDLERS.put(ShowTableMetaDataStatement.class, ShowTableMetaDataHandler.class);
HANDLERS.put(ExportDatabaseConfigurationStatement.class, ExportDatabaseConfigurationHandler.class);
HANDLERS.put(ConvertYamlConfigurationStatement.class, ConvertYamlConfigurationHandler.class);
HANDLERS.put(ShowComputeNodeInfoStatement.class, ShowComputeNodeInfoHandler.class);
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataHandler.java
similarity index 96%
rename from proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandler.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataHandler.java
index 530182bcd99..ea1aa1a5315 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataHandler.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.dialect.exception.syntax.database.NoDatabaseSelectedException;
import org.apache.shardingsphere.dialect.exception.syntax.database.UnknownDatabaseException;
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
/**
* Show table metadata handler.
*/
-public final class ShowTableMetadataHandler extends QueryableRALBackendHandler<ShowTableMetadataStatement> {
+public final class ShowTableMetaDataHandler extends QueryableRALBackendHandler<ShowTableMetaDataStatement> {
private static final String SCHEMA_NAME = "schema_name";
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ApplyDistSQLHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ApplyDistSQLHandler.java
index 32c65ca5ac0..53a3bb0083a 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ApplyDistSQLHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ApplyDistSQLHandler.java
@@ -28,6 +28,6 @@ public final class ApplyDistSQLHandler extends UpdatableRALBackendHandler<ApplyD
@Override
protected void update(final ContextManager contextManager) {
- // TODO Metadata support required
+ // TODO Meta data support required
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/DiscardDistSQLHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/DiscardDistSQLHandler.java
index f566d2100b4..4c43b2ebf2c 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/DiscardDistSQLHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/DiscardDistSQLHandler.java
@@ -28,6 +28,6 @@ public final class DiscardDistSQLHandler extends UpdatableRALBackendHandler<Disc
@Override
protected void update(final ContextManager contextManager) {
- // TODO Metadata support required
+ // TODO Meta data support required
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/PrepareDistSQLHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/PrepareDistSQLHandler.java
index 41dd2d08642..305ed153749 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/PrepareDistSQLHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/PrepareDistSQLHandler.java
@@ -28,6 +28,6 @@ public final class PrepareDistSQLHandler extends UpdatableRALBackendHandler<Prep
@Override
protected void update(final ContextManager contextManager) {
- // TODO Metadata support required
+ // TODO Meta data support required
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetadataHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataHandler.java
similarity index 73%
rename from proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetadataHandler.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataHandler.java
index 481df436615..e1c02bd7266 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetadataHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataHandler.java
@@ -20,7 +20,8 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
import com.google.common.base.Strings;
import org.apache.shardingsphere.dialect.exception.syntax.database.NoDatabaseSelectedException;
import org.apache.shardingsphere.dialect.exception.syntax.database.UnknownDatabaseException;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetaDataStatement;
+import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
@@ -28,9 +29,9 @@ import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALB
import java.util.Optional;
/**
- * Refresh database metadata handler.
+ * Refresh database meta data handler.
*/
-public final class RefreshDatabaseMetadataHandler extends UpdatableRALBackendHandler<RefreshDatabaseMetadataStatement> {
+public final class RefreshDatabaseMetaDataHandler extends UpdatableRALBackendHandler<RefreshDatabaseMetaDataStatement> {
@Override
protected void update(final ContextManager contextManager) {
@@ -39,13 +40,9 @@ public final class RefreshDatabaseMetadataHandler extends UpdatableRALBackendHan
private String getDatabaseName() {
Optional<String> databaseName = getSqlStatement().getDatabaseName();
- String result = databaseName.isPresent() ? databaseName.get() : getConnectionSession().getDatabaseName();
- if (Strings.isNullOrEmpty(result)) {
- throw new NoDatabaseSelectedException();
- }
- if (!ProxyContext.getInstance().databaseExists(result)) {
- throw new UnknownDatabaseException(result);
- }
+ String result = databaseName.orElseGet(() -> getConnectionSession().getDatabaseName());
+ ShardingSpherePreconditions.checkState(!Strings.isNullOrEmpty(result), NoDatabaseSelectedException::new);
+ ShardingSpherePreconditions.checkState(ProxyContext.getInstance().databaseExists(result), () -> new UnknownDatabaseException(result));
return result;
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataHandler.java
similarity index 95%
rename from proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataHandler.java
index 38ef3ba4f07..6ebe3f62eed 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataHandler.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
import com.google.common.base.Strings;
import org.apache.shardingsphere.dialect.exception.syntax.database.NoDatabaseSelectedException;
import org.apache.shardingsphere.dialect.exception.syntax.database.UnknownDatabaseException;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.distsql.exception.resource.EmptyResourceException;
import org.apache.shardingsphere.infra.distsql.exception.resource.MissingRequiredResourcesException;
@@ -34,9 +34,9 @@ import java.util.Collections;
import java.util.Map;
/**
- * Refresh table metadata handler.
+ * Refresh table meta data handler.
*/
-public final class RefreshTableMetadataHandler extends UpdatableRALBackendHandler<RefreshTableMetadataStatement> {
+public final class RefreshTableMetaDataHandler extends UpdatableRALBackendHandler<RefreshTableMetaDataStatement> {
@Override
protected void update(final ContextManager contextManager) {
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
similarity index 95%
rename from proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java
rename to proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
index 4e753e684b5..972d08c9607 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
@@ -59,7 +59,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class DefaultDatabaseMetadataExecutorTest extends ProxyContextRestorer {
+public final class DefaultDatabaseMetaDataExecutorTest extends ProxyContextRestorer {
private final Grantee grantee = new Grantee("root", "127.0.0.1");
@@ -89,7 +89,7 @@ public final class DefaultDatabaseMetadataExecutorTest extends ProxyContextResto
expectedResultSetMap.put("DEFAULT_CHARACTER_SET_NAME", "utf8mb4");
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().put("auth_db", createDatabase(expectedResultSetMap));
String sql = "SELECT SCHEMA_NAME AS sn, DEFAULT_CHARACTER_SET_NAME FROM information_schema.SCHEMATA";
- DefaultDatabaseMetadataExecutor executor = new DefaultDatabaseMetadataExecutor(sql);
+ DefaultDatabaseMetaDataExecutor executor = new DefaultDatabaseMetaDataExecutor(sql);
executor.execute(connectionSession);
assertThat(executor.getRows().get(0).get("sn"), is("foo_ds"));
assertThat(executor.getRows().get(0).get("DEFAULT_CHARACTER_SET_NAME"), is("utf8mb4"));
@@ -99,7 +99,7 @@ public final class DefaultDatabaseMetadataExecutorTest extends ProxyContextResto
public void assertExecuteWithDefaultValue() throws SQLException {
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().put("auth_db", createDatabase(Collections.singletonMap("support_ndb", "0")));
String sql = "SELECT COUNT(*) AS support_ndb FROM information_schema.ENGINES WHERE Engine = 'ndbcluster'";
- DefaultDatabaseMetadataExecutor executor = new DefaultDatabaseMetadataExecutor(sql);
+ DefaultDatabaseMetaDataExecutor executor = new DefaultDatabaseMetaDataExecutor(sql);
executor.execute(connectionSession);
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
while (executor.getMergedResult().next()) {
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java
index 7486d4b8298..008aba15334 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor;
+import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import org.apache.shardingsphere.proxy.backend.handler.admin.mysql.executor.NoResourceShowExecutor;
import org.apache.shardingsphere.proxy.backend.handler.admin.mysql.executor.ShowConnectionIdExecutor;
@@ -300,7 +300,7 @@ public final class MySQLAdminExecutorCreatorTest extends ProxyContextRestorer {
when(sqlStatementContext.getSqlStatement()).thenReturn(mySQLSelectStatement);
Optional<DatabaseAdminExecutor> actual = new MySQLAdminExecutorCreator().create(sqlStatementContext, "select ENGINE from ENGINES", "");
assertTrue(actual.isPresent());
- assertThat(actual.get(), instanceOf(AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor.class));
+ assertThat(actual.get(), instanceOf(DefaultDatabaseMetaDataExecutor.class));
}
@Test
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataHandlerTest.java
similarity index 94%
rename from proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandlerTest.java
rename to proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataHandlerTest.java
index 8aadb4f23f7..fbca8a3e50c 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataHandlerTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
-import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereColumn;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereIndex;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class ShowTableMetadataHandlerTest extends ProxyContextRestorer {
+public final class ShowTableMetaDataHandlerTest extends ProxyContextRestorer {
@Test
public void assertExecute() throws SQLException {
@@ -57,7 +57,7 @@ public final class ShowTableMetadataHandlerTest extends ProxyContextRestorer {
ProxyContext.init(contextManager);
ConnectionSession connectionSession = mock(ConnectionSession.class, RETURNS_DEEP_STUBS);
when(connectionSession.getDatabaseName()).thenReturn("db_name");
- ShowTableMetadataHandler handler = new ShowTableMetadataHandler();
+ ShowTableMetaDataHandler handler = new ShowTableMetaDataHandler();
handler.init(createSqlStatement(), connectionSession);
handler.execute();
handler.next();
@@ -84,7 +84,7 @@ public final class ShowTableMetadataHandlerTest extends ProxyContextRestorer {
return result;
}
- private ShowTableMetadataStatement createSqlStatement() {
- return new ShowTableMetadataStatement(Collections.singleton("t_order"), new DatabaseSegment(0, 0, new IdentifierValue("db_name")));
+ private ShowTableMetaDataStatement createSqlStatement() {
+ return new ShowTableMetaDataStatement(Collections.singleton("t_order"), new DatabaseSegment(0, 0, new IdentifierValue("db_name")));
}
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataHandlerTest.java
similarity index 86%
rename from proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
rename to proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataHandlerTest.java
index f0dd890b1cc..c2c0cd59d1a 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataHandlerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
import org.apache.shardingsphere.dialect.exception.syntax.database.NoDatabaseSelectedException;
import org.apache.shardingsphere.dialect.exception.syntax.database.UnknownDatabaseException;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.distsql.exception.resource.EmptyResourceException;
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class RefreshTableMetadataHandlerTest extends ProxyContextRestorer {
+public final class RefreshTableMetaDataHandlerTest extends ProxyContextRestorer {
private ConnectionSession connectionSession;
@@ -67,16 +67,16 @@ public final class RefreshTableMetadataHandlerTest extends ProxyContextRestorer
@Test(expected = NoDatabaseSelectedException.class)
public void assertNoDatabaseSelected() throws SQLException {
- RefreshTableMetadataHandler backendHandler = new RefreshTableMetadataHandler();
- backendHandler.init(new RefreshTableMetadataStatement(), connectionSession);
+ RefreshTableMetaDataHandler backendHandler = new RefreshTableMetaDataHandler();
+ backendHandler.init(new RefreshTableMetaDataStatement(), connectionSession);
backendHandler.execute();
}
@Test(expected = UnknownDatabaseException.class)
public void assertUnknownDatabaseException() throws SQLException {
when(connectionSession.getDatabaseName()).thenReturn("db");
- RefreshTableMetadataHandler backendHandler = new RefreshTableMetadataHandler();
- backendHandler.init(new RefreshTableMetadataStatement(), connectionSession);
+ RefreshTableMetaDataHandler backendHandler = new RefreshTableMetaDataHandler();
+ backendHandler.init(new RefreshTableMetaDataStatement(), connectionSession);
backendHandler.execute();
}
@@ -85,8 +85,8 @@ public final class RefreshTableMetadataHandlerTest extends ProxyContextRestorer
when(connectionSession.getDatabaseName()).thenReturn("sharding_db");
when(shardingSphereMetaData.containsDatabase("sharding_db")).thenReturn(true);
when(contextManager.getDataSourceMap("sharding_db")).thenReturn(Collections.emptyMap());
- RefreshTableMetadataHandler backendHandler = new RefreshTableMetadataHandler();
- backendHandler.init(new RefreshTableMetadataStatement(), connectionSession);
+ RefreshTableMetaDataHandler backendHandler = new RefreshTableMetaDataHandler();
+ backendHandler.init(new RefreshTableMetaDataStatement(), connectionSession);
backendHandler.execute();
}
@@ -96,8 +96,8 @@ public final class RefreshTableMetadataHandlerTest extends ProxyContextRestorer
when(shardingSphereMetaData.containsDatabase("sharding_db")).thenReturn(true);
Map<String, DataSource> dataSources = createDataSources();
when(contextManager.getDataSourceMap("sharding_db")).thenReturn(dataSources);
- RefreshTableMetadataHandler backendHandler = new RefreshTableMetadataHandler();
- backendHandler.init(new RefreshTableMetadataStatement("t_order", "ds_1", null), connectionSession);
+ RefreshTableMetaDataHandler backendHandler = new RefreshTableMetaDataHandler();
+ backendHandler.init(new RefreshTableMetaDataStatement("t_order", "ds_1", null), connectionSession);
backendHandler.execute();
}
@@ -107,8 +107,8 @@ public final class RefreshTableMetadataHandlerTest extends ProxyContextRestorer
when(shardingSphereMetaData.containsDatabase("sharding_db")).thenReturn(true);
Map<String, DataSource> dataSources = createDataSources();
when(contextManager.getDataSourceMap("sharding_db")).thenReturn(dataSources);
- RefreshTableMetadataHandler backendHandler = new RefreshTableMetadataHandler();
- backendHandler.init(new RefreshTableMetadataStatement(), connectionSession);
+ RefreshTableMetaDataHandler backendHandler = new RefreshTableMetaDataHandler();
+ backendHandler.init(new RefreshTableMetaDataStatement(), connectionSession);
ResponseHeader actual = backendHandler.execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
}
diff --git a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/watcher/PipelineWatcher.java b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/watcher/PipelineWatcher.java
index 5e52c114b93..01d64c5892f 100644
--- a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/watcher/PipelineWatcher.java
+++ b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/watcher/PipelineWatcher.java
@@ -47,7 +47,7 @@ public class PipelineWatcher extends TestWatcher {
}
}
- // TODO now the metadata mistake is not reproduce, but keep this method, it may be used again later
+ // TODO now the meta data mistake is not reproduce, but keep this method, it may be used again later
private void outputZookeeperData() {
DockerContainerComposer dockerContainerComposer = (DockerContainerComposer) containerComposer;
DatabaseType databaseType = dockerContainerComposer.getStorageContainer().getDatabaseType();
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java
index d6867190c17..1910c381819 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java
@@ -33,15 +33,15 @@ public final class SQLValueGroup {
private final Collection<SQLValue> values;
- public SQLValueGroup(final DataSetMetaData metadata, final List<String> values) throws ParseException {
- this.values = createSQLValues(metadata, values);
+ 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) {
- result.add(new SQLValue(each, metadata.getColumns().get(count).getType(), count + 1));
+ result.add(new SQLValue(each, metaData.getColumns().get(count).getType(), count + 1));
count++;
}
return result;
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java
index 457144638ba..2e4557d7a86 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDist
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodeInfoStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodesStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodeModeStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement;
import org.apache.shardingsphere.parser.distsql.parser.statement.queryable.ShowSQLParserRuleStatement;
import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowStatusFromReadwriteSplittingRulesStatement;
@@ -43,7 +43,7 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.r
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable.ShowStatusFromReadwriteSplittingRulesStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable.ShowSQLParserRuleStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable.ShowSQLTranslatorRuleStatementAssert;
-import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable.ShowTableMetadataStatementAssert;
+import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable.ShowTableMetaDataStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable.ShowTrafficRulesStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable.ShowTransactionRuleStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable.ShowDistVariableStatementAssert;
@@ -58,7 +58,7 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowStatusFromReadwriteSplittingRulesStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowSQLParserRuleStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowSQLTranslatorRuleStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTableMetadataStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTableMetaDataStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTrafficRulesStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTransactionRuleStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowDistVariableStatementTestCase;
@@ -88,8 +88,8 @@ public final class QueryableRALStatementAssert {
} else if (actual instanceof ShowStatusFromReadwriteSplittingRulesStatement) {
ShowStatusFromReadwriteSplittingRulesStatementAssert.assertIs(assertContext, (ShowStatusFromReadwriteSplittingRulesStatement) actual,
(ShowStatusFromReadwriteSplittingRulesStatementTestCase) expected);
- } else if (actual instanceof ShowTableMetadataStatement) {
- ShowTableMetadataStatementAssert.assertIs(assertContext, (ShowTableMetadataStatement) actual, (ShowTableMetadataStatementTestCase) expected);
+ } else if (actual instanceof ShowTableMetaDataStatement) {
+ ShowTableMetaDataStatementAssert.assertIs(assertContext, (ShowTableMetaDataStatement) actual, (ShowTableMetaDataStatementTestCase) expected);
} else if (actual instanceof ShowAuthorityRuleStatement) {
ShowAuthorityRuleStatementAssert.assertIs(assertContext, (ShowAuthorityRuleStatement) actual, (ShowAuthorityRuleStatementTestCase) expected);
} else if (actual instanceof ShowTransactionRuleStatement) {
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java
index c6bd529bebe..37e3694d707 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatem
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.AlterComputeNodeStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportDatabaseConfigurationStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LabelComputeNodeStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelComputeNodeStatement;
import org.apache.shardingsphere.parser.distsql.parser.statement.updatable.AlterSQLParserRuleStatement;
@@ -38,7 +38,7 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.r
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.DropTrafficRuleStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.ImportDatabaseConfigurationStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.LabelComputeNodeStatementAssert;
-import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.RefreshTableMetadataStatementAssert;
+import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.RefreshTableMetaDataStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.SetDistVariableStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.UnlabelComputeNodeStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
@@ -50,7 +50,7 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.DropTrafficRuleStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportDatabaseConfigurationStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.LabelComputeNodeStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetadataStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetaDataStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.SetDistVariableStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.UnlabelComputeNodeStatementTestCase;
import org.apache.shardingsphere.traffic.distsql.parser.statement.updatable.AlterTrafficRuleStatement;
@@ -80,8 +80,8 @@ public final class UpdatableRALStatementAssert {
AlterComputeNodeStatementAssert.assertIs(assertContext, (AlterComputeNodeStatement) actual, (AlterComputeNodeStatementTestCase) expected);
} else if (actual instanceof SetDistVariableStatement) {
SetDistVariableStatementAssert.assertIs(assertContext, (SetDistVariableStatement) actual, (SetDistVariableStatementTestCase) expected);
- } else if (actual instanceof RefreshTableMetadataStatement) {
- RefreshTableMetadataStatementAssert.assertIs(assertContext, (RefreshTableMetadataStatement) actual, (RefreshTableMetadataStatementTestCase) expected);
+ } else if (actual instanceof RefreshTableMetaDataStatement) {
+ RefreshTableMetaDataStatementAssert.assertIs(assertContext, (RefreshTableMetaDataStatement) actual, (RefreshTableMetaDataStatementTestCase) expected);
} else if (actual instanceof AlterSQLParserRuleStatement) {
AlterSQLParserRuleStatementAssert.assertIs(assertContext, (AlterSQLParserRuleStatement) actual, (AlterSQLParserRuleStatementTestCase) expected);
} else if (actual instanceof DropTrafficRuleStatement) {
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetadataStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java
similarity index 79%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetadataStatementAssert.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java
index 4bb513eeaea..c6eef245c65 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetadataStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable;
-import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.database.DatabaseAssert;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTableMetadataStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTableMetaDataStatementTestCase;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNotNull;
@@ -28,19 +28,19 @@ import static org.junit.Assert.assertNull;
import static org.hamcrest.MatcherAssert.assertThat;
/**
- * Show table metadata statement assert.
+ * Show table meta data statement assert.
*/
-public final class ShowTableMetadataStatementAssert {
+public final class ShowTableMetaDataStatementAssert {
/**
- * Assert show table metadata statement is correct with expected parser result.
+ * Assert show table meta data statement is correct with expected parser result.
*
* @param assertContext assert context
- * @param actual actual show table metadata statement
- * @param expected expected show table metadata statement test case
+ * @param actual actual show table meta data statement
+ * @param expected expected show table meta data statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final ShowTableMetadataStatement actual,
- final ShowTableMetadataStatementTestCase expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext, final ShowTableMetaDataStatement actual,
+ final ShowTableMetaDataStatementTestCase expected) {
if (null == expected) {
assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetadataStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetaDataStatementAssert.java
similarity index 81%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetadataStatementAssert.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetaDataStatementAssert.java
index ba4bae879c6..0a0ed4af32e 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetadataStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetaDataStatementAssert.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetadataStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetadataStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetaDataStatementTestCase;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNotNull;
@@ -27,18 +27,18 @@ import static org.junit.Assert.assertNull;
import static org.hamcrest.MatcherAssert.assertThat;
/**
- * Refresh table metadata statement assert.
+ * Refresh table meta data statement assert.
*/
-public final class RefreshTableMetadataStatementAssert {
+public final class RefreshTableMetaDataStatementAssert {
/**
- * Assert refresh table metadata statement is correct with expected parser result.
+ * Assert refresh table meta data statement is correct with expected parser result.
*
* @param assertContext assert context
- * @param actual actual refresh table metadata statement
- * @param expected expected refresh table metadata statement test case
+ * @param actual actual refresh table meta data statement
+ * @param expected expected refresh table meta data statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final RefreshTableMetadataStatement actual, final RefreshTableMetadataStatementTestCase expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext, final RefreshTableMetaDataStatement actual, final RefreshTableMetaDataStatementTestCase expected) {
if (null == expected) {
assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
index 070c3a16c6e..a9123895f3a 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
@@ -295,7 +295,7 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportDatabaseConfigurationStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.LabelComputeNodeStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.PrepareDistSQLStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetadataStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetaDataStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.SetDistVariableStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.SetReadwriteSplittingHintStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.SetShardingHintDatabaseValueStatementTestCase;
@@ -311,7 +311,7 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowSQLTranslatorRuleStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowShardingHintStatusStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowStatusFromReadwriteSplittingRulesStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTableMetadataStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTableMetaDataStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTrafficRulesStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTransactionRuleStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.UnlabelComputeNodeStatementTestCase;
@@ -1220,7 +1220,7 @@ public final class RootSQLParserTestCases {
private final List<ShowStatusStatementTestCase> showStatusTestCases = new LinkedList<>();
@XmlElement(name = "refresh-table-metadata")
- private final List<RefreshTableMetadataStatementTestCase> refreshTableMetadataTestCases = new LinkedList<>();
+ private final List<RefreshTableMetaDataStatementTestCase> refreshTableMetaDataTestCases = new LinkedList<>();
@XmlElement(name = "show-events")
private final List<ShowEventsStatementTestCase> showEventsTestCases = new LinkedList<>();
@@ -1292,7 +1292,7 @@ public final class RootSQLParserTestCases {
private final List<DiscardDistSQLStatementTestCase> discardDistSQLTestCases = new LinkedList<>();
@XmlElement(name = "show-table-metadata")
- private final List<ShowTableMetadataStatementTestCase> showTableMetadataTestCases = new LinkedList<>();
+ private final List<ShowTableMetaDataStatementTestCase> showTableMetaDataTestCases = new LinkedList<>();
@XmlElement(name = "create-conversion")
private final List<CreateConversionStatementTestCase> createConversionTestCases = new LinkedList<>();
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/RefreshTableMetadataStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/RefreshTableMetaDataStatementTestCase.java
similarity index 92%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/RefreshTableMetadataStatementTestCase.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/RefreshTableMetaDataStatementTestCase.java
index da52d5eda32..cc710c8c352 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/RefreshTableMetadataStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/RefreshTableMetaDataStatementTestCase.java
@@ -24,11 +24,11 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.S
import javax.xml.bind.annotation.XmlAttribute;
/**
- * Refresh table metadata statement test case.
+ * Refresh table meta data statement test case.
*/
@Getter
@Setter
-public final class RefreshTableMetadataStatementTestCase extends SQLParserTestCase {
+public final class RefreshTableMetaDataStatementTestCase extends SQLParserTestCase {
@XmlAttribute(name = "table-name")
private String tableName;
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/ShowTableMetadataStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/ShowTableMetaDataStatementTestCase.java
similarity index 92%
rename from test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/ShowTableMetadataStatementTestCase.java
rename to test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/ShowTableMetaDataStatementTestCase.java
index 4a62499feb7..d11d470c603 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/ShowTableMetadataStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/ShowTableMetaDataStatementTestCase.java
@@ -25,11 +25,11 @@ import javax.xml.bind.annotation.XmlElement;
import java.util.Set;
/**
- * Show table metadata statement test case.
+ * Show table meta data statement test case.
*/
@Getter
@Setter
-public final class ShowTableMetadataStatementTestCase extends DatabaseContainedTestCase {
+public final class ShowTableMetaDataStatementTestCase extends DatabaseContainedTestCase {
@XmlElement(name = "table-name")
private Set<String> tableNames;