You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/09/05 14:14:28 UTC
[shardingsphere] branch master updated: Minor refactoring (#7257)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 750e20d Minor refactoring (#7257)
750e20d is described below
commit 750e20d125444cb689ab409105d327669903737b
Author: kimmking <ki...@163.com>
AuthorDate: Sat Sep 5 22:14:10 2020 +0800
Minor refactoring (#7257)
* minor refactoring
* add log
* add blank
* remove unuse codes
* remove log
* remove blank line
* rename Sharding-Scaling to ShardingSphere-Scaling
---
.../infra/context/SchemaContextsBuilder.java | 6 +++---
.../jdbc/core/datasource/ShardingSphereDataSource.java | 12 ------------
.../AbstractUnsupportedOperationDataSource.java | 14 ++++++++++++++
.../datasource/GovernanceShardingSphereDataSource.java | 12 ------------
.../java/org/apache/shardingsphere/scaling/Bootstrap.java | 6 +++---
.../shardingsphere/scaling/core/config/ScalingContext.java | 8 ++++----
6 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/SchemaContextsBuilder.java b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/SchemaContextsBuilder.java
index d2e4512..1b71ae5 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/SchemaContextsBuilder.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/SchemaContextsBuilder.java
@@ -116,15 +116,15 @@ public final class SchemaContextsBuilder {
Map<String, DataSource> dataSources = this.dataSources.get(schemaName);
Collection<RuleConfiguration> ruleConfigs = this.ruleConfigs.get(schemaName);
Collection<ShardingSphereRule> rules = ShardingSphereRulesBuilder.build(ruleConfigs, dataSources.keySet());
- return new ShardingSphereSchema(ruleConfigs, rules, dataSources, createMetaData(dataSources, rules));
+ return new ShardingSphereSchema(ruleConfigs, rules, dataSources, createMetaData(schemaName, dataSources, rules));
}
- private ShardingSphereMetaData createMetaData(final Map<String, DataSource> dataSourceMap, final Collection<ShardingSphereRule> rules) throws SQLException {
+ private ShardingSphereMetaData createMetaData(final String schemaName, final Map<String, DataSource> dataSourceMap, final Collection<ShardingSphereRule> rules) throws SQLException {
long start = System.currentTimeMillis();
DataSourceMetas dataSourceMetas = new DataSourceMetas(databaseType, getDatabaseAccessConfigurationMap(dataSourceMap));
RuleSchemaMetaData ruleSchemaMetaData = new RuleSchemaMetaDataLoader(rules).load(databaseType, dataSourceMap, props, executorKernel.getExecutorService().getExecutorService());
ShardingSphereMetaData result = new ShardingSphereMetaData(dataSourceMetas, ruleSchemaMetaData);
- log.info("Load meta data finished, cost {} milliseconds.", System.currentTimeMillis() - start);
+ log.info("Load meta data for schema {} finished, cost {} milliseconds.", schemaName, System.currentTimeMillis() - start);
return result;
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
index 27f4def..0ac2499 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.driver.jdbc.core.datasource;
import com.google.common.base.Preconditions;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.Setter;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationDataSource;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
@@ -35,7 +34,6 @@ import org.apache.shardingsphere.transaction.context.impl.StandardTransactionCon
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
import javax.sql.DataSource;
-import java.io.PrintWriter;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.SQLException;
@@ -43,7 +41,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;
-import java.util.logging.Logger;
/**
* ShardingSphere data source.
@@ -56,10 +53,6 @@ public final class ShardingSphereDataSource extends AbstractUnsupportedOperation
private final TransactionContexts transactionContexts;
- @SuppressWarnings("UseOfSystemOutOrSystemErr")
- @Setter
- private PrintWriter logWriter = new PrintWriter(System.out);
-
public ShardingSphereDataSource(final Map<String, DataSource> dataSourceMap, final Collection<RuleConfiguration> configurations, final Properties props) throws SQLException {
DatabaseType databaseType = createDatabaseType(dataSourceMap);
schemaContexts = new SchemaContextsBuilder(
@@ -93,11 +86,6 @@ public final class ShardingSphereDataSource extends AbstractUnsupportedOperation
}
@Override
- public Logger getParentLogger() {
- return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
- }
-
- @Override
public ShardingSphereConnection getConnection() {
return new ShardingSphereConnection(getDataSourceMap(), schemaContexts, transactionContexts, TransactionTypeHolder.get());
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java
index 869b0d1..9d7e5d2 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java
@@ -17,17 +17,26 @@
package org.apache.shardingsphere.driver.jdbc.unsupported;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.driver.jdbc.adapter.WrapperAdapter;
import javax.sql.DataSource;
+import java.io.PrintWriter;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
/**
* Unsupported {@code Datasource} methods.
*/
public abstract class AbstractUnsupportedOperationDataSource extends WrapperAdapter implements DataSource {
+ @SuppressWarnings("UseOfSystemOutOrSystemErr")
+ @Setter
+ @Getter
+ private PrintWriter logWriter = new PrintWriter(System.out);
+
@Override
public final int getLoginTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("unsupported getLoginTimeout()");
@@ -37,4 +46,9 @@ public abstract class AbstractUnsupportedOperationDataSource extends WrapperAdap
public final void setLoginTimeout(final int seconds) throws SQLException {
throw new SQLFeatureNotSupportedException("unsupported setLoginTimeout(int seconds)");
}
+
+ @Override
+ public Logger getParentLogger() {
+ return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+ }
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
index 94a9efd..88dbd43 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.driver.governance.internal.datasource;
import com.google.common.base.Preconditions;
import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.driver.governance.internal.circuit.datasource.CircuitBreakerDataSource;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationDataSource;
@@ -42,7 +41,6 @@ import org.apache.shardingsphere.transaction.context.impl.StandardTransactionCon
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
import javax.sql.DataSource;
-import java.io.PrintWriter;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.SQLException;
@@ -50,7 +48,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;
-import java.util.logging.Logger;
/**
* Governance ShardingSphere data source.
@@ -62,10 +59,6 @@ public final class GovernanceShardingSphereDataSource extends AbstractUnsupporte
private final TransactionContexts transactionContexts;
- @SuppressWarnings("UseOfSystemOutOrSystemErr")
- @Setter
- private PrintWriter logWriter = new PrintWriter(System.out);
-
public GovernanceShardingSphereDataSource(final GovernanceConfiguration governanceConfig) throws SQLException {
GovernanceFacade governanceFacade = createGovernanceFacade(governanceConfig);
schemaContexts = new GovernanceSchemaContexts(createSchemaContexts(governanceFacade), governanceFacade);
@@ -145,11 +138,6 @@ public final class GovernanceShardingSphereDataSource extends AbstractUnsupporte
}
@Override
- public Logger getParentLogger() {
- return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
- }
-
- @Override
public void close() throws Exception {
getDataSourceMap().forEach((key, value) -> close(value));
schemaContexts.close();
diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/Bootstrap.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/Bootstrap.java
index 187ab9e..509824e 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/Bootstrap.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/Bootstrap.java
@@ -39,7 +39,7 @@ import java.io.File;
import java.io.IOException;
/**
- * Bootstrap of ShardingScaling.
+ * Bootstrap of ShardingSphere-Scaling.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
@@ -58,7 +58,7 @@ public final class Bootstrap {
*/
public static void main(final String[] args) throws IOException, InterruptedException {
initServerConfig();
- log.info("ShardingScaling Startup");
+ log.info("ShardingSphere-Scaling Startup");
EventLoopGroup bossGroup = new NioEventLoopGroup(1);
EventLoopGroup workerGroup = new NioEventLoopGroup();
try {
@@ -70,7 +70,7 @@ public final class Bootstrap {
.childHandler(new HttpServerInitializer());
int port = ScalingContext.getInstance().getServerConfiguration().getPort();
Channel channel = bootstrap.bind(port).sync().channel();
- log.info("ShardingScaling is server on http://127.0.0.1:" + port + '/');
+ log.info("ShardingSphere-Scaling is server on http://127.0.0.1:{}/", port);
channel.closeFuture().sync();
} finally {
bossGroup.shutdownGracefully();
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ScalingContext.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ScalingContext.java
index eff5081..f9ba284 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ScalingContext.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ScalingContext.java
@@ -24,7 +24,7 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
/**
- * Scaling context.
+ * ShardingSphere-Scaling context.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Getter
@@ -39,16 +39,16 @@ public final class ScalingContext {
private ShardingScalingExecuteEngine importerExecuteEngine;
/**
- * Get instance of Sharding-Scaling's context.
+ * Get instance of ShardingSphere-Scaling's context.
*
- * @return instance of Sharding-Scaling's context.
+ * @return instance of ShardingSphere-Scaling's context.
*/
public static ScalingContext getInstance() {
return INSTANCE;
}
/**
- * Initialize Scaling context.
+ * Initialize ShardingSphere-Scaling context.
*
* @param serverConfiguration serverConfiguration
*/