This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 d1c940d Remove useless todo code (#7605)
d1c940d is described below
commit d1c940d72cd1e1a61b6e9ed1e9f485560e854323
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Sep 25 17:52:37 2020 +0800
Remove useless todo code (#7605)
---
.../shardingsphere/infra/route/DataNodeRouter.java | 13 +------------
.../parser/binder/SQLStatementContextFactory.java | 22 +++++++++-------------
.../statement/SQLStatementContextFactoryTest.java | 6 +++---
3 files changed, 13 insertions(+), 28 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
b/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
index 3c68366..72146d2 100644
---
a/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
+++
b/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
@@ -28,8 +28,6 @@ import
org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.spi.order.OrderedSPIRegistry;
import org.apache.shardingsphere.sql.parser.binder.SQLStatementContextFactory;
-import
org.apache.shardingsphere.sql.parser.binder.statement.CommonSQLStatementContext;
-import
org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Collection;
@@ -86,20 +84,11 @@ public final class DataNodeRouter {
@SuppressWarnings({"unchecked", "rawtypes"})
private RouteContext executeRoute(final SQLStatement sqlStatement, final
List<Object> parameters) {
- RouteContext result = createRouteContext(sqlStatement, parameters);
+ RouteContext result = new
RouteContext(SQLStatementContextFactory.newInstance(metaData.getRuleSchemaMetaData().getSchemaMetaData(),
parameters, sqlStatement), parameters, new RouteResult());
for (Entry<ShardingSphereRule, RouteDecorator> entry :
decorators.entrySet()) {
result = entry.getValue().decorate(result, metaData,
entry.getKey(), props);
}
return new UnconfiguredSchemaRouteDecorator().decorate(result,
metaData);
}
- private RouteContext createRouteContext(final SQLStatement sqlStatement,
final List<Object> parameters) {
- try {
- SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(metaData.getRuleSchemaMetaData().getSchemaMetaData(),
parameters, sqlStatement);
- return new RouteContext(sqlStatementContext, parameters, new
RouteResult());
- // TODO should pass parameters for primary-replica-replication
- } catch (final IndexOutOfBoundsException ex) {
- return new RouteContext(new
CommonSQLStatementContext<>(sqlStatement), parameters, new RouteResult());
- }
- }
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/SQLStatementContextFactory.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/SQLStatementContextFactory.java
index a2ad7a5..b2d10ef 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/SQLStatementContextFactory.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/SQLStatementContextFactory.java
@@ -82,8 +82,7 @@ public final class SQLStatementContextFactory {
* @param sqlStatement SQL statement
* @return SQL statement context
*/
- @SuppressWarnings("unchecked")
- public static SQLStatementContext newInstance(final SchemaMetaData
schemaMetaData, final List<Object> parameters, final SQLStatement sqlStatement)
{
+ public static SQLStatementContext<?> newInstance(final SchemaMetaData
schemaMetaData, final List<Object> parameters, final SQLStatement sqlStatement)
{
if (sqlStatement instanceof DMLStatement) {
return getDMLStatementContext(schemaMetaData, parameters,
(DMLStatement) sqlStatement);
}
@@ -96,10 +95,10 @@ public final class SQLStatementContextFactory {
if (sqlStatement instanceof DALStatement) {
return getDALStatementContext((DALStatement) sqlStatement);
}
- return new CommonSQLStatementContext(sqlStatement);
+ return new CommonSQLStatementContext<>(sqlStatement);
}
- private static SQLStatementContext getDMLStatementContext(final
SchemaMetaData schemaMetaData, final List<Object> parameters, final
DMLStatement sqlStatement) {
+ private static SQLStatementContext<?> getDMLStatementContext(final
SchemaMetaData schemaMetaData, final List<Object> parameters, final
DMLStatement sqlStatement) {
if (sqlStatement instanceof SelectStatement) {
return new SelectStatementContext(schemaMetaData, parameters,
(SelectStatement) sqlStatement);
}
@@ -118,8 +117,7 @@ public final class SQLStatementContextFactory {
throw new UnsupportedOperationException(String.format("Unsupported SQL
statement `%s`", sqlStatement.getClass().getSimpleName()));
}
- @SuppressWarnings("unchecked")
- private static SQLStatementContext getDDLStatementContext(final
DDLStatement sqlStatement) {
+ private static SQLStatementContext<?> getDDLStatementContext(final
DDLStatement sqlStatement) {
if (sqlStatement instanceof CreateTableStatement) {
return new CreateTableStatementContext((CreateTableStatement)
sqlStatement);
}
@@ -141,11 +139,10 @@ public final class SQLStatementContextFactory {
if (sqlStatement instanceof TruncateStatement) {
return new TruncateStatementContext((TruncateStatement)
sqlStatement);
}
- return new CommonSQLStatementContext(sqlStatement);
+ return new CommonSQLStatementContext<>(sqlStatement);
}
- @SuppressWarnings("unchecked")
- private static SQLStatementContext getDCLStatementContext(final
DCLStatement sqlStatement) {
+ private static SQLStatementContext<?> getDCLStatementContext(final
DCLStatement sqlStatement) {
if (sqlStatement instanceof GrantStatement) {
return new GrantStatementContext((GrantStatement) sqlStatement);
}
@@ -155,11 +152,10 @@ public final class SQLStatementContextFactory {
if (sqlStatement instanceof SQLServerDenyUserStatement) {
return new DenyUserStatementContext((SQLServerDenyUserStatement)
sqlStatement);
}
- return new CommonSQLStatementContext(sqlStatement);
+ return new CommonSQLStatementContext<>(sqlStatement);
}
- @SuppressWarnings("unchecked")
- private static SQLStatementContext getDALStatementContext(final
DALStatement sqlStatement) {
+ private static SQLStatementContext<?> getDALStatementContext(final
DALStatement sqlStatement) {
if (sqlStatement instanceof MySQLDescribeStatement) {
return new DescribeStatementContext((MySQLDescribeStatement)
sqlStatement);
}
@@ -172,6 +168,6 @@ public final class SQLStatementContextFactory {
if (sqlStatement instanceof MySQLShowIndexStatement) {
return new ShowIndexStatementContext((MySQLShowIndexStatement)
sqlStatement);
}
- return new CommonSQLStatementContext(sqlStatement);
+ return new CommonSQLStatementContext<>(sqlStatement);
}
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/test/java/org/apache/shardingsphere/sql/parser/binder/statement/SQLStatementContextFactoryTest.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/test/java/org/apache/shardingsphere/sql/parser/binder/statement/SQLStatementContextFactoryTest.java
index ba24d8f..48767b4 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/test/java/org/apache/shardingsphere/sql/parser/binder/statement/SQLStatementContextFactoryTest.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/test/java/org/apache/shardingsphere/sql/parser/binder/statement/SQLStatementContextFactoryTest.java
@@ -52,7 +52,7 @@ public final class SQLStatementContextFactoryTest {
MySQLSelectStatement selectStatement = new MySQLSelectStatement();
selectStatement.setLimit(new LimitSegment(0, 10, null, null));
selectStatement.setProjections(projectionsSegment);
- SQLStatementContext sqlStatementContext =
SQLStatementContextFactory.newInstance(mock(SchemaMetaData.class), null,
selectStatement);
+ SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(mock(SchemaMetaData.class), null,
selectStatement);
assertNotNull(sqlStatementContext);
assertTrue(sqlStatementContext instanceof SelectStatementContext);
}
@@ -87,14 +87,14 @@ public final class SQLStatementContextFactoryTest {
private void
assertSQLStatementContextCreatedWhenSQLStatementInstanceOfInsertStatement(final
InsertStatement insertStatement) {
insertStatement.setTable(new SimpleTableSegment(0, 0, new
IdentifierValue("tbl")));
- SQLStatementContext sqlStatementContext =
SQLStatementContextFactory.newInstance(mock(SchemaMetaData.class), null,
insertStatement);
+ SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(mock(SchemaMetaData.class), null,
insertStatement);
assertNotNull(sqlStatementContext);
assertTrue(sqlStatementContext instanceof InsertStatementContext);
}
@Test
public void
assertSQLStatementContextCreatedWhenSQLStatementNotInstanceOfSelectStatementAndInsertStatement()
{
- SQLStatementContext sqlStatementContext =
SQLStatementContextFactory.newInstance(mock(SchemaMetaData.class), null,
mock(SQLStatement.class));
+ SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(mock(SchemaMetaData.class), null,
mock(SQLStatement.class));
assertNotNull(sqlStatementContext);
assertTrue(sqlStatementContext instanceof CommonSQLStatementContext);
}
