This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 63155b5 fix typo of meta and metaDataMap (#14233)
63155b5 is described below
commit 63155b5b3c9da9e26d18844bc9824e73bfab1093
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Wed Dec 22 19:48:04 2021 +0800
fix typo of meta and metaDataMap (#14233)
---
.../infra/metadata/schema/ShardingSphereSchema.java | 2 +-
.../infra/rule/builder/global/GlobalRuleBuilder.java | 4 ++--
.../infra/rule/builder/global/GlobalRulesBuilder.java | 6 +++---
.../authority/spi/AuthorityProvideAlgorithm.java | 8 ++++----
.../provider/natived/NativeAuthorityProviderAlgorithm.java | 8 ++++----
.../SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java | 4 ++--
.../AllPrivilegesPermittedAuthorityProviderAlgorithm.java | 4 ++--
.../apache/shardingsphere/authority/rule/AuthorityRule.java | 10 +++++-----
.../authority/rule/builder/AuthorityRuleBuilder.java | 4 ++--
.../parser/rule/builder/SQLParserRuleBuilder.java | 2 +-
.../transaction/rule/builder/TransactionRuleBuilder.java | 2 +-
.../apache/shardingsphere/mode/metadata/MetaDataContexts.java | 4 ++--
.../shardingsphere/mode/metadata/MetaDataContextsBuilder.java | 4 ++--
13 files changed, 31 insertions(+), 31 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/ShardingSphereSchema.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/ShardingSphereSchema.java
index 71fcca1..49c99fc 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/ShardingSphereSchema.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/ShardingSphereSchema.java
@@ -59,7 +59,7 @@ public final class ShardingSphereSchema {
* Get table meta data via table name.
*
* @param tableName tableName table name
- * @return table mata data
+ * @return table meta data
*/
public TableMetaData get(final String tableName) {
return tables.get(tableName.toLowerCase());
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRuleBuilder.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRuleBuilder.java
index aacc114..bbf1af0 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRuleBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRuleBuilder.java
@@ -35,8 +35,8 @@ public interface GlobalRuleBuilder<T extends
RuleConfiguration> extends RuleBuil
* Build global rule.
*
* @param ruleConfig rule configuration
- * @param mataDataMap mata data map
+ * @param metaDataMap meta data map
* @return global rule
*/
- GlobalRule build(T ruleConfig, Map<String, ShardingSphereMetaData>
mataDataMap);
+ GlobalRule build(T ruleConfig, Map<String, ShardingSphereMetaData>
metaDataMap);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilder.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilder.java
index 61b8460..eef4efe 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilder.java
@@ -47,14 +47,14 @@ public final class GlobalRulesBuilder {
* Build rules.
*
* @param globalRuleConfigs global rule configurations
- * @param mataDataMap mata data map
+ * @param metaDataMap meta data map
* @return built rules
*/
@SuppressWarnings({"unchecked", "rawtypes"})
- public static Collection<ShardingSphereRule> buildRules(final
Collection<RuleConfiguration> globalRuleConfigs, final Map<String,
ShardingSphereMetaData> mataDataMap) {
+ public static Collection<ShardingSphereRule> buildRules(final
Collection<RuleConfiguration> globalRuleConfigs, final Map<String,
ShardingSphereMetaData> metaDataMap) {
Collection<ShardingSphereRule> result = new LinkedList<>();
for (Entry<RuleConfiguration, GlobalRuleBuilder> entry :
getRuleBuilderMap(globalRuleConfigs).entrySet()) {
- result.add(entry.getValue().build(entry.getKey(), mataDataMap));
+ result.add(entry.getValue().build(entry.getKey(), metaDataMap));
}
return result;
}
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvideAlgorithm.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvideAlgorithm.java
index 7fff91e..49cc5a2 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvideAlgorithm.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvideAlgorithm.java
@@ -35,18 +35,18 @@ public interface AuthorityProvideAlgorithm extends
ShardingSphereAlgorithm {
/**
* Initialize authority.
*
- * @param mataDataMap mata data map
+ * @param metaDataMap meta data map
* @param users users
*/
- void init(Map<String, ShardingSphereMetaData> mataDataMap,
Collection<ShardingSphereUser> users);
+ void init(Map<String, ShardingSphereMetaData> metaDataMap,
Collection<ShardingSphereUser> users);
/**
* Refresh authority.
*
- * @param mataDataMap mata data map
+ * @param metaDataMap meta data map
* @param users users
*/
- void refresh(Map<String, ShardingSphereMetaData> mataDataMap,
Collection<ShardingSphereUser> users);
+ void refresh(Map<String, ShardingSphereMetaData> metaDataMap,
Collection<ShardingSphereUser> users);
/**
* Find Privileges.
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
index 91b85ff..82ec458 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
@@ -41,13 +41,13 @@ public final class NativeAuthorityProviderAlgorithm
implements AuthorityProvideA
private final Map<ShardingSphereUser, ShardingSpherePrivileges>
userPrivilegeMap = new ConcurrentHashMap<>();
@Override
- public void init(final Map<String, ShardingSphereMetaData> mataDataMap,
final Collection<ShardingSphereUser> users) {
- userPrivilegeMap.putAll(StoragePrivilegeBuilder.build(new
LinkedList<>(mataDataMap.values()), users));
+ public void init(final Map<String, ShardingSphereMetaData> metaDataMap,
final Collection<ShardingSphereUser> users) {
+ userPrivilegeMap.putAll(StoragePrivilegeBuilder.build(new
LinkedList<>(metaDataMap.values()), users));
}
@Override
- public void refresh(final Map<String, ShardingSphereMetaData> mataDataMap,
final Collection<ShardingSphereUser> users) {
- userPrivilegeMap.putAll(StoragePrivilegeBuilder.build(new
LinkedList<>(mataDataMap.values()), users));
+ public void refresh(final Map<String, ShardingSphereMetaData> metaDataMap,
final Collection<ShardingSphereUser> users) {
+ userPrivilegeMap.putAll(StoragePrivilegeBuilder.build(new
LinkedList<>(metaDataMap.values()), users));
}
@Override
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
index 73cb474..5ebc9fa 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
@@ -49,12 +49,12 @@ public final class
SchemaPrivilegesPermittedAuthorityProviderAlgorithm implement
}
@Override
- public void init(final Map<String, ShardingSphereMetaData> mataDataMap,
final Collection<ShardingSphereUser> users) {
+ public void init(final Map<String, ShardingSphereMetaData> metaDataMap,
final Collection<ShardingSphereUser> users) {
this.userPrivilegeMap.putAll(SchemaPrivilegeBuilder.build(users,
props));
}
@Override
- public void refresh(final Map<String, ShardingSphereMetaData> mataDataMap,
final Collection<ShardingSphereUser> users) {
+ public void refresh(final Map<String, ShardingSphereMetaData> metaDataMap,
final Collection<ShardingSphereUser> users) {
this.userPrivilegeMap.putAll(SchemaPrivilegeBuilder.build(users,
props));
}
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesPermittedAuthorityProviderAlgorithm.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesPermittedAuthorityProviderAlgorithm.java
index 81d79ea..1b452a8 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesPermittedAuthorityProviderAlgorithm.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesPermittedAuthorityProviderAlgorithm.java
@@ -37,11 +37,11 @@ public final class
AllPrivilegesPermittedAuthorityProviderAlgorithm implements A
private static final ShardingSpherePrivileges INSTANCE = new
AllPrivilegesPermittedShardingSpherePrivileges();
@Override
- public void init(final Map<String, ShardingSphereMetaData> mataDataMap,
final Collection<ShardingSphereUser> users) {
+ public void init(final Map<String, ShardingSphereMetaData> metaDataMap,
final Collection<ShardingSphereUser> users) {
}
@Override
- public void refresh(final Map<String, ShardingSphereMetaData> mataDataMap,
final Collection<ShardingSphereUser> users) {
+ public void refresh(final Map<String, ShardingSphereMetaData> metaDataMap,
final Collection<ShardingSphereUser> users) {
}
@Override
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
index 4ad243d..13848ca 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
@@ -44,9 +44,9 @@ public final class AuthorityRule implements GlobalRule {
private final Collection<ShardingSphereUser> users;
- public AuthorityRule(final AuthorityRuleConfiguration config, final
Map<String, ShardingSphereMetaData> mataDataMap, final
Collection<ShardingSphereUser> users) {
+ public AuthorityRule(final AuthorityRuleConfiguration config, final
Map<String, ShardingSphereMetaData> metaDataMap, final
Collection<ShardingSphereUser> users) {
provider =
ShardingSphereAlgorithmFactory.createAlgorithm(config.getProvider(),
AuthorityProvideAlgorithm.class);
- provider.init(mataDataMap, users);
+ provider.init(metaDataMap, users);
this.users = users;
}
@@ -63,11 +63,11 @@ public final class AuthorityRule implements GlobalRule {
/**
* Refresh authority.
*
- * @param mataDataMap mata data map
+ * @param metaDataMap meta data map
* @param users users
*/
- public void refresh(final Map<String, ShardingSphereMetaData> mataDataMap,
final Collection<ShardingSphereUser> users) {
- provider.refresh(mataDataMap, users);
+ public void refresh(final Map<String, ShardingSphereMetaData> metaDataMap,
final Collection<ShardingSphereUser> users) {
+ provider.refresh(metaDataMap, users);
}
/**
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
index f279cd6..5e4a008 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
@@ -31,8 +31,8 @@ import java.util.Map;
public final class AuthorityRuleBuilder implements
GlobalRuleBuilder<AuthorityRuleConfiguration> {
@Override
- public AuthorityRule build(final AuthorityRuleConfiguration ruleConfig,
final Map<String, ShardingSphereMetaData> mataDataMap) {
- return new AuthorityRule(ruleConfig, mataDataMap,
ruleConfig.getUsers());
+ public AuthorityRule build(final AuthorityRuleConfiguration ruleConfig,
final Map<String, ShardingSphereMetaData> metaDataMap) {
+ return new AuthorityRule(ruleConfig, metaDataMap,
ruleConfig.getUsers());
}
@Override
diff --git
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilder.java
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilder.java
index 5a772b9..06106ac 100644
---
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilder.java
@@ -31,7 +31,7 @@ import java.util.Map;
public final class SQLParserRuleBuilder implements
GlobalRuleBuilder<SQLParserRuleConfiguration> {
@Override
- public SQLParserRule build(final SQLParserRuleConfiguration ruleConfig,
final Map<String, ShardingSphereMetaData> mataDataMap) {
+ public SQLParserRule build(final SQLParserRuleConfiguration ruleConfig,
final Map<String, ShardingSphereMetaData> metaDataMap) {
return new SQLParserRule(ruleConfig);
}
diff --git
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilder.java
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilder.java
index 0bac162..add5e76 100644
---
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilder.java
@@ -31,7 +31,7 @@ import java.util.Map;
public final class TransactionRuleBuilder implements
GlobalRuleBuilder<TransactionRuleConfiguration> {
@Override
- public TransactionRule build(final TransactionRuleConfiguration
ruleConfig, final Map<String, ShardingSphereMetaData> mataDataMap) {
+ public TransactionRule build(final TransactionRuleConfiguration
ruleConfig, final Map<String, ShardingSphereMetaData> metaDataMap) {
return new TransactionRule(ruleConfig);
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
index 6bf3d0d..50b7425 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
@@ -87,10 +87,10 @@ public final class MetaDataContexts implements
AutoCloseable {
}
/**
- * Get mata data.
+ * Get meta data.
*
* @param schemaName schema name
- * @return mata data
+ * @return meta data
*/
public ShardingSphereMetaData getMetaData(final String schemaName) {
return metaDataMap.get(schemaName);
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
index 332e388..e37c3c5 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
@@ -99,8 +99,8 @@ public final class MetaDataContextsBuilder {
return new MetaDataContexts(metaDataPersistService, metaData,
globalMetaData, executorEngine, props, OptimizerContextFactory.create(metaData,
globalMetaData));
}
- private ShardingSphereRuleMetaData buildGlobalSchemaMetaData(final
Map<String, ShardingSphereMetaData> mataDataMap) {
- return new ShardingSphereRuleMetaData(globalRuleConfigs,
GlobalRulesBuilder.buildRules(globalRuleConfigs, mataDataMap));
+ private ShardingSphereRuleMetaData buildGlobalSchemaMetaData(final
Map<String, ShardingSphereMetaData> metaDataMap) {
+ return new ShardingSphereRuleMetaData(globalRuleConfigs,
GlobalRulesBuilder.buildRules(globalRuleConfigs, metaDataMap));
}
private ShardingSphereResource buildResource(final DatabaseType
databaseType, final Map<String, DataSource> dataSourceMap) throws SQLException {
