This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 43254b9715e Use case sensitive with algorithm and mode type (#21578)
43254b9715e is described below
commit 43254b9715e2494fdda85aa03f495071e867adf0
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Oct 15 11:24:53 2022 +0800
Use case sensitive with algorithm and mode type (#21578)
* Refactor JobDataNodeEntry
* For code format
* Change javax.activation-api to compile scope
* Use case sensitive with algorithm and mode type
---
.../org/apache/shardingsphere/agent/core/plugin/PluginContext.java | 2 +-
.../org/apache/shardingsphere/infra/instance/InstanceContext.java | 2 +-
.../datasource/creator/ShardingSpherePipelineDataSourceCreator.java | 2 +-
.../authority/provider/database/builder/DatabasePrivilegeBuilder.java | 2 +-
.../data/pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java | 2 +-
.../pipeline/core/registry/CoordinatorRegistryCenterInitializer.java | 2 +-
.../apache/shardingsphere/schedule/core/ScheduleContextFactory.java | 2 +-
.../handler/distsql/ral/queryable/ShowInstanceListHandler.java | 4 ++--
.../env/container/atomic/adapter/AdapterContainerFactory.java | 4 +---
9 files changed, 10 insertions(+), 12 deletions(-)
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginContext.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginContext.java
index c6c62a0595f..5b4d70c3f93 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginContext.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginContext.java
@@ -30,6 +30,6 @@ public final class PluginContext {
* @return the plugin enable value
*/
public static boolean isPluginEnabled() {
- return
!Boolean.FALSE.toString().equalsIgnoreCase(System.getProperty(PLUGIN_ENABLED_KEY))
&& !"0".equalsIgnoreCase(System.getProperty(PLUGIN_ENABLED_KEY));
+ return
!Boolean.FALSE.toString().equalsIgnoreCase(System.getProperty(PLUGIN_ENABLED_KEY))
&& !"0".equals(System.getProperty(PLUGIN_ENABLED_KEY));
}
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
index e5241e2a7fa..463c39e35df 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
@@ -168,6 +168,6 @@ public final class InstanceContext {
* @return true if is cluster, else false
*/
public boolean isCluster() {
- return "Cluster".equalsIgnoreCase(modeConfiguration.getType());
+ return "Cluster".equals(modeConfiguration.getType());
}
}
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
index 908b5460d2f..5ae9d20b1b0 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
@@ -59,7 +59,7 @@ public final class ShardingSpherePipelineDataSourceCreator
implements PipelineDa
private void enableRangeQueryForInline(final YamlShardingRuleConfiguration
shardingRuleConfig) {
for (YamlAlgorithmConfiguration each :
shardingRuleConfig.getShardingAlgorithms().values()) {
- if ("INLINE".equalsIgnoreCase(each.getType())) {
+ if ("INLINE".equals(each.getType())) {
each.getProps().put("allow-range-query-with-inline-sharding",
Boolean.TRUE.toString());
}
}
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
index dc0c9f0b0fb..129f6f95e63 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
@@ -106,7 +106,7 @@ public final class DatabasePrivilegeBuilder {
}
private static boolean checkAnyOtherHost(final Grantee grantee, final
ShardingSphereUser shardingSphereUser) {
- return ("%".equalsIgnoreCase(grantee.getHostname())
+ return ("%".equals(grantee.getHostname())
||
grantee.getHostname().equals(shardingSphereUser.getGrantee().getHostname())) &&
grantee.getUsername().equals(shardingSphereUser.getGrantee().getUsername());
}
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java
index b519298f5aa..65d195d451b 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java
@@ -74,7 +74,7 @@ public abstract class AbstractPipelineJobAPIImpl implements
PipelineJobAPI {
protected void checkModeConfig() {
ModeConfiguration modeConfig = PipelineContext.getModeConfig();
Preconditions.checkNotNull(modeConfig, "Mode configuration is
required.");
-
Preconditions.checkArgument("Cluster".equalsIgnoreCase(modeConfig.getType()),
"Mode must be `Cluster`.");
+ Preconditions.checkArgument("Cluster".equals(modeConfig.getType()),
"Mode must be `Cluster`.");
}
private Stream<JobBriefInfo> getJobBriefInfos() {
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/registry/CoordinatorRegistryCenterInitializer.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/registry/CoordinatorRegistryCenterInitializer.java
index 7672bf70528..cb44d79c55c 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/registry/CoordinatorRegistryCenterInitializer.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/registry/CoordinatorRegistryCenterInitializer.java
@@ -43,7 +43,7 @@ public final class CoordinatorRegistryCenterInitializer {
public CoordinatorRegistryCenter createRegistryCenter(final
ModeConfiguration modeConfig, final String namespaceRelativePath) {
ClusterPersistRepositoryConfiguration repositoryConfig =
(ClusterPersistRepositoryConfiguration) modeConfig.getRepository();
String clusterType = modeConfig.getRepository().getType();
- Preconditions.checkArgument("ZooKeeper".equalsIgnoreCase(clusterType),
"Unsupported cluster type `%s`", clusterType);
+ Preconditions.checkArgument("ZooKeeper".equals(clusterType),
"Unsupported cluster type `%s`", clusterType);
CoordinatorRegistryCenter result = new
ZookeeperRegistryCenter(getZookeeperConfig(repositoryConfig,
namespaceRelativePath));
result.init();
return result;
diff --git
a/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/ScheduleContextFactory.java
b/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/ScheduleContextFactory.java
index 04d9e103ee2..cb4ccb1c17f 100644
---
a/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/ScheduleContextFactory.java
+++
b/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/ScheduleContextFactory.java
@@ -39,7 +39,7 @@ public final class ScheduleContextFactory {
* @return Schedule context instance
*/
public static ScheduleContext newInstance(final ModeConfiguration
modeConfig) {
- return "Cluster".equalsIgnoreCase(modeConfig.getType()) &&
"ZooKeeper".equalsIgnoreCase(modeConfig.getRepository().getType())
+ return "Cluster".equals(modeConfig.getType()) &&
"ZooKeeper".equals(modeConfig.getRepository().getType())
? new
ClusterScheduleContext(modeConfig.getRepository().getProps().getProperty("server-lists"),
modeConfig.getRepository().getProps().getProperty("namespace"))
: new StandaloneScheduleContext();
}
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandler.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandler.java
index 711d2e9b8ef..d93f12e7b24 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandler.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandler.java
@@ -59,8 +59,8 @@ public final class ShowInstanceListHandler extends
QueryableRALBackendHandler<Sh
@Override
protected Collection<LocalDataQueryResultRow> getRows(final ContextManager
contextManager) {
String modeType =
contextManager.getInstanceContext().getModeConfiguration().getType();
- if ("Standalone".equalsIgnoreCase(modeType)) {
- return
Collections.singletonList(buildRow(contextManager.getInstanceContext().getInstance(),
modeType));
+ if ("Standalone".equals(modeType)) {
+ return
Collections.singleton(buildRow(contextManager.getInstanceContext().getInstance(),
modeType));
}
Collection<ComputeNodeInstance> instances =
contextManager.getInstanceContext().getAllClusterInstances().stream()
.filter(each -> InstanceType.PROXY ==
each.getMetaData().getType()).collect(Collectors.toList());
diff --git
a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/AdapterContainerFactory.java
b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/AdapterContainerFactory.java
index 0517ca88bdc..cef6a3f1f49 100644
---
a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/AdapterContainerFactory.java
+++
b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/AdapterContainerFactory.java
@@ -47,9 +47,7 @@ public final class AdapterContainerFactory {
final StorageContainer
storageContainer, final String scenario, final AdaptorContainerConfiguration
containerConfig) {
switch (adapter) {
case "proxy":
- return "Cluster".equalsIgnoreCase(mode)
- ? new
ShardingSphereProxyClusterContainer(databaseType, containerConfig)
- : new
ShardingSphereProxyStandaloneContainer(databaseType, containerConfig);
+ return "Cluster".equals(mode) ? new
ShardingSphereProxyClusterContainer(databaseType, containerConfig) : new
ShardingSphereProxyStandaloneContainer(databaseType, containerConfig);
case "jdbc":
return new ShardingSphereJdbcContainer(storageContainer,
scenario);
default:
