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 2020/12/21 14:05:31 UTC
[shardingsphere] branch master updated: Minor changes (#8707)
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 bf74c0b Minor changes (#8707)
bf74c0b is described below
commit bf74c0bd4c0e966fb3c06dc1552626aa5ea620de
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Dec 21 22:05:00 2020 +0800
Minor changes (#8707)
* Move sequence of AgentPluginLoader.getInstance
* Adjust methods sequence of AgentPluginLoader
* Refactor TextProtocolBackendHandlerFactory
* For code format
* Refactor RemoveTokenGenerator
* Refactor SingleTableRoutingEngine
---
.../route/engine/type/single/SingleTableRoutingEngine.java | 10 +++++-----
.../sql/token/generator/generic/RemoveTokenGenerator.java | 2 +-
.../proxy/backend/text/TextProtocolBackendHandlerFactory.java | 8 ++++----
.../sql/dialect/statement/mysql/dml/MySQLCallStatement.java | 4 ++--
.../sql/dialect/statement/mysql/dml/MySQLInsertStatement.java | 8 ++++----
.../sql/dialect/statement/mysql/dml/MySQLSelectStatement.java | 6 +++---
.../sql/dialect/statement/mysql/dml/MySQLUpdateStatement.java | 6 +++---
7 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/single/SingleTableRoutingEngine.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/single/SingleTableRoutingEngine.java
index 9c6a644..8ff8178 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/single/SingleTableRoutingEngine.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/single/SingleTableRoutingEngine.java
@@ -54,6 +54,11 @@ public final class SingleTableRoutingEngine implements ShardingRouteEngine {
routeContext.getRouteUnits().add(new RouteUnit(new RouteMapper(dataSourceName.get(), dataSourceName.get()), routingTables));
}
+ private Optional<String> getRandomDataSourceName(final Collection<String> dataSourceNames) {
+ String dataSourceName = Lists.newArrayList(dataSourceNames).get(ThreadLocalRandom.current().nextInt(dataSourceNames.size()));
+ return Optional.of(dataSourceName);
+ }
+
private Optional<String> findDataSourceNameOfSingleTable(final ShardingRule shardingRule) {
for (String each : logicTables) {
if (shardingRule.getSingleTableRules().containsKey(each)) {
@@ -62,9 +67,4 @@ public final class SingleTableRoutingEngine implements ShardingRouteEngine {
}
return Optional.empty();
}
-
- private Optional<String> getRandomDataSourceName(final Collection<String> dataSourceNames) {
- String dataSourceName = Lists.newArrayList(dataSourceNames).get(ThreadLocalRandom.current().nextInt(dataSourceNames.size()));
- return Optional.of(dataSourceName);
- }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java b/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java
index ac68d34..e6046da 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java
+++ b/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java
@@ -32,7 +32,7 @@ import java.util.Collections;
/**
* Remove token generator.
*/
-public final class RemoveTokenGenerator implements CollectionSQLTokenGenerator {
+public final class RemoveTokenGenerator implements CollectionSQLTokenGenerator<SQLStatementContext<?>> {
@Override
public boolean isGenerateSQLToken(final SQLStatementContext sqlStatementContext) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
index 15c40cc..70cc246 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
@@ -72,6 +72,10 @@ public final class TextProtocolBackendHandlerFactory {
if (sqlStatement instanceof TCLStatement) {
return TransactionBackendHandlerFactory.newInstance((TCLStatement) sqlStatement, sql, backendConnection);
}
+ Optional<TextProtocolBackendHandler> distSQLBackendHandler = DistSQLBackendHandlerFactory.newInstance(databaseType, sqlStatement, backendConnection);
+ if (distSQLBackendHandler.isPresent()) {
+ return distSQLBackendHandler.get();
+ }
Optional<DatabaseAdminBackendHandlerFactory> adminBackendHandlerEngine = TypedSPIRegistry.findRegisteredService(
DatabaseAdminBackendHandlerFactory.class, databaseType.getName(), new Properties());
if (adminBackendHandlerEngine.isPresent()) {
@@ -80,10 +84,6 @@ public final class TextProtocolBackendHandlerFactory {
return databaseAdminBackendHandler.get();
}
}
- Optional<TextProtocolBackendHandler> distSQLBackendHandler = DistSQLBackendHandlerFactory.newInstance(databaseType, sqlStatement, backendConnection);
- if (distSQLBackendHandler.isPresent()) {
- return distSQLBackendHandler.get();
- }
return DatabaseBackendHandlerFactory.newInstance(sqlStatement, sql, backendConnection);
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLCallStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLCallStatement.java
index 7ac711a..893488d 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLCallStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLCallStatement.java
@@ -35,8 +35,8 @@ import java.util.List;
@NoArgsConstructor
@Getter
public final class MySQLCallStatement extends CallStatement implements MySQLStatement {
-
+
private String procedureName;
-
+
private List<ExpressionSegment> parameters;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLInsertStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLInsertStatement.java
index 530b412..4a9027c 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLInsertStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLInsertStatement.java
@@ -32,11 +32,11 @@ import java.util.Optional;
@Setter
@ToString
public final class MySQLInsertStatement extends InsertStatement implements MySQLStatement {
-
+
private SetAssignmentSegment setAssignment;
-
+
private OnDuplicateKeyColumnsSegment onDuplicateKeyColumns;
-
+
/**
* Get set assignment segment.
*
@@ -45,7 +45,7 @@ public final class MySQLInsertStatement extends InsertStatement implements MySQL
public Optional<SetAssignmentSegment> getSetAssignment() {
return Optional.ofNullable(setAssignment);
}
-
+
/**
* Get on duplicate key columns segment.
*
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLSelectStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLSelectStatement.java
index 418595a..8f5ed95 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLSelectStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLSelectStatement.java
@@ -32,9 +32,9 @@ import java.util.Optional;
@Setter
@ToString
public final class MySQLSelectStatement extends SelectStatement implements MySQLStatement {
-
+
private LimitSegment limit;
-
+
private LockSegment lock;
/**
@@ -45,7 +45,7 @@ public final class MySQLSelectStatement extends SelectStatement implements MySQL
public Optional<LimitSegment> getLimit() {
return Optional.ofNullable(limit);
}
-
+
/**
* Get lock segment.
*
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLUpdateStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLUpdateStatement.java
index f36c1eb..717398e 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLUpdateStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLUpdateStatement.java
@@ -34,9 +34,9 @@ import java.util.Optional;
public final class MySQLUpdateStatement extends UpdateStatement implements MySQLStatement {
private OrderBySegment orderBy;
-
+
private LimitSegment limit;
-
+
/**
* Get order by segment.
*
@@ -45,7 +45,7 @@ public final class MySQLUpdateStatement extends UpdateStatement implements MySQL
public Optional<OrderBySegment> getOrderBy() {
return Optional.ofNullable(orderBy);
}
-
+
/**
* Get order by segment.
*