You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/01/21 13:03:24 UTC
[shardingsphere] branch master updated: Fix for code format (#9120)
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 3c6573f Fix for code format (#9120)
3c6573f is described below
commit 3c6573f5c9b28aea1076bfa6834ad251b08616db
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Jan 21 21:02:44 2021 +0800
Fix for code format (#9120)
* For code format
* For code format
* For code format
* Fix spi files
* Fix typo
* Revert license header
---
.../agent/metrics/api/enums/MetricType.java | 3 +-
.../metrics/api/advice/MockAdviceTargetObject.java | 6 +-
.../opentracing/advice/MockAdviceTargetObject.java | 2 +-
.../query/binary/bind/PostgreSQLComBindPacket.java | 2 +-
.../shardingsphere/ha/rule/HADataSourceRule.java | 2 +-
.../apache/shardingsphere/ha/mgr/MGRHAType.java | 2 +-
.../complex/ComplexKeysShardingAlgorithm.java | 4 +-
.../dml/ShardingDMLStatementValidator.java | 7 +-
.../config/listener/SchemaChangedListener.java | 2 +-
.../governance/core/registry/RegistryCenter.java | 4 +-
.../governance/core/config/MockDataSource.java | 20 +-
.../statement/CommonSQLStatementContext.java | 6 +-
.../context/metadata/MetaDataContextsBuilder.java | 2 +-
.../metadata/impl/StandardMetaDataContexts.java | 2 +-
...gsphere.datetime.database.spi.DatabaseSQLEntry} | 0
.../optimize/context/CalciteContextFactory.java | 28 +-
.../optimize/execute/raw/CalciteRawExecutor.java | 7 +-
.../optimize/schema/CalciteLogicSchemaFactory.java | 7 +-
.../execute/CalciteExecutionContextGenerator.java | 19 +-
.../context/CalciteContextFactoryTest.java | 6 +-
.../schema/CalciteLogicSchemaFactoryTest.java | 2 +-
...he.shardingsphere.infra.parser.hook.ParsingHook | 35 ---
.../rewrite/sql/impl/RouteSQLBuilderTest.java | 2 +-
.../driver/common/base/AbstractSQLCalciteTest.java | 20 +-
...ractShardingSphereDataSourceForCalciteTest.java | 18 +-
.../resultset/DatabaseMetaDataResultSetTest.java | 6 +-
.../statement/CalcitePrepareStatementTest.java | 4 +-
.../jdbc/core/statement/CalciteStatementTest.java | 4 +-
.../circuit/statement/CircuitBreakerStatement.java | 7 +-
.../GovernanceShardingSphereDataSourceTest.java | 2 +-
.../additional-spring-configuration-metadata.json | 1 +
.../impl/AlterReplicaQueryRuleBackendHandler.java | 10 +-
.../impl/CreateReplicaQueryRuleBackendHandler.java | 6 +-
.../impl/DropReplicaQueryRuleBackendHandler.java | 5 +-
.../rql/impl/ShardingRuleQueryBackendHandler.java | 2 +-
.../DatabaseCommunicationEngineTest.java | 17 +-
.../proxy/frontend/state/impl/LockProxyState.java | 1 -
.../environmental/ScalingEnvironmentalManager.java | 2 +-
.../client/netty/MySQLCommandPacketDecoder.java | 4 +-
.../visitor/format/impl/MySQLFormatSQLVisitor.java | 5 +-
.../src/main/antlr4/imports/postgresql/BaseRule.g4 | 28 +-
.../main/antlr4/imports/postgresql/DMLStatement.g4 | 310 ++++++++++-----------
.../antlr4/imports/postgresql/PostgreSQLKeyword.g4 | 32 +--
.../asserts/segment/table/TableAssert.java | 4 +-
.../src/test/resources/env/shadow/databases.xml | 2 +-
.../transaction/core/XATransactionManagerType.java | 2 +-
46 files changed, 310 insertions(+), 352 deletions(-)
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java
index e7e8384..517c11c 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java
@@ -40,6 +40,5 @@ public enum MetricType {
/**
* Histogram metric type.
*/
- HISTOGRAM;
-
+ HISTOGRAM
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockAdviceTargetObject.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockAdviceTargetObject.java
index e782d1e..645764d 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockAdviceTargetObject.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockAdviceTargetObject.java
@@ -22,14 +22,14 @@ import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
public final class MockAdviceTargetObject implements AdviceTargetObject {
private Object object;
-
+
@Override
public Object getAttachment() {
return object;
}
-
+
@Override
public void setAttachment(final Object attachment) {
- this.object = attachment;
+ object = attachment;
}
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockAdviceTargetObject.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockAdviceTargetObject.java
index 7670558..075abb3 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockAdviceTargetObject.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockAdviceTargetObject.java
@@ -30,6 +30,6 @@ public final class MockAdviceTargetObject implements AdviceTargetObject {
@Override
public void setAttachment(final Object attachment) {
- this.object = attachment;
+ object = attachment;
}
}
diff --git a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/binary/bind/PostgreSQLComBindPacket.java b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/binary/bind/PostgreSQLComBindPacket.java
index 5e52f83..c2984b7 100644
--- a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/binary/bind/PostgreSQLComBindPacket.java
+++ b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/binary/bind/PostgreSQLComBindPacket.java
@@ -66,7 +66,7 @@ public final class PostgreSQLComBindPacket extends PostgreSQLCommandPacket {
}
}
- private List<Object> getParameters(final PostgreSQLPacketPayload payload, final List<PostgreSQLBinaryStatementParameterType> parameterTypes) throws SQLException {
+ private List<Object> getParameters(final PostgreSQLPacketPayload payload, final List<PostgreSQLBinaryStatementParameterType> parameterTypes) {
int parameterCount = payload.readInt2();
List<Object> result = new ArrayList<>(parameterCount);
for (int parameterIndex = 0; parameterIndex < parameterCount; parameterIndex++) {
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/HADataSourceRule.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/HADataSourceRule.java
index 556e188..511ded0 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/HADataSourceRule.java
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/HADataSourceRule.java
@@ -59,7 +59,7 @@ public final class HADataSourceRule {
name = config.getName();
dataSourceNames = config.getDataSourceNames();
this.loadBalancer = loadBalancer;
- this.replicaQuery = config.isReplicaQuery();
+ replicaQuery = config.isReplicaQuery();
this.haType = haType;
}
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-provider/shardingsphere-ha-mgr/src/main/java/org/apache/shardingsphere/ha/mgr/MGRHAType.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-provider/shardingsphere-ha-mgr/src/main/java/org/apache/shardingsphere/ha/mgr/MGRHAType.java
index b61654b..420fa9f 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-provider/shardingsphere-ha-mgr/src/main/java/org/apache/shardingsphere/ha/mgr/MGRHAType.java
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-provider/shardingsphere-ha-mgr/src/main/java/org/apache/shardingsphere/ha/mgr/MGRHAType.java
@@ -233,7 +233,7 @@ public final class MGRHAType implements HAType {
}
if (disable) {
ShardingSphereEventBus.getInstance().post(new DataSourceDisabledEvent(schemaName, entry.getKey(), true));
- } else if (!"".equals(url)) {
+ } else if (!url.isEmpty()) {
dataSourceURLs.put(entry.getKey(), url);
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/complex/ComplexKeysShardingAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/complex/ComplexKeysShardingAlgorithm.java
index 55a5665..ea1cdc7 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/complex/ComplexKeysShardingAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/complex/ComplexKeysShardingAlgorithm.java
@@ -31,9 +31,9 @@ public interface ComplexKeysShardingAlgorithm<T extends Comparable<?>> extends S
/**
* Sharding.
*
- * @param availableTargetNames available data sources or tables's names
+ * @param availableTargetNames available data sources or table names
* @param shardingValue sharding value
- * @return sharding results for data sources or tables's names
+ * @return sharding results for data sources or table names
*/
Collection<String> doSharding(Collection<String> availableTargetNames, ComplexKeysShardingValue<T> shardingValue);
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
index 890987d..b7456ab 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
@@ -83,10 +83,7 @@ public abstract class ShardingDMLStatementValidator<T extends SQLStatement> impl
}
}
ShardingConditions shardingConditions = createShardingConditions(sqlStatementContext, parameters, schema, shardingRule);
- if (shardingConditions.getConditions().size() > 1 && !isSameShardingCondition(shardingRule, shardingConditions)) {
- return true;
- }
- return false;
+ return shardingConditions.getConditions().size() > 1 && !isSameShardingCondition(shardingRule, shardingConditions);
}
private boolean isRoutingByHint(final ShardingRule shardingRule, final TableRule tableRule) {
@@ -132,7 +129,7 @@ public abstract class ShardingDMLStatementValidator<T extends SQLStatement> impl
return bindingRule.isPresent() && bindingRule.get().hasLogicTable(shardingValue2.getTableName());
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings("unchecked")
private boolean isSameValue(final ShardingConditionValue shardingConditionValue1, final ShardingConditionValue shardingConditionValue2) {
if (shardingConditionValue1 instanceof ListShardingConditionValue && shardingConditionValue2 instanceof ListShardingConditionValue) {
return SafeNumberOperationUtils.safeCollectionEquals(
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java
index b7f40c9..223d688 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java
@@ -156,7 +156,7 @@ public final class SchemaChangedListener extends PostGovernanceRepositoryEventLi
}
private String getCacheId(final String path) {
- return path.substring(path.lastIndexOf("/") + 1);
+ return path.substring(path.lastIndexOf('/') + 1);
}
private Collection<RuleConfiguration> getRuleConfigurations(final String yamlContent) {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
index 4d6c6d3..0e892bf 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
@@ -174,7 +174,7 @@ public final class RegistryCenter {
}
private boolean checkLock() {
- return checkOrRetry(this.loadAllInstances());
+ return checkOrRetry(loadAllInstances());
}
private boolean checkOrRetry(final Collection<String> instanceIds) {
@@ -194,7 +194,7 @@ public final class RegistryCenter {
private boolean check(final Collection<String> instanceIds) {
for (String each : instanceIds) {
- if (!RegistryCenterNodeStatus.LOCKED.toString().equalsIgnoreCase(this.loadInstanceData(each))) {
+ if (!RegistryCenterNodeStatus.LOCKED.toString().equalsIgnoreCase(loadInstanceData(each))) {
return false;
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/config/MockDataSource.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/config/MockDataSource.java
index 0b913c7..6ef2009 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/config/MockDataSource.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/config/MockDataSource.java
@@ -22,8 +22,6 @@ import lombok.Data;
import javax.sql.DataSource;
import java.io.PrintWriter;
import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
import java.util.List;
import java.util.logging.Logger;
@@ -44,47 +42,47 @@ public final class MockDataSource implements DataSource {
private List<String> connectionInitSqls;
@Override
- public Connection getConnection() throws SQLException {
+ public Connection getConnection() {
return null;
}
@Override
- public Connection getConnection(final String username, final String password) throws SQLException {
+ public Connection getConnection(final String username, final String password) {
return null;
}
@Override
- public <T> T unwrap(final Class<T> iface) throws SQLException {
+ public <T> T unwrap(final Class<T> iface) {
return null;
}
@Override
- public boolean isWrapperFor(final Class<?> iface) throws SQLException {
+ public boolean isWrapperFor(final Class<?> iface) {
return false;
}
@Override
- public PrintWriter getLogWriter() throws SQLException {
+ public PrintWriter getLogWriter() {
return null;
}
@Override
- public void setLogWriter(final PrintWriter out) throws SQLException {
+ public void setLogWriter(final PrintWriter out) {
}
@Override
- public void setLoginTimeout(final int seconds) throws SQLException {
+ public void setLoginTimeout(final int seconds) {
}
@Override
- public int getLoginTimeout() throws SQLException {
+ public int getLoginTimeout() {
return 0;
}
@Override
- public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ public Logger getParentLogger() {
return null;
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/CommonSQLStatementContext.java b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/CommonSQLStatementContext.java
index 8d067fa..0d0726b 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/CommonSQLStatementContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/CommonSQLStatementContext.java
@@ -41,15 +41,15 @@ public class CommonSQLStatementContext<T extends SQLStatement> implements SQLSta
private final T sqlStatement;
private final TablesContext tablesContext;
-
+
private final DatabaseType databaseType;
public CommonSQLStatementContext(final T sqlStatement) {
this.sqlStatement = sqlStatement;
- this.databaseType = initDatabaseType(sqlStatement);
+ databaseType = initDatabaseType(sqlStatement);
tablesContext = new TablesContext(Collections.emptyList());
}
-
+
private DatabaseType initDatabaseType(final SQLStatement sqlStatement) {
DatabaseType databaseType = null;
if (sqlStatement instanceof MySQLStatement) {
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java
index 550c3fa..57d9c66 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java
@@ -114,7 +114,7 @@ public final class MetaDataContextsBuilder {
return result;
}
- private DatabaseType getDatabaseType(final DataSource dataSource) throws SQLException {
+ private DatabaseType getDatabaseType(final DataSource dataSource) {
try (Connection connection = dataSource.getConnection()) {
return DatabaseTypeRegistry.getDatabaseTypeByURL(connection.getMetaData().getURL());
} catch (final SQLException ex) {
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java
index 12ef678..070122a 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java
@@ -57,7 +57,7 @@ public final class StandardMetaDataContexts implements MetaDataContexts {
final ExecutorEngine executorEngine, final Authentication authentication, final ConfigurationProperties props) {
this.metaDataMap = new ConcurrentHashMap<>(metaDataMap);
this.executorEngine = executorEngine;
- this.calciteContextFactory = new CalciteContextFactory(metaDataMap);
+ calciteContextFactory = new CalciteContextFactory(metaDataMap);
this.authentication = AuthenticationEngine.findSPIAuthentication().orElse(authentication);
this.props = props;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.sharding.route.time.org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.datetime.database.spi.Databas [...]
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.sharding.route.time.org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry
rename to shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/CalciteContextFactory.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/CalciteContextFactory.java
index f0bdab8..61fe577 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/CalciteContextFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/CalciteContextFactory.java
@@ -96,41 +96,41 @@ public final class CalciteContextFactory {
private void initProperties(final DatabaseType databaseType) {
// TODO Logic could be improved.
if (databaseType instanceof MySQLDatabaseType || databaseType == null) {
- this.properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
- this.properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.MYSQL_5.name());
+ properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
+ properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.MYSQL_5.name());
return;
}
if (databaseType instanceof H2DatabaseType) {
// TODO No suitable type of Lex
- this.properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
- this.properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.DEFAULT.name());
+ properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
+ properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.DEFAULT.name());
return;
}
if (databaseType instanceof MariaDBDatabaseType) {
- this.properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
- this.properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.MYSQL_5.name());
+ properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
+ properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.MYSQL_5.name());
return;
}
if (databaseType instanceof OracleDatabaseType) {
- this.properties.setProperty(LEX_CAMEL_NAME, Lex.ORACLE.name());
- this.properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.ORACLE_12.name());
+ properties.setProperty(LEX_CAMEL_NAME, Lex.ORACLE.name());
+ properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.ORACLE_12.name());
return;
}
if (databaseType instanceof PostgreSQLDatabaseType) {
// TODO No suitable type of Lex and conformance
- this.properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
- this.properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.DEFAULT.name());
+ properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
+ properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.DEFAULT.name());
return;
}
if (databaseType instanceof SQL92DatabaseType) {
// TODO No suitable type of Lex
- this.properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
- this.properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.STRICT_92.name());
+ properties.setProperty(LEX_CAMEL_NAME, Lex.MYSQL.name());
+ properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.STRICT_92.name());
return;
}
if (databaseType instanceof SQLServerDatabaseType) {
- this.properties.setProperty(LEX_CAMEL_NAME, Lex.SQL_SERVER.name());
- this.properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.SQL_SERVER_2008.name());
+ properties.setProperty(LEX_CAMEL_NAME, Lex.SQL_SERVER.name());
+ properties.setProperty(CONFORMANCE_CAMEL_NAME, SqlConformanceEnum.SQL_SERVER_2008.name());
return;
}
throw new ShardingSphereException("No matching DatabaseType found");
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/execute/raw/CalciteRawExecutor.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/execute/raw/CalciteRawExecutor.java
index c749bc4..da472a4 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/execute/raw/CalciteRawExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/execute/raw/CalciteRawExecutor.java
@@ -35,7 +35,6 @@ import org.apache.shardingsphere.infra.optimize.execute.CalciteExecutor;
import org.apache.shardingsphere.infra.optimize.execute.raw.context.CalciteDataContext;
import java.sql.ResultSet;
-import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
@@ -48,18 +47,18 @@ public final class CalciteRawExecutor implements CalciteExecutor {
private final CalciteContext context;
@Override
- public List<QueryResult> executeQuery(final String sql, final List<Object> parameters) throws SQLException {
+ public List<QueryResult> executeQuery(final String sql, final List<Object> parameters) {
// TODO
return Collections.emptyList();
}
@Override
- public void close() throws SQLException {
+ public void close() {
// TODO
}
@Override
- public ResultSet getResultSet() throws SQLException {
+ public ResultSet getResultSet() {
return null;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactory.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactory.java
index 0d9f8f2..93f80ea 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactory.java
@@ -27,14 +27,13 @@ import java.sql.SQLException;
import java.util.Map;
import java.util.Map.Entry;
-
/**
* Calcite logic schema factory.
*/
public final class CalciteLogicSchemaFactory {
-
+
private final Map<String, CalciteLogicSchemaGenerator> schemas = new LinkedMap<>();
-
+
public CalciteLogicSchemaFactory(final Map<String, ShardingSphereMetaData> metaDataMap) {
for (Entry<String, ShardingSphereMetaData> each : metaDataMap.entrySet()) {
try {
@@ -44,7 +43,7 @@ public final class CalciteLogicSchemaFactory {
}
}
}
-
+
/**
* Create schema.
*
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/table/execute/CalciteExecutionContextGenerator.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/table/execute/CalciteExecutionContextGenerator.java
index 5a4beb1..2100bbe 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/table/execute/CalciteExecutionContextGenerator.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/table/execute/CalciteExecutionContextGenerator.java
@@ -72,18 +72,23 @@ public final class CalciteExecutionContextGenerator {
}
private Collection<RouteUnit> getRouteUnits(final RouteContext routeContext) {
- Collection<RouteUnit> result = new LinkedHashSet<>();
+ Collection<RouteUnit> result = new LinkedHashSet<>(routeContext.getRouteUnits().size(), 1);
for (RouteUnit each : routeContext.getRouteUnits()) {
- RouteUnit routeUnit = new RouteUnit(each.getDataSourceMapper(), new LinkedHashSet<>());
- for (RouteMapper mapper : each.getTableMappers()) {
- if (mapper.getLogicName().equals(table)) {
- routeUnit.getTableMappers().add(mapper);
- }
- }
+ RouteUnit routeUnit = getRouteUnit(each);
if (!routeUnit.getTableMappers().isEmpty()) {
result.add(routeUnit);
}
}
return result;
}
+
+ private RouteUnit getRouteUnit(final RouteUnit routeUnit) {
+ RouteUnit result = new RouteUnit(routeUnit.getDataSourceMapper(), new LinkedHashSet<>(routeUnit.getTableMappers().size(), 1));
+ for (RouteMapper each : routeUnit.getTableMappers()) {
+ if (each.getLogicName().equals(table)) {
+ result.getTableMappers().add(each);
+ }
+ }
+ return result;
+ }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/context/CalciteContextFactoryTest.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/context/CalciteContextFactoryTest.java
index e78d940..3401085 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/context/CalciteContextFactoryTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/context/CalciteContextFactoryTest.java
@@ -38,17 +38,17 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
public final class CalciteContextFactoryTest {
-
+
@Test
public void assertCreate() {
ShardingSphereResource shardingSphereResource = new ShardingSphereResource(null, null, null, new H2DatabaseType());
ShardingSphereSchema schema = new ShardingSphereSchema();
schema.put("tab_user", mock(TableMetaData.class));
- ShardingSphereRuleMetaData metaData = new ShardingSphereRuleMetaData(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+ ShardingSphereRuleMetaData metaData = new ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList());
ShardingSphereMetaData shardingSphereMetaData = new ShardingSphereMetaData("logic_db", shardingSphereResource, metaData, schema);
CalciteContextFactory calciteContextFactory = new CalciteContextFactory(Collections.singletonMap("logic_db", shardingSphereMetaData));
assertNotNull(calciteContextFactory);
- CalciteContext logicDb = calciteContextFactory.create("logic_db", new CalciteRowExecutor(Collections.EMPTY_LIST, 0, null, mock(JDBCExecutor.class), mock(ExecutionContext.class), null));
+ CalciteContext logicDb = calciteContextFactory.create("logic_db", new CalciteRowExecutor(Collections.emptyList(), 0, null, mock(JDBCExecutor.class), mock(ExecutionContext.class), null));
assertNotNull(logicDb);
Properties properties = logicDb.getConnectionProperties();
assertNotNull(properties);
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactoryTest.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactoryTest.java
index 60d9540..1370bd5 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactoryTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactoryTest.java
@@ -40,7 +40,7 @@ public final class CalciteLogicSchemaFactoryTest {
CalciteLogicSchemaFactory calciteLogicSchemaFactory = new CalciteLogicSchemaFactory(metaDataMap);
JDBCExecutor jdbcExecutor = mock(JDBCExecutor.class);
ExecutionContext executionContext = mock(ExecutionContext.class);
- CalciteRowExecutor calciteRowExecutor = new CalciteRowExecutor(Collections.EMPTY_LIST, 0, null, jdbcExecutor, executionContext, null);
+ CalciteRowExecutor calciteRowExecutor = new CalciteRowExecutor(Collections.emptyList(), 0, null, jdbcExecutor, executionContext, null);
CalciteLogicSchema logicDbExist = calciteLogicSchemaFactory.create("logic_db", calciteRowExecutor);
assertNotNull(logicDbExist);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-parser/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.parser.hook.ParsingHook b/shardingsphere-infra/shardingsphere-infra-parser/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.parser.hook.ParsingHook
deleted file mode 100644
index 37ed2b0..0000000
--- a/shardingsphere-infra/shardingsphere-infra-parser/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.parser.hook.ParsingHook
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.infra.parser.hook.fixture.ParsingHookFixture
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java b/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java
index 517d4bf..f6e10ce 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java
@@ -42,7 +42,7 @@ public final class RouteSQLBuilderTest {
}
@Test
- public void assertToSQLWithRouteUnitAwaredSQLToken() {
+ public void assertToSQLWithRouteUnitAwareSQLToken() {
SQLRewriteContext context = mock(SQLRewriteContext.class);
when(context.getSql()).thenReturn("SELECT * FROM tbl WHERE id=?");
when(context.getSqlTokens()).thenReturn(Collections.singletonList(new RouteUnitAwareSQLTokenFixture(14, 16)));
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLCalciteTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLCalciteTest.java
index d3062c9..851abcc 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLCalciteTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLCalciteTest.java
@@ -33,29 +33,29 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Objects;
-public class AbstractSQLCalciteTest {
-
+public abstract class AbstractSQLCalciteTest {
+
private static final Map<DatabaseType, Map<String, DataSource>> DATABASE_TYPE_MAP = new HashMap<>();
-
+
private static final String INIT_CALCITE_DATABASE_0 = "jdbc_init_calcite_0.sql";
-
+
private static final String INIT_CALCITE_DATABASE_1 = "jdbc_init_calcite_1.sql";
-
+
@BeforeClass
public static synchronized void initDataSource() {
createDataSources();
}
-
+
private static void createDataSources() {
createDataSources("jdbc_0", DatabaseTypeRegistry.getActualDatabaseType("H2"), INIT_CALCITE_DATABASE_0);
createDataSources("jdbc_1", DatabaseTypeRegistry.getActualDatabaseType("H2"), INIT_CALCITE_DATABASE_1);
}
-
+
private static void createDataSources(final String dbName, final DatabaseType databaseType, final String initSql) {
DATABASE_TYPE_MAP.computeIfAbsent(databaseType, key -> new LinkedHashMap<>()).put(dbName, buildDataSource(dbName, databaseType));
buildSchema(dbName, databaseType, initSql);
}
-
+
private static BasicDataSource buildDataSource(final String dbName, final DatabaseType databaseType) {
DatabaseEnvironment dbEnv = new DatabaseEnvironment(databaseType);
BasicDataSource result = new BasicDataSource();
@@ -66,7 +66,7 @@ public class AbstractSQLCalciteTest {
result.setMaxTotal(50);
return result;
}
-
+
private static void buildSchema(final String dbName, final DatabaseType databaseType, final String initSql) {
try {
Connection conn = DATABASE_TYPE_MAP.get(databaseType).get(dbName).getConnection();
@@ -76,7 +76,7 @@ public class AbstractSQLCalciteTest {
throw new RuntimeException(ex);
}
}
-
+
protected static Map<DatabaseType, Map<String, DataSource>> getDatabaseTypeMap() {
return DATABASE_TYPE_MAP;
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForCalciteTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForCalciteTest.java
index b7c6d36..b61378e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForCalciteTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForCalciteTest.java
@@ -39,13 +39,13 @@ import java.util.Map;
import java.util.Objects;
public class AbstractShardingSphereDataSourceForCalciteTest extends AbstractSQLCalciteTest {
-
+
private static ShardingSphereDataSource dataSource;
-
+
private static final List<String> CALCITE_DB_NAMES = Arrays.asList("jdbc_0", "jdbc_1");
-
+
private static final String CONFIG_CALCITE = "config-calcite.yaml";
-
+
@BeforeClass
public static void initCalciteDataSource() throws SQLException, IOException {
if (null != dataSource) {
@@ -53,11 +53,11 @@ public class AbstractShardingSphereDataSourceForCalciteTest extends AbstractSQLC
}
dataSource = (ShardingSphereDataSource) YamlShardingSphereDataSourceFactory.createDataSource(getDataSourceMap(), getFile(CONFIG_CALCITE));
}
-
+
private static Map<String, DataSource> getDataSourceMap() {
return Maps.filterKeys(getDatabaseTypeMap().values().iterator().next(), CALCITE_DB_NAMES::contains);
}
-
+
@Before
public void initTable() {
try {
@@ -72,16 +72,16 @@ public class AbstractShardingSphereDataSourceForCalciteTest extends AbstractSQLC
throw new RuntimeException(ex);
}
}
-
+
private static File getFile(final String fileName) {
return new File(Preconditions.checkNotNull(
AbstractShardingSphereDataSourceForShardingTest.class.getClassLoader().getResource(fileName), "file resource `%s` must not be null.", fileName).getFile());
}
-
+
protected final ShardingSphereDataSource getShardingSphereDataSource() {
return dataSource;
}
-
+
@AfterClass
public static void clear() throws Exception {
if (null == dataSource) {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSetTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSetTest.java
index 5863d27..e27b17d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSetTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSetTest.java
@@ -77,7 +77,7 @@ public final class DatabaseMetaDataResultSetTest {
private static final BigDecimal BIGDECIMAL = BigDecimal.valueOf(12.22);
- private static final BigDecimal BIGDECIMAL_SCALA_ONE = BigDecimal.valueOf(12.2);
+ private static final BigDecimal BIG_DECIMAL_SCALA_ONE = BigDecimal.valueOf(12.2);
private static final String INDEX_NAME_COLUMN_LABEL = "INDEX_NAME";
@@ -347,13 +347,13 @@ public final class DatabaseMetaDataResultSetTest {
@Test
public void assertGetBigDecimalWithIndexAndScale() throws SQLException {
databaseMetaDataResultSet.next();
- assertThat(databaseMetaDataResultSet.getBigDecimal(8, 1), is(BIGDECIMAL_SCALA_ONE));
+ assertThat(databaseMetaDataResultSet.getBigDecimal(8, 1), is(BIG_DECIMAL_SCALA_ONE));
}
@Test
public void assertGetBigDecimalWithLabelAndScale() throws SQLException {
databaseMetaDataResultSet.next();
- assertThat(databaseMetaDataResultSet.getBigDecimal(BIG_DECIMAL_COLUMN_LABEL, 1), is(BIGDECIMAL_SCALA_ONE));
+ assertThat(databaseMetaDataResultSet.getBigDecimal(BIG_DECIMAL_COLUMN_LABEL, 1), is(BIG_DECIMAL_SCALA_ONE));
}
@Test
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalcitePrepareStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalcitePrepareStatementTest.java
index dd0d3a8..7848efa 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalcitePrepareStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalcitePrepareStatementTest.java
@@ -30,9 +30,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public final class CalcitePrepareStatementTest extends AbstractShardingSphereDataSourceForCalciteTest {
-
+
private static final String SELECT_SQL_BY_ID = "select o.*, i.* from t_order_calcite o, t_order_item_calcite i where o.order_id = ? and i.item_id = ?";
-
+
@Test
public void assertQueryWithCalciteInSingleTables() throws SQLException {
ShardingSpherePreparedStatement preparedStatement = (ShardingSpherePreparedStatement) getShardingSphereDataSource().getConnection().prepareStatement(SELECT_SQL_BY_ID);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalciteStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalciteStatementTest.java
index 0740d9b..119b2a0 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalciteStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalciteStatementTest.java
@@ -30,9 +30,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public final class CalciteStatementTest extends AbstractShardingSphereDataSourceForCalciteTest {
-
+
private static final String SELECT_SQL_BY_ID = "select o.*, i.* from t_order_calcite o, t_order_item_calcite i where o.order_id = 1000 and i.item_id = 100000";
-
+
@Test
public void assertQueryWithCalciteInSingleTables() throws SQLException {
ShardingSphereStatement preparedStatement = (ShardingSphereStatement) getShardingSphereDataSource().getConnection().createStatement();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/statement/CircuitBreakerStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/statement/CircuitBreakerStatement.java
index da65924..18a3620 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/statement/CircuitBreakerStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/statement/CircuitBreakerStatement.java
@@ -18,12 +18,11 @@
package org.apache.shardingsphere.driver.governance.internal.circuit.statement;
import lombok.Getter;
-import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationStatement;
import org.apache.shardingsphere.driver.governance.internal.circuit.connection.CircuitBreakerConnection;
+import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationStatement;
import java.sql.Connection;
import java.sql.ResultSet;
-import java.sql.SQLException;
import java.sql.SQLWarning;
/**
@@ -100,12 +99,12 @@ public final class CircuitBreakerStatement extends AbstractUnsupportedOperationS
}
@Override
- public int getFetchDirection() throws SQLException {
+ public int getFetchDirection() {
return ResultSet.FETCH_FORWARD;
}
@Override
- public void setFetchDirection(final int direction) throws SQLException {
+ public void setFetchDirection(final int direction) {
}
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
index bc2eb95..9c5754b 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
@@ -61,7 +61,7 @@ public final class GovernanceShardingSphereDataSourceTest {
@BeforeClass
public static void setUp() throws SQLException, IOException, URISyntaxException {
- GovernanceShardingSphereDataSourceTest.metaDataContexts = (GovernanceMetaDataContexts) getGovernanceShardingSphereDataSource().getMetaDataContexts();
+ metaDataContexts = (GovernanceMetaDataContexts) getGovernanceShardingSphereDataSource().getMetaDataContexts();
}
private static GovernanceShardingSphereDataSource getGovernanceShardingSphereDataSource() throws IOException, SQLException, URISyntaxException {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 72db793..e048107 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -15,6 +15,7 @@
* limitations under the License.
*/
+
{
"groups": [
{
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterReplicaQueryRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterReplicaQueryRuleBackendHandler.java
index 97a3388..9c175df 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterReplicaQueryRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterReplicaQueryRuleBackendHandler.java
@@ -86,9 +86,9 @@ public final class AlterReplicaQueryRuleBackendHandler extends SchemaRequiredBac
private void checkAddDataSourceExist(final AlterReplicaQueryRuleStatement statement, final String schemaName) {
Optional<ReplicaQueryRuleConfiguration> replicaQueryRuleConfig = ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().stream()
.filter(each -> each instanceof ReplicaQueryRuleConfiguration).map(each -> (ReplicaQueryRuleConfiguration) each).findFirst();
- Set<String> existReplicaQueryDataSourceNames = replicaQueryRuleConfig.get().getDataSources().stream().map(each -> each.getName()).collect(Collectors.toSet());
- Collection<String> addExistReplicaQueryDataSourceNames = statement.getAddReplicaQueryRules().stream().map(each -> each.getName())
- .filter(each -> existReplicaQueryDataSourceNames.contains(each)).collect(Collectors.toList());
+ Set<String> existReplicaQueryDataSourceNames = replicaQueryRuleConfig.get().getDataSources().stream().map(ReplicaQueryDataSourceRuleConfiguration::getName).collect(Collectors.toSet());
+ Collection<String> addExistReplicaQueryDataSourceNames = statement.getAddReplicaQueryRules().stream().map(ReplicaQueryRuleSegment::getName)
+ .filter(existReplicaQueryDataSourceNames::contains).collect(Collectors.toList());
if (!addExistReplicaQueryDataSourceNames.isEmpty()) {
throw new AddReplicaQueryRuleDataSourcesExistedException(addExistReplicaQueryDataSourceNames);
}
@@ -114,8 +114,8 @@ public final class AlterReplicaQueryRuleBackendHandler extends SchemaRequiredBac
private void checkModifyDataSourceNotExist(final AlterReplicaQueryRuleStatement statement, final String schemaName) {
Optional<ReplicaQueryRuleConfiguration> replicaQueryRuleConfig = ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().stream()
.filter(each -> each instanceof ReplicaQueryRuleConfiguration).map(each -> (ReplicaQueryRuleConfiguration) each).findFirst();
- Set<String> existReplicaQueryDataSourceNames = replicaQueryRuleConfig.get().getDataSources().stream().map(each -> each.getName()).collect(Collectors.toSet());
- Collection<String> addExistReplicaQueryDataSourceNames = statement.getModifyReplicaQueryRules().stream().map(each -> each.getName())
+ Set<String> existReplicaQueryDataSourceNames = replicaQueryRuleConfig.get().getDataSources().stream().map(ReplicaQueryDataSourceRuleConfiguration::getName).collect(Collectors.toSet());
+ Collection<String> addExistReplicaQueryDataSourceNames = statement.getModifyReplicaQueryRules().stream().map(ReplicaQueryRuleSegment::getName)
.filter(each -> !existReplicaQueryDataSourceNames.contains(each)).collect(Collectors.toList());
if (!addExistReplicaQueryDataSourceNames.isEmpty()) {
throw new ReplicaQueryRuleDataSourcesNotExistedException(addExistReplicaQueryDataSourceNames);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateReplicaQueryRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateReplicaQueryRuleBackendHandler.java
index 17e055d..617a20c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateReplicaQueryRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateReplicaQueryRuleBackendHandler.java
@@ -39,11 +39,11 @@ import java.util.Collections;
* Create replica query rule backend handler.
*/
public final class CreateReplicaQueryRuleBackendHandler extends SchemaRequiredBackendHandler<CreateReplicaQueryRuleStatement> {
-
+
public CreateReplicaQueryRuleBackendHandler(final CreateReplicaQueryRuleStatement sqlStatement, final BackendConnection backendConnection) {
super(sqlStatement, backendConnection);
}
-
+
@Override
public ResponseHeader execute(final String schemaName, final CreateReplicaQueryRuleStatement sqlStatement) {
check(schemaName);
@@ -54,7 +54,7 @@ public final class CreateReplicaQueryRuleBackendHandler extends SchemaRequiredBa
}
private void check(final String schemaName) {
- if (ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().stream().filter(each -> each instanceof ReplicaQueryRuleConfiguration).findFirst().isPresent()) {
+ if (ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().stream().anyMatch(each -> each instanceof ReplicaQueryRuleConfiguration)) {
throw new ReplicaQueryRuleCreateExistsException();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReplicaQueryRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReplicaQueryRuleBackendHandler.java
index a8dd9d6..c818e91 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReplicaQueryRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReplicaQueryRuleBackendHandler.java
@@ -30,6 +30,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.SchemaRequiredBackendHandler;
import org.apache.shardingsphere.replicaquery.api.config.ReplicaQueryRuleConfiguration;
+import org.apache.shardingsphere.replicaquery.api.config.rule.ReplicaQueryDataSourceRuleConfiguration;
import org.apache.shardingsphere.replicaquery.yaml.config.YamlReplicaQueryRuleConfiguration;
import java.util.Collection;
@@ -61,7 +62,7 @@ public final class DropReplicaQueryRuleBackendHandler extends SchemaRequiredBack
if (!replicaQueryRuleConfig.isPresent()) {
throw new ReplicaQueryRuleNotExistedException();
}
- Collection<String> replicaQueryNames = replicaQueryRuleConfig.get().getDataSources().stream().map(each -> each.getName()).collect(Collectors.toList());
+ Collection<String> replicaQueryNames = replicaQueryRuleConfig.get().getDataSources().stream().map(ReplicaQueryDataSourceRuleConfiguration::getName).collect(Collectors.toList());
Collection<String> notExistedRuleNames = ruleNames.stream().filter(each -> !replicaQueryNames.contains(each)).collect(Collectors.toList());
if (!notExistedRuleNames.isEmpty()) {
throw new ReplicaQueryRuleDataSourcesNotExistedException(notExistedRuleNames);
@@ -77,7 +78,7 @@ public final class DropReplicaQueryRuleBackendHandler extends SchemaRequiredBack
yamlConfig.getDataSources().remove(each);
}
if (yamlConfig.getDataSources().isEmpty()) {
- return new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(Collections.EMPTY_LIST);
+ return new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(Collections.emptyList());
} else {
return new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(Collections.singleton(yamlConfig));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingRuleQueryBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingRuleQueryBackendHandler.java
index a660242..fd015d3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingRuleQueryBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingRuleQueryBackendHandler.java
@@ -86,7 +86,7 @@ public final class ShardingRuleQueryBackendHandler extends SchemaRequiredBackend
Optional<ShardingRuleConfiguration> ruleConfig = ProxyContext.getInstance().getMetaData(schema).getRuleMetaData().getConfigurations()
.stream().map(each -> (ShardingRuleConfiguration) each).findFirst();
if (ruleConfig.isPresent()) {
- List<List<String>> bindingTables = ruleConfig.get().getBindingTableGroups().stream().filter(each -> null != each && !"".equals(each)).map(each -> Arrays.asList(each.split(",")))
+ List<List<String>> bindingTables = ruleConfig.get().getBindingTableGroups().stream().filter(each -> null != each && !each.isEmpty()).map(each -> Arrays.asList(each.split(",")))
.collect(Collectors.toList());
for (ShardingTableRuleConfiguration each : ruleConfig.get().getTables()) {
Map<String, Object> table = new HashMap<>();
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
index da03a46..ec53ce7 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
@@ -54,12 +54,12 @@ import java.util.Optional;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public final class DatabaseCommunicationEngineTest {
@@ -88,15 +88,13 @@ public final class DatabaseCommunicationEngineTest {
DatabaseCommunicationEngineFactory.getInstance().newBinaryProtocolInstance(mock(SQLStatement.class), "schemaName", Collections.emptyList(), backendConnection);
assertNotNull(engine);
assertThat(engine, instanceOf(DatabaseCommunicationEngine.class));
-
Field queryHeadersField = engine.getClass().getDeclaredField("queryHeaders");
FieldSetter.setField(engine, queryHeadersField, Collections.singletonList(QueryHeaderBuilder.build(createQueryResultMetaData(), createMetaData(), 1)));
-
Field mergedResultField = engine.getClass().getDeclaredField("mergedResult");
FieldSetter.setField(engine, mergedResultField, new MemoryMergedResult<ShardingSphereRule>(null, null, null, Collections.emptyList()) {
-
+
private MemoryQueryResultRow memoryQueryResultRow;
-
+
@Override
protected List<MemoryQueryResultRow> init(final ShardingSphereRule rule, final ShardingSphereSchema schema, final SQLStatementContext sqlStatementContext,
final List<QueryResult> queryResults) {
@@ -104,17 +102,16 @@ public final class DatabaseCommunicationEngineTest {
return Collections.singletonList(memoryQueryResultRow);
}
});
-
Exception ex = null;
try {
engine.getQueryResponseRow();
} catch (final SQLException | IndexOutOfBoundsException e) {
ex = e;
} finally {
- assertTrue(ex == null || !(ex instanceof IndexOutOfBoundsException));
+ assertFalse(ex instanceof IndexOutOfBoundsException);
}
}
-
+
private ShardingSphereMetaData createMetaData() {
ShardingSphereMetaData result = mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS);
ColumnMetaData columnMetaData = new ColumnMetaData("order_id", Types.INTEGER, "int", true, false, false);
@@ -130,7 +127,7 @@ public final class DatabaseCommunicationEngineTest {
when(result.getName()).thenReturn("sharding_schema");
return result;
}
-
+
private QueryResultMetaData createQueryResultMetaData() throws SQLException {
QueryResultMetaData result = mock(QueryResultMetaData.class);
when(result.getTableName(1)).thenReturn("t_order");
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/LockProxyState.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/LockProxyState.java
index 99dfba3..1751b51 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/LockProxyState.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/LockProxyState.java
@@ -57,7 +57,6 @@ public final class LockProxyState implements ProxyState {
Long lockTimeoutMilliseconds = ProxyContext.getInstance().getMetaDataContexts().getProps().<Long>getValue(ConfigurationPropertyKey.LOCK_WAIT_TIMEOUT_MILLISECONDS);
if (!LockContext.await(lockTimeoutMilliseconds)) {
doError(context, databaseProtocolFrontendEngine, new LockWaitTimeoutException(lockTimeoutMilliseconds));
- return;
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environmental/ScalingEnvironmentalManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environmental/ScalingEnvironmentalManager.java
index 42bf74f..ef9d272 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environmental/ScalingEnvironmentalManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environmental/ScalingEnvironmentalManager.java
@@ -38,7 +38,7 @@ public final class ScalingEnvironmentalManager {
/**
* Reset target table, Truncate target table.
*
- * @param scalingJob scalingjob
+ * @param scalingJob scaling job
* @throws SQLException SQL exception
*/
public void resetTargetTable(final ScalingJob scalingJob) throws SQLException {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/netty/MySQLCommandPacketDecoder.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/netty/MySQLCommandPacketDecoder.java
index aee911e..3b5e11e 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/netty/MySQLCommandPacketDecoder.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/netty/MySQLCommandPacketDecoder.java
@@ -60,11 +60,11 @@ public final class MySQLCommandPacketDecoder extends ByteToMessageDecoder {
}
private void decodeCommandPacket(final MySQLPacketPayload payload, final List<Object> out) {
- if (States.FieldPacket.equals(currentState)) {
+ if (States.FieldPacket == currentState) {
decodeFieldPacket(payload);
return;
}
- if (States.RowDataPacket.equals(currentState)) {
+ if (States.RowDataPacket == currentState) {
decodeRowDataPacket(payload, out);
return;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
index edb184e..4d91cf7 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
@@ -96,10 +96,10 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
public MySQLFormatSQLVisitor(final Properties props) {
if (null != props) {
if (props.containsKey("upperCase")) {
- setUpperCase(Boolean.valueOf(props.getProperty("upperCase")));
+ setUpperCase(Boolean.parseBoolean(props.getProperty("upperCase")));
}
if (props.containsKey("parameterized")) {
- setParameterized(Boolean.valueOf(props.getProperty("parameterized")));
+ setParameterized(Boolean.parseBoolean(props.getProperty("parameterized")));
}
if (props.containsKey("projectionsCountOfLine")) {
setProjectionsCountOfLine(Integer.valueOf(props.getProperty("projectionsCountOfLine")));
@@ -469,7 +469,6 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
if (i != 0) {
if (child instanceof TerminalNode) {
formatPrintln(",");
- continue;
} else {
child.accept(this);
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4
index 347058f..21e67fe 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4
@@ -787,7 +787,7 @@ explicitRow
implicitRow
: LP_ exprList COMMA_ aExpr RP_
- ;
+ ;
subType
: ANY | SOME | ALL
@@ -976,14 +976,14 @@ typeName
;
simpleTypeName
- : genericType
- | numeric
- | bit
- | character
- | constDatetime
- | constInterval optInterval
- | constInterval LP_ NUMBER_ RP_
- ;
+ : genericType
+ | numeric
+ | bit
+ | character
+ | constDatetime
+ | constInterval optInterval
+ | constInterval LP_ NUMBER_ RP_
+ ;
exprList
: aExpr
@@ -1014,7 +1014,7 @@ typeModifiers
numeric
: INT | INTEGER | SMALLINT | BIGINT| REAL | FLOAT optFloat | DOUBLE PRECISION | DECIMAL typeModifiers? | DEC typeModifiers? | NUMERIC typeModifiers? | BOOLEAN | FLOAT8 | FLOAT4 | INT2 | INT4 | INT8
- ;
+ ;
constDatetime
: TIMESTAMP LP_ NUMBER_ RP_ timezone?
@@ -1048,7 +1048,7 @@ characterClause
| NATIONAL CHARACTER VARYING?
| NATIONAL CHAR VARYING?
| NCHAR VARYING?
- ;
+ ;
optFloat
: LP_ NUMBER_ RP_ |
@@ -1326,14 +1326,14 @@ reloptions
reloptionList
: reloptionElem (COMMA_ reloptionElem)*
- ;
+ ;
reloptionElem
: alias EQ_ defArg
| alias
| alias DOT_ alias EQ_ defArg
| alias DOT_ alias
- ;
+ ;
defArg
: funcType
@@ -1799,7 +1799,7 @@ functionSetResetClause
;
rowSecurityCmd
- : ALL | SELECT | INSERT | UPDATE | DELETE
+ : ALL | SELECT | INSERT | UPDATE | DELETE
;
event
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DMLStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DMLStatement.g4
index 3fc7114..40ac646 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DMLStatement.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DMLStatement.g4
@@ -25,7 +25,7 @@ insert
insertTarget
: qualifiedName | qualifiedName AS colId
- ;
+ ;
insertRest
: select
@@ -37,27 +37,27 @@ insertRest
overrideKind
: USER | SYSTEM
- ;
+ ;
insertColumnList
: insertColumnItem
- | insertColumnList COMMA_ insertColumnItem
- ;
+ | insertColumnList COMMA_ insertColumnItem
+ ;
insertColumnItem
: colId optIndirection
- ;
+ ;
optOnConflict
: ON CONFLICT optConfExpr DO UPDATE SET setClauseList whereClause?
- | ON CONFLICT optConfExpr DO NOTHING
- ;
+ | ON CONFLICT optConfExpr DO NOTHING
+ ;
optConfExpr
: LP_ indexParams RP_ whereClause?
- | ON CONSTRAINT name
- |
- ;
+ | ON CONSTRAINT name
+ |
+ ;
update
: withClause? UPDATE relationExprOptAlias SET setClauseList fromClause? whereOrCurrentClause? returningClause?
@@ -65,26 +65,26 @@ update
setClauseList
: setClause
- | setClauseList COMMA_ setClause
- ;
+ | setClauseList COMMA_ setClause
+ ;
setClause
: setTarget EQ_ aExpr
- | LP_ setTargetList RP_ EQ_ aExpr
- ;
+ | LP_ setTargetList RP_ EQ_ aExpr
+ ;
setTarget
: colId optIndirection
- ;
+ ;
setTargetList
: setTarget
- | setTargetList COMMA_ setTarget
- ;
+ | setTargetList COMMA_ setTarget
+ ;
returningClause
: RETURNING targetList
- ;
+ ;
delete
: withClause? DELETE FROM relationExprOptAlias usingClause? whereOrCurrentClause? returningClause?
@@ -92,13 +92,13 @@ delete
relationExprOptAlias
: relationExpr
- | relationExpr colId
- | relationExpr AS colId
- ;
+ | relationExpr colId
+ | relationExpr AS colId
+ ;
usingClause
: USING fromList
- ;
+ ;
select
: selectNoParens | selectWithParens
@@ -106,18 +106,18 @@ select
selectWithParens
: LP_ selectNoParens RP_ | LP_ selectWithParens RP_
- ;
+ ;
selectNoParens
: selectClauseN
| selectClauseN sortClause
- | selectClauseN sortClause? forLockingClause selectLimit?
- | selectClauseN sortClause? selectLimit forLockingClause?
- | withClause selectClauseN
- | withClause selectClauseN sortClause
- | withClause selectClauseN sortClause? forLockingClause selectLimit?
- | withClause selectClauseN sortClause? selectLimit forLockingClause?
- ;
+ | selectClauseN sortClause? forLockingClause selectLimit?
+ | selectClauseN sortClause? selectLimit forLockingClause?
+ | withClause selectClauseN
+ | withClause selectClauseN sortClause
+ | withClause selectClauseN sortClause? forLockingClause selectLimit?
+ | withClause selectClauseN sortClause? selectLimit forLockingClause?
+ ;
selectClauseN
: simpleSelect
@@ -125,243 +125,243 @@ selectClauseN
| selectClauseN UNION allOrDistinct? selectClauseN
| selectClauseN INTERSECT allOrDistinct? selectClauseN
| selectClauseN EXCEPT allOrDistinct? selectClauseN
- ;
+ ;
simpleSelect
: SELECT ALL? targetList? intoClause? fromClause? whereClause? groupClause? havingClause? windowClause?
- | SELECT distinctClause targetList intoClause? fromClause? whereClause? groupClause? havingClause? windowClause?
- | valuesClause
- | TABLE relationExpr
- ;
+ | SELECT distinctClause targetList intoClause? fromClause? whereClause? groupClause? havingClause? windowClause?
+ | valuesClause
+ | TABLE relationExpr
+ ;
withClause
: WITH cteList
- | WITH RECURSIVE cteList
- ;
+ | WITH RECURSIVE cteList
+ ;
intoClause
: INTO optTempTableName
- ;
+ ;
optTempTableName
: TEMPORARY TABLE? qualifiedName
- | TEMP TABLE? qualifiedName
- | LOCAL TEMPORARY TABLE? qualifiedName
- | LOCAL TEMP TABLE? qualifiedName
- | GLOBAL TEMPORARY TABLE? qualifiedName
- | GLOBAL TEMP TABLE? qualifiedName
- | UNLOGGED TABLE? qualifiedName
- | TABLE? qualifiedName
- | qualifiedName
- ;
+ | TEMP TABLE? qualifiedName
+ | LOCAL TEMPORARY TABLE? qualifiedName
+ | LOCAL TEMP TABLE? qualifiedName
+ | GLOBAL TEMPORARY TABLE? qualifiedName
+ | GLOBAL TEMP TABLE? qualifiedName
+ | UNLOGGED TABLE? qualifiedName
+ | TABLE? qualifiedName
+ | qualifiedName
+ ;
cteList
: commonTableExpr
- | cteList COMMA_ commonTableExpr
- ;
+ | cteList COMMA_ commonTableExpr
+ ;
commonTableExpr
: name optNameList AS optMaterialized LP_ preparableStmt RP_
- ;
+ ;
optMaterialized
: MATERIALIZED | NOT MATERIALIZED |
- ;
+ ;
optNameList
:LP_ nameList RP_ |
- ;
+ ;
preparableStmt
: select
- | insert
- | update
- | delete
- ;
+ | insert
+ | update
+ | delete
+ ;
forLockingClause
: forLockingItems | FOR READ ONLY
- ;
+ ;
forLockingItems
: forLockingItem
- | forLockingItems forLockingItem
- ;
+ | forLockingItems forLockingItem
+ ;
forLockingItem
: forLockingStrength lockedRelsList? nowaitOrSkip?
- ;
+ ;
nowaitOrSkip
: NOWAIT
- | 'skip' LOCKED
- ;
+ | 'skip' LOCKED
+ ;
forLockingStrength
: FOR UPDATE
- | FOR NO KEY UPDATE
- | FOR SHARE
- | FOR KEY SHARE
- ;
+ | FOR NO KEY UPDATE
+ | FOR SHARE
+ | FOR KEY SHARE
+ ;
lockedRelsList
: OF qualifiedNameList
- ;
+ ;
qualifiedNameList
: qualifiedName
- | qualifiedNameList COMMA_ qualifiedName
- ;
+ | qualifiedNameList COMMA_ qualifiedName
+ ;
qualifiedName
: colId | colId indirection
- ;
+ ;
selectLimit
: limitClause offsetClause
- | offsetClause limitClause
- | limitClause
- | offsetClause
- ;
+ | offsetClause limitClause
+ | limitClause
+ | offsetClause
+ ;
valuesClause
: VALUES LP_ exprList RP_
- | valuesClause COMMA_ LP_ exprList RP_
- ;
+ | valuesClause COMMA_ LP_ exprList RP_
+ ;
limitClause
: LIMIT selectLimitValue
- | LIMIT selectLimitValue COMMA_ selectOffsetValue
- | FETCH firstOrNext selectFetchFirstValue rowOrRows ONLY
- | FETCH firstOrNext selectFetchFirstValue rowOrRows WITH TIES
- | FETCH firstOrNext rowOrRows ONLY
- | FETCH firstOrNext rowOrRows WITH TIES
- ;
+ | LIMIT selectLimitValue COMMA_ selectOffsetValue
+ | FETCH firstOrNext selectFetchFirstValue rowOrRows ONLY
+ | FETCH firstOrNext selectFetchFirstValue rowOrRows WITH TIES
+ | FETCH firstOrNext rowOrRows ONLY
+ | FETCH firstOrNext rowOrRows WITH TIES
+ ;
offsetClause
: OFFSET selectOffsetValue
- | OFFSET selectFetchFirstValue rowOrRows
- ;
+ | OFFSET selectFetchFirstValue rowOrRows
+ ;
selectLimitValue
: aExpr
- | ALL
- ;
+ | ALL
+ ;
selectOffsetValue
: aExpr
- ;
+ ;
selectFetchFirstValue
: cExpr
- | PLUS_ NUMBER_
- | MINUS_ NUMBER_
- ;
+ | PLUS_ NUMBER_
+ | MINUS_ NUMBER_
+ ;
rowOrRows
: ROW | ROWS
- ;
+ ;
firstOrNext
: FIRST | NEXT
- ;
+ ;
targetList
: targetEl
- | targetList COMMA_ targetEl
- ;
+ | targetList COMMA_ targetEl
+ ;
targetEl
: colId DOT_ASTERISK_
| aExpr AS identifier
- | aExpr identifier
- | aExpr
- | ASTERISK_
- ;
+ | aExpr identifier
+ | aExpr
+ | ASTERISK_
+ ;
groupClause
: GROUP BY groupByList
- ;
+ ;
groupByList
: groupByItem (COMMA_ groupByItem)*
- ;
+ ;
groupByItem
: aExpr
- | emptyGroupingSet
- | cubeClause
- | rollupClause
- | groupingSetsClause
- ;
+ | emptyGroupingSet
+ | cubeClause
+ | rollupClause
+ | groupingSetsClause
+ ;
emptyGroupingSet
: LP_ RP_
- ;
+ ;
rollupClause
: ROLLUP LP_ exprList RP_
- ;
+ ;
cubeClause
: CUBE LP_ exprList RP_
- ;
+ ;
groupingSetsClause
: GROUPING SETS LP_ groupByList RP_
- ;
+ ;
windowClause
: WINDOW windowDefinitionList
- ;
+ ;
windowDefinitionList
: windowDefinition
- | windowDefinitionList COMMA_ windowDefinition
- ;
+ | windowDefinitionList COMMA_ windowDefinition
+ ;
windowDefinition
: colId AS windowSpecification
- ;
+ ;
windowSpecification
: LP_ existingWindowName? partitionClause? sortClause? frameClause? RP_
- ;
+ ;
existingWindowName
: colId
- ;
+ ;
partitionClause
: PARTITION BY exprList
- ;
+ ;
frameClause
: RANGE frameExtent optWindowExclusionClause
- | ROWS frameExtent optWindowExclusionClause
- | GROUPS frameExtent optWindowExclusionClause
- ;
+ | ROWS frameExtent optWindowExclusionClause
+ | GROUPS frameExtent optWindowExclusionClause
+ ;
frameExtent
: frameBound
- | BETWEEN frameBound AND frameBound
- ;
+ | BETWEEN frameBound AND frameBound
+ ;
frameBound
: UNBOUNDED PRECEDING
- | UNBOUNDED FOLLOWING
- | CURRENT ROW
- | aExpr PRECEDING
- | aExpr FOLLOWING
- ;
+ | UNBOUNDED FOLLOWING
+ | CURRENT ROW
+ | aExpr PRECEDING
+ | aExpr FOLLOWING
+ ;
optWindowExclusionClause
: EXCLUDE CURRENT ROW
- | EXCLUDE GROUP
- | EXCLUDE TIES
- | EXCLUDE NO OTHERS
- |
- ;
+ | EXCLUDE GROUP
+ | EXCLUDE TIES
+ | EXCLUDE NO OTHERS
+ |
+ ;
alias
: identifier | STRING_
@@ -377,40 +377,40 @@ fromList
tableReference
: relationExpr aliasClause?
- | relationExpr aliasClause? tablesampleClause
- | functionTable funcAliasClause?
- | LATERAL functionTable funcAliasClause?
- | xmlTable aliasClause?
- | LATERAL xmlTable aliasClause?
- | selectWithParens aliasClause?
- | LATERAL selectWithParens aliasClause?
- | tableReference joinedTable
- | LP_ tableReference joinedTable RP_ aliasClause?
- ;
+ | relationExpr aliasClause? tablesampleClause
+ | functionTable funcAliasClause?
+ | LATERAL functionTable funcAliasClause?
+ | xmlTable aliasClause?
+ | LATERAL xmlTable aliasClause?
+ | selectWithParens aliasClause?
+ | LATERAL selectWithParens aliasClause?
+ | tableReference joinedTable
+ | LP_ tableReference joinedTable RP_ aliasClause?
+ ;
joinedTable
: CROSS JOIN tableReference
- | joinType JOIN tableReference joinQual
- | JOIN tableReference joinQual
- | NATURAL joinType JOIN tableReference
- | NATURAL JOIN tableReference
- ;
+ | joinType JOIN tableReference joinQual
+ | JOIN tableReference joinQual
+ | NATURAL joinType JOIN tableReference
+ | NATURAL JOIN tableReference
+ ;
joinType
: FULL joinOuter?
- | LEFT joinOuter?
- | RIGHT joinOuter?
- | INNER
- ;
+ | LEFT joinOuter?
+ | RIGHT joinOuter?
+ | INNER
+ ;
joinOuter
: OUTER
- ;
+ ;
joinQual
: USING LP_ nameList RP_
- | ON aExpr
- ;
+ | ON aExpr
+ ;
relationExpr
@@ -426,8 +426,8 @@ whereClause
whereOrCurrentClause
: whereClause
- | WHERE CURRENT OF cursorName
- ;
+ | WHERE CURRENT OF cursorName
+ ;
havingClause
: HAVING aExpr
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/PostgreSQLKeyword.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/PostgreSQLKeyword.g4
index 4660de4..1cfeeb9 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/PostgreSQLKeyword.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/PostgreSQLKeyword.g4
@@ -648,36 +648,36 @@ OVERLAY
;
XMLCONCAT
- : X M L C O N C A T
- ;
+ : X M L C O N C A T
+ ;
XMLELEMENT
- : X M L E L E M E N T
- ;
+ : X M L E L E M E N T
+ ;
XMLEXISTS
- : X M L E X I S T S
- ;
+ : X M L E X I S T S
+ ;
XMLFOREST
- : X M L F O R E S T
- ;
+ : X M L F O R E S T
+ ;
XMLPARSE
- : X M L P A R S E
- ;
+ : X M L P A R S E
+ ;
XMLPI
- : X M L P I
- ;
+ : X M L P I
+ ;
XMLROOT
- : X M L R O O T
- ;
+ : X M L R O O T
+ ;
XMLSERIALIZE
- : X M L S E R I A L I Z E
- ;
+ : X M L S E R I A L I Z E
+ ;
TREAT
: T R E A T
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/table/TableAssert.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/table/TableAssert.java
index 3c50753..2f47aaf 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/table/TableAssert.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/table/TableAssert.java
@@ -109,8 +109,8 @@ public final class TableAssert {
* @param expected expected ExpectedJoinTable
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final JoinTableSegment actual, final ExpectedJoinTable expected) {
- TableAssert.assertIs(assertContext, actual.getLeft(), expected.getLeft());
- TableAssert.assertIs(assertContext, actual.getRight(), expected.getRight());
+ assertIs(assertContext, actual.getLeft(), expected.getLeft());
+ assertIs(assertContext, actual.getRight(), expected.getRight());
ExpressionAssert.assertExpression(assertContext, actual.getCondition(), expected.getOnCondition());
assertThat(assertContext.getText("Column size assertion error: "),
actual.getUsing() != null ? actual.getUsing().size() : 0, is(expected.getUsingColumns().size()));
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/shadow/databases.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/shadow/databases.xml
index b443dba..05d06cf 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/shadow/databases.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/shadow/databases.xml
@@ -19,4 +19,4 @@
<databases>
<database>db</database>
<database>shadow_db</database>
-</databases>
\ No newline at end of file
+</databases>
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/XATransactionManagerType.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/XATransactionManagerType.java
index c2b0925..d1ae780 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/XATransactionManagerType.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/XATransactionManagerType.java
@@ -46,6 +46,6 @@ public enum XATransactionManagerType {
* @return value from transaction manager type
*/
public static XATransactionManagerType valueFrom(final String type) {
- return Arrays.stream(values()).filter(each -> each.type.equalsIgnoreCase(type)).findFirst().orElse(XATransactionManagerType.ATOMIKOS);
+ return Arrays.stream(values()).filter(each -> each.type.equalsIgnoreCase(type)).findFirst().orElse(ATOMIKOS);
}
}