diff --git a/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/BaseShardingEngine.java b/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/BaseShardingEngine.java index 4b7ed0d0cb1e30b4f0640cc018ca6a9903ad998f..2fef342869464b76e413c9eba8b4310386347c8a 100644 --- a/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/BaseShardingEngine.java +++ b/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/BaseShardingEngine.java @@ -42,7 +42,7 @@ import org.apache.shardingsphere.underlying.rewrite.SQLRewriteEntry; import org.apache.shardingsphere.underlying.rewrite.context.SQLRewriteContext; import org.apache.shardingsphere.underlying.rewrite.context.SQLRewriteContextDecorator; import org.apache.shardingsphere.underlying.rewrite.engine.SQLRewriteResult; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.apache.shardingsphere.underlying.route.context.RouteContext; import org.apache.shardingsphere.underlying.route.context.RouteUnit; @@ -64,7 +64,7 @@ public abstract class BaseShardingEngine { private final ShardingSphereMetaData metaData; - private final DateNodeRouter dateNodeRouter; + private final DataNodeRouter dataNodeRouter; private final SPIRoutingHook routingHook; @@ -72,7 +72,7 @@ public abstract class BaseShardingEngine { this.shardingRule = shardingRule; this.properties = properties; this.metaData = metaData; - dateNodeRouter = new DateNodeRouter(metaData, properties, sqlParserEngine); + dataNodeRouter = new DataNodeRouter(metaData, properties, sqlParserEngine); routingHook = new SPIRoutingHook(); } @@ -96,13 +96,13 @@ public abstract class BaseShardingEngine { protected abstract List cloneParameters(List parameters); - protected abstract RouteContext route(DateNodeRouter dateNodeRouter, String sql, List parameters); + protected abstract RouteContext route(DataNodeRouter dataNodeRouter, String sql, List parameters); private ShardingRouteContext executeRoute(final String sql, final List clonedParameters) { routingHook.start(sql); try { registerRouteDecorator(); - ShardingRouteContext result = (ShardingRouteContext) route(dateNodeRouter, sql, clonedParameters); + ShardingRouteContext result = (ShardingRouteContext) route(dataNodeRouter, sql, clonedParameters); routingHook.finishSuccess(result, metaData.getSchema()); return result; // CHECKSTYLE:OFF @@ -114,9 +114,9 @@ public abstract class BaseShardingEngine { } private void registerRouteDecorator() { - dateNodeRouter.registerDecorator(shardingRule, new ShardingRouteDecorator()); + dataNodeRouter.registerDecorator(shardingRule, new ShardingRouteDecorator()); for (MasterSlaveRule each : shardingRule.getMasterSlaveRules()) { - dateNodeRouter.registerDecorator(each, new MasterSlaveRouteDecorator()); + dataNodeRouter.registerDecorator(each, new MasterSlaveRouteDecorator()); } } diff --git a/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/PreparedQueryShardingEngine.java b/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/PreparedQueryShardingEngine.java index 058ff63b8227c3a4171b265115bdd00856b2c392..b472955e98771945af94fdd87d156071665f76f7 100644 --- a/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/PreparedQueryShardingEngine.java +++ b/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/PreparedQueryShardingEngine.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.core.rule.ShardingRule; import org.apache.shardingsphere.sql.parser.SQLParserEngine; import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties; import org.apache.shardingsphere.underlying.common.metadata.ShardingSphereMetaData; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.apache.shardingsphere.underlying.route.context.RouteContext; import java.util.ArrayList; @@ -49,7 +49,7 @@ public final class PreparedQueryShardingEngine extends BaseShardingEngine { } @Override - protected RouteContext route(final DateNodeRouter dateNodeRouter, final String sql, final List parameters) { - return dateNodeRouter.route(sql, parameters, true); + protected RouteContext route(final DataNodeRouter dataNodeRouter, final String sql, final List parameters) { + return dataNodeRouter.route(sql, parameters, true); } } diff --git a/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/SimpleQueryShardingEngine.java b/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/SimpleQueryShardingEngine.java index a1394bc2e67c211a5bbb57f0754895c63307d71f..2f1100d0331db70357faacd1dcc9e1eb5d3f865f 100644 --- a/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/SimpleQueryShardingEngine.java +++ b/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/shard/SimpleQueryShardingEngine.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.core.rule.ShardingRule; import org.apache.shardingsphere.sql.parser.SQLParserEngine; import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties; import org.apache.shardingsphere.underlying.common.metadata.ShardingSphereMetaData; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.apache.shardingsphere.underlying.route.context.RouteContext; import java.util.Collections; @@ -49,7 +49,7 @@ public final class SimpleQueryShardingEngine extends BaseShardingEngine { } @Override - protected RouteContext route(final DateNodeRouter dateNodeRouter, final String sql, final List parameters) { - return dateNodeRouter.route(sql, Collections.emptyList(), false); + protected RouteContext route(final DataNodeRouter dataNodeRouter, final String sql, final List parameters) { + return dataNodeRouter.route(sql, Collections.emptyList(), false); } } diff --git a/sharding-core/sharding-core-entry/src/test/java/org/apache/shardingsphere/core/shard/PreparedQueryShardingEngineTest.java b/sharding-core/sharding-core-entry/src/test/java/org/apache/shardingsphere/core/shard/PreparedQueryShardingEngineTest.java index 1e01494b375c61dd6927985f78c335cc0a535804..a2011282ed0e4f0a956cb5652b6aad48e13c98f4 100644 --- a/sharding-core/sharding-core-entry/src/test/java/org/apache/shardingsphere/core/shard/PreparedQueryShardingEngineTest.java +++ b/sharding-core/sharding-core-entry/src/test/java/org/apache/shardingsphere/core/shard/PreparedQueryShardingEngineTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.sql.parser.SQLParserEngine; import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData; import org.apache.shardingsphere.underlying.common.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.underlying.route.context.RouteContext; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,7 +48,7 @@ public final class PreparedQueryShardingEngineTest extends BaseShardingEngineTes private ShardingRule shardingRule; @Mock - private DateNodeRouter dateNodeRouter; + private DataNodeRouter dataNodeRouter; private PreparedQueryShardingEngine shardingEngine; @@ -67,20 +67,20 @@ public final class PreparedQueryShardingEngineTest extends BaseShardingEngineTes @SneakyThrows private void setRoutingEngine() { - Field field = BaseShardingEngine.class.getDeclaredField("dateNodeRouter"); + Field field = BaseShardingEngine.class.getDeclaredField("dataNodeRouter"); field.setAccessible(true); - field.set(shardingEngine, dateNodeRouter); + field.set(shardingEngine, dataNodeRouter); } protected void assertShard() { RouteContext routeContext = createSQLRouteContext(); - when(dateNodeRouter.route(getSql(), getParameters(), true)).thenReturn(routeContext); + when(dataNodeRouter.route(getSql(), getParameters(), true)).thenReturn(routeContext); assertExecutionContext(shardingEngine.shard(getSql(), getParameters())); } @Test(expected = SQLException.class) public void assertWithRouteException() { - when(dateNodeRouter.route(getSql(), getParameters(), true)).thenThrow(SQLException.class); + when(dataNodeRouter.route(getSql(), getParameters(), true)).thenThrow(SQLException.class); shardingEngine.shard(getSql(), getParameters()); } } diff --git a/sharding-core/sharding-core-entry/src/test/java/org/apache/shardingsphere/core/shard/SimpleQueryShardingEngineTest.java b/sharding-core/sharding-core-entry/src/test/java/org/apache/shardingsphere/core/shard/SimpleQueryShardingEngineTest.java index fd615e81f2a4c317bb9693385fc6bfb012491cb6..937f735425a729a2e26b9421936608dd63b2d5fb 100644 --- a/sharding-core/sharding-core-entry/src/test/java/org/apache/shardingsphere/core/shard/SimpleQueryShardingEngineTest.java +++ b/sharding-core/sharding-core-entry/src/test/java/org/apache/shardingsphere/core/shard/SimpleQueryShardingEngineTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.sql.parser.SQLParserEngine; import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData; import org.apache.shardingsphere.underlying.common.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.underlying.route.context.RouteContext; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.junit.Before; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -46,7 +46,7 @@ public final class SimpleQueryShardingEngineTest extends BaseShardingEngineTest private ShardingRule shardingRule; @Mock - private DateNodeRouter dateNodeRouter; + private DataNodeRouter dataNodeRouter; private SimpleQueryShardingEngine shardingEngine; @@ -65,14 +65,14 @@ public final class SimpleQueryShardingEngineTest extends BaseShardingEngineTest @SneakyThrows private void setRoutingEngine() { - Field field = BaseShardingEngine.class.getDeclaredField("dateNodeRouter"); + Field field = BaseShardingEngine.class.getDeclaredField("dataNodeRouter"); field.setAccessible(true); - field.set(shardingEngine, dateNodeRouter); + field.set(shardingEngine, dataNodeRouter); } protected void assertShard() { RouteContext routeContext = createSQLRouteContext(); - when(dateNodeRouter.route(getSql(), Collections.emptyList(), false)).thenReturn(routeContext); + when(dataNodeRouter.route(getSql(), Collections.emptyList(), false)).thenReturn(routeContext); assertExecutionContext(shardingEngine.shard(getSql(), getParameters())); } } diff --git a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java index 548fe5d2f1eb7f245b203fdc8834172f39f6e617..2120be376242767d0c02d0e19ff98b3505e128e9 100644 --- a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java +++ b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java @@ -42,7 +42,7 @@ import org.apache.shardingsphere.underlying.rewrite.engine.SQLRewriteResult; import org.apache.shardingsphere.underlying.rewrite.parameterized.engine.AbstractSQLRewriterParameterizedTest; import org.apache.shardingsphere.underlying.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters; import org.apache.shardingsphere.underlying.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParametersBuilder; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.apache.shardingsphere.underlying.route.context.RouteContext; import org.apache.shardingsphere.underlying.route.context.RouteUnit; import org.junit.runners.Parameterized.Parameters; @@ -80,7 +80,7 @@ public final class MixSQLRewriterParameterizedTest extends AbstractSQLRewriterPa SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(null == getTestParameters().getDatabaseType() ? "SQL92" : getTestParameters().getDatabaseType()); ShardingSphereMetaData metaData = createShardingSphereMetaData(); ConfigurationProperties properties = new ConfigurationProperties(ruleConfiguration.getProps()); - RouteContext routeContext = new DateNodeRouter(metaData, properties, sqlParserEngine).route(getTestParameters().getInputSQL(), getTestParameters().getInputParameters(), false); + RouteContext routeContext = new DataNodeRouter(metaData, properties, sqlParserEngine).route(getTestParameters().getInputSQL(), getTestParameters().getInputParameters(), false); ShardingRouteDecorator shardingRouteDecorator = new ShardingRouteDecorator(); ShardingRouteContext shardingRouteContext = (ShardingRouteContext) shardingRouteDecorator.decorate(routeContext, metaData, shardingRule, properties); SQLRewriteContext sqlRewriteContext = new SQLRewriteContext( diff --git a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java index 6b09a4fdd3fa626967f57611e7bd9fb045d02ecc..5ee41083075c378c6cc417fbed2f1194a09596a0 100644 --- a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java +++ b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java @@ -41,7 +41,7 @@ import org.apache.shardingsphere.underlying.rewrite.engine.SQLRewriteResult; import org.apache.shardingsphere.underlying.rewrite.parameterized.engine.AbstractSQLRewriterParameterizedTest; import org.apache.shardingsphere.underlying.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters; import org.apache.shardingsphere.underlying.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParametersBuilder; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.apache.shardingsphere.underlying.route.context.RouteContext; import org.apache.shardingsphere.underlying.route.context.RouteUnit; import org.junit.runners.Parameterized.Parameters; @@ -79,7 +79,7 @@ public final class ShardingSQLRewriterParameterizedTest extends AbstractSQLRewri SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(null == getTestParameters().getDatabaseType() ? "SQL92" : getTestParameters().getDatabaseType()); ShardingSphereMetaData metaData = createShardingSphereMetaData(); ConfigurationProperties properties = new ConfigurationProperties(ruleConfiguration.getProps()); - RouteContext routeContext = new DateNodeRouter(metaData, properties, sqlParserEngine).route(getTestParameters().getInputSQL(), getTestParameters().getInputParameters(), false); + RouteContext routeContext = new DataNodeRouter(metaData, properties, sqlParserEngine).route(getTestParameters().getInputSQL(), getTestParameters().getInputParameters(), false); ShardingRouteDecorator shardingRouteDecorator = new ShardingRouteDecorator(); ShardingRouteContext shardingRouteContext = (ShardingRouteContext) shardingRouteDecorator.decorate(routeContext, metaData, shardingRule, properties); SQLRewriteContext sqlRewriteContext = new SQLRewriteContext( diff --git a/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/DatabaseTest.java b/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/DatabaseTest.java index ab070f53439bac350a6dfab4ff74f721e762a402..439dfdec139269d528bee04df85cd3203ca2eb73 100644 --- a/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/DatabaseTest.java +++ b/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/DatabaseTest.java @@ -37,7 +37,7 @@ import org.apache.shardingsphere.sql.parser.binder.statement.dml.SelectStatement import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties; import org.apache.shardingsphere.underlying.common.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.underlying.common.metadata.datasource.DataSourceMetas; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.apache.shardingsphere.underlying.route.context.RouteContext; import org.junit.Before; import org.junit.Test; @@ -77,7 +77,7 @@ public final class DatabaseTest { String originSQL = "select * from tesT"; SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine("MySQL"); ShardingSphereMetaData metaData = getMetaDataForAllRoutingSQL(); - RouteContext routeContext = new DateNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Collections.emptyList(), false); + RouteContext routeContext = new DataNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Collections.emptyList(), false); ShardingRouteDecorator shardingRouteDecorator = new ShardingRouteDecorator(); ShardingRouteContext actual = (ShardingRouteContext) shardingRouteDecorator.decorate(routeContext, metaData, shardingRule, properties); assertThat(actual.getRouteResult().getRouteUnits().size(), is(1)); @@ -101,13 +101,13 @@ public final class DatabaseTest { String originSQL = "select user_id from tbl_pagination limit 0,5"; SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine("MySQL"); ShardingSphereMetaData metaData = getMetaDataForPagination(); - RouteContext routeContext = new DateNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Collections.emptyList(), false); + RouteContext routeContext = new DataNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Collections.emptyList(), false); ShardingRouteDecorator shardingRouteDecorator = new ShardingRouteDecorator(); ShardingRouteContext actual = (ShardingRouteContext) shardingRouteDecorator.decorate(routeContext, metaData, shardingRule, properties); assertThat(((SelectStatementContext) actual.getSqlStatementContext()).getPaginationContext().getActualOffset(), is(0L)); assertThat(((SelectStatementContext) actual.getSqlStatementContext()).getPaginationContext().getActualRowCount().orElse(null), is(5L)); originSQL = "select user_id from tbl_pagination limit 5,5"; - routeContext = new DateNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Collections.emptyList(), false); + routeContext = new DataNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Collections.emptyList(), false); shardingRouteDecorator = new ShardingRouteDecorator(); actual = (ShardingRouteContext) shardingRouteDecorator.decorate(routeContext, metaData, shardingRule, properties); assertThat(((SelectStatementContext) actual.getSqlStatementContext()).getPaginationContext().getActualOffset(), is(5L)); @@ -141,14 +141,14 @@ public final class DatabaseTest { ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class); when(metaData.getSchema()).thenReturn(mock(SchemaMetaData.class)); SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine("MySQL"); - RouteContext routeContext = new DateNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Lists.newArrayList(13, 173), false); + RouteContext routeContext = new DataNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Lists.newArrayList(13, 173), false); ShardingRouteDecorator shardingRouteDecorator = new ShardingRouteDecorator(); ShardingRouteContext actual = (ShardingRouteContext) shardingRouteDecorator.decorate(routeContext, metaData, shardingRule, properties); assertThat(((SelectStatementContext) actual.getSqlStatementContext()).getPaginationContext().getActualOffset(), is(5L)); assertThat(((SelectStatementContext) actual.getSqlStatementContext()).getPaginationContext().getActualRowCount().orElse(null), is(10L)); assertThat(actual.getRouteResult().getRouteUnits().size(), is(1)); originSQL = "select city_id from t_user where city_id in (?,?) limit 5,10"; - routeContext = new DateNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Lists.newArrayList(89, 84), false); + routeContext = new DataNodeRouter(metaData, properties, sqlParserEngine).route(originSQL, Lists.newArrayList(89, 84), false); shardingRouteDecorator = new ShardingRouteDecorator(); actual = (ShardingRouteContext) shardingRouteDecorator.decorate(routeContext, metaData, shardingRule, properties); assertThat(((SelectStatementContext) actual.getSqlStatementContext()).getPaginationContext().getActualOffset(), is(5L)); diff --git a/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java b/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java index 0f4ff9fd0cd4eb71718e9eff18f282469381e076..84e9a3a9c6e00210cc6c2c9e9afb8fa9055e60c5 100644 --- a/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java +++ b/sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java @@ -31,7 +31,7 @@ import org.apache.shardingsphere.underlying.common.config.properties.Configurati import org.apache.shardingsphere.underlying.common.database.type.DatabaseTypes; import org.apache.shardingsphere.underlying.common.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.underlying.common.metadata.datasource.DataSourceMetas; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.apache.shardingsphere.underlying.route.context.RouteContext; import java.util.Arrays; @@ -51,7 +51,7 @@ public abstract class AbstractSQLRouteTest extends AbstractRoutingEngineTest { ShardingSphereMetaData metaData = new ShardingSphereMetaData(buildDataSourceMetas(), buildSchemaMetaData()); ConfigurationProperties properties = new ConfigurationProperties(new Properties()); SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine("MySQL"); - RouteContext routeContext = new DateNodeRouter(metaData, properties, sqlParserEngine).route(sql, parameters, false); + RouteContext routeContext = new DataNodeRouter(metaData, properties, sqlParserEngine).route(sql, parameters, false); ShardingRouteDecorator shardingRouteDecorator = new ShardingRouteDecorator(); ShardingRouteContext result = (ShardingRouteContext) shardingRouteDecorator.decorate(routeContext, metaData, shardingRule, properties); assertThat(result.getRouteResult().getRouteUnits().size(), is(1)); diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlavePreparedStatement.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlavePreparedStatement.java index 64e06d0022fc99ba31efb1b44d7a61be5a7e3b44..63afcdeb47f0bfea4eda1597e49ef57d172c5734 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlavePreparedStatement.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlavePreparedStatement.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.shardingjdbc.jdbc.core.constant.SQLExceptionCon import org.apache.shardingsphere.shardingjdbc.jdbc.core.context.MasterSlaveRuntimeContext; import org.apache.shardingsphere.underlying.route.context.RouteContext; import org.apache.shardingsphere.underlying.route.context.RouteUnit; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -61,9 +61,9 @@ public final class MasterSlavePreparedStatement extends AbstractMasterSlavePrepa } this.connection = connection; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - DateNodeRouter dateNodeRouter = new DateNodeRouter(runtimeContext.getMetaData(), runtimeContext.getProperties(), runtimeContext.getSqlParserEngine()); - dateNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), true); + DataNodeRouter dataNodeRouter = new DataNodeRouter(runtimeContext.getMetaData(), runtimeContext.getProperties(), runtimeContext.getSqlParserEngine()); + dataNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), true); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { PreparedStatement preparedStatement = connection.getConnection(each.getDataSourceMapper().getActualName()).prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability); routedStatements.add(preparedStatement); @@ -76,9 +76,9 @@ public final class MasterSlavePreparedStatement extends AbstractMasterSlavePrepa } this.connection = connection; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - DateNodeRouter dateNodeRouter = new DateNodeRouter(runtimeContext.getMetaData(), runtimeContext.getProperties(), runtimeContext.getSqlParserEngine()); - dateNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), true); + DataNodeRouter dataNodeRouter = new DataNodeRouter(runtimeContext.getMetaData(), runtimeContext.getProperties(), runtimeContext.getSqlParserEngine()); + dataNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), true); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { PreparedStatement preparedStatement = connection.getConnection(each.getDataSourceMapper().getActualName()).prepareStatement(sql, autoGeneratedKeys); routedStatements.add(preparedStatement); @@ -91,9 +91,9 @@ public final class MasterSlavePreparedStatement extends AbstractMasterSlavePrepa } this.connection = connection; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - DateNodeRouter dateNodeRouter = new DateNodeRouter(runtimeContext.getMetaData(), runtimeContext.getProperties(), runtimeContext.getSqlParserEngine()); - dateNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), true); + DataNodeRouter dataNodeRouter = new DataNodeRouter(runtimeContext.getMetaData(), runtimeContext.getProperties(), runtimeContext.getSqlParserEngine()); + dataNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), true); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { PreparedStatement preparedStatement = connection.getConnection(each.getDataSourceMapper().getActualName()).prepareStatement(sql, columnIndexes); routedStatements.add(preparedStatement); @@ -106,9 +106,9 @@ public final class MasterSlavePreparedStatement extends AbstractMasterSlavePrepa } this.connection = connection; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - DateNodeRouter dateNodeRouter = new DateNodeRouter(runtimeContext.getMetaData(), runtimeContext.getProperties(), runtimeContext.getSqlParserEngine()); - dateNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), true); + DataNodeRouter dataNodeRouter = new DataNodeRouter(runtimeContext.getMetaData(), runtimeContext.getProperties(), runtimeContext.getSqlParserEngine()); + dataNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), true); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { PreparedStatement preparedStatement = connection.getConnection(each.getDataSourceMapper().getActualName()).prepareStatement(sql, columnNames); routedStatements.add(preparedStatement); diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlaveStatement.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlaveStatement.java index 69dbc58e97a0e994788b00835354fe3a0a2d0186..514daa908d55548dc6d3e6f94f9cf97949f70230 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlaveStatement.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlaveStatement.java @@ -28,7 +28,7 @@ import org.apache.shardingsphere.shardingjdbc.jdbc.core.constant.SQLExceptionCon import org.apache.shardingsphere.shardingjdbc.jdbc.core.context.MasterSlaveRuntimeContext; import org.apache.shardingsphere.underlying.route.context.RouteContext; import org.apache.shardingsphere.underlying.route.context.RouteUnit; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import java.sql.ResultSet; import java.sql.SQLException; @@ -46,7 +46,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { private final MasterSlaveConnection connection; @Getter(AccessLevel.NONE) - private final DateNodeRouter dateNodeRouter; + private final DataNodeRouter dataNodeRouter; private final int resultSetType; @@ -67,7 +67,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { public MasterSlaveStatement(final MasterSlaveConnection connection, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) { super(Statement.class); this.connection = connection; - dateNodeRouter = new DateNodeRouter(connection.getRuntimeContext().getMetaData(), connection.getRuntimeContext().getProperties(), connection.getRuntimeContext().getSqlParserEngine()); + dataNodeRouter = new DataNodeRouter(connection.getRuntimeContext().getMetaData(), connection.getRuntimeContext().getProperties(), connection.getRuntimeContext().getSqlParserEngine()); this.resultSetType = resultSetType; this.resultSetConcurrency = resultSetConcurrency; this.resultSetHoldability = resultSetHoldability; @@ -80,8 +80,8 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { } clearPrevious(); MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - dateNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), false); + dataNodeRouter.registerDecorator(runtimeContext.getRule(), new MasterSlaveRouteDecorator()); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), false); Collection routeUnits = routeContext.getRouteResult().getRouteUnits(); Preconditions.checkState(1 == routeUnits.size(), "Cannot support executeQuery for DML or DDL"); Statement statement = connection.getConnection(routeUnits.iterator().next().getDataSourceMapper().getActualName()).createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); @@ -94,7 +94,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { clearPrevious(); int result = 0; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), false); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), false); routeContext = new MasterSlaveRouteDecorator().decorate(routeContext, runtimeContext.getMetaData(), runtimeContext.getRule(), runtimeContext.getProperties()); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { Statement statement = connection.getConnection(each.getDataSourceMapper().getActualName()).createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); @@ -109,7 +109,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { clearPrevious(); int result = 0; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), false); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), false); routeContext = new MasterSlaveRouteDecorator().decorate(routeContext, runtimeContext.getMetaData(), runtimeContext.getRule(), runtimeContext.getProperties()); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { Statement statement = connection.getConnection(each.getDataSourceMapper().getActualName()).createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); @@ -124,7 +124,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { clearPrevious(); int result = 0; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), false); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), false); routeContext = new MasterSlaveRouteDecorator().decorate(routeContext, runtimeContext.getMetaData(), runtimeContext.getRule(), runtimeContext.getProperties()); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { Statement statement = connection.getConnection(each.getDataSourceMapper().getActualName()).createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); @@ -139,7 +139,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { clearPrevious(); int result = 0; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), false); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), false); routeContext = new MasterSlaveRouteDecorator().decorate(routeContext, runtimeContext.getMetaData(), runtimeContext.getRule(), runtimeContext.getProperties()); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { Statement statement = connection.getConnection(each.getDataSourceMapper().getActualName()).createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); @@ -154,7 +154,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { clearPrevious(); boolean result = false; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), false); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), false); routeContext = new MasterSlaveRouteDecorator().decorate(routeContext, runtimeContext.getMetaData(), runtimeContext.getRule(), runtimeContext.getProperties()); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { Statement statement = connection.getConnection(each.getDataSourceMapper().getActualName()).createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); @@ -169,7 +169,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { clearPrevious(); boolean result = false; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), false); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), false); routeContext = new MasterSlaveRouteDecorator().decorate(routeContext, runtimeContext.getMetaData(), runtimeContext.getRule(), runtimeContext.getProperties()); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { Statement statement = connection.getConnection(each.getDataSourceMapper().getActualName()).createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); @@ -184,7 +184,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { clearPrevious(); boolean result = false; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), false); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), false); routeContext = new MasterSlaveRouteDecorator().decorate(routeContext, runtimeContext.getMetaData(), runtimeContext.getRule(), runtimeContext.getProperties()); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { Statement statement = connection.getConnection(each.getDataSourceMapper().getActualName()).createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); @@ -199,7 +199,7 @@ public final class MasterSlaveStatement extends AbstractStatementAdapter { clearPrevious(); boolean result = false; MasterSlaveRuntimeContext runtimeContext = connection.getRuntimeContext(); - RouteContext routeContext = dateNodeRouter.route(sql, Collections.emptyList(), false); + RouteContext routeContext = dataNodeRouter.route(sql, Collections.emptyList(), false); routeContext = new MasterSlaveRouteDecorator().decorate(routeContext, runtimeContext.getMetaData(), runtimeContext.getRule(), runtimeContext.getProperties()); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { Statement statement = connection.getConnection(each.getDataSourceMapper().getActualName()).createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java index 5114a9350b9e13bc527e731784d5b4d8df6cf54e..baf5e43decf58cfbba165e4889172cc55a17d21f 100644 --- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java +++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java @@ -46,7 +46,7 @@ import org.apache.shardingsphere.underlying.rewrite.context.SQLRewriteContext; import org.apache.shardingsphere.underlying.rewrite.context.SQLRewriteContextDecorator; import org.apache.shardingsphere.underlying.rewrite.engine.SQLRewriteResult; import org.apache.shardingsphere.underlying.rewrite.engine.impl.DefaultSQLRewriteEngine; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.apache.shardingsphere.underlying.route.context.RouteContext; import org.apache.shardingsphere.underlying.route.context.RouteUnit; @@ -102,9 +102,9 @@ public final class PreparedStatementExecutorWrapper implements JDBCExecutorWrapp sqlRewriteContext.generateSQLTokens(); String rewriteSQL = new DefaultSQLRewriteEngine().rewrite(sqlRewriteContext).getSql(); ExecutionContext result = new ExecutionContext(sqlStatementContext); - DateNodeRouter dateNodeRouter = new DateNodeRouter(logicSchema.getMetaData(), SHARDING_PROXY_CONTEXT.getProperties(), logicSchema.getSqlParserEngine()); - dateNodeRouter.registerDecorator(((MasterSlaveSchema) logicSchema).getMasterSlaveRule(), new MasterSlaveRouteDecorator()); - RouteContext routeContext = dateNodeRouter.route(rewriteSQL, parameters, true); + DataNodeRouter dataNodeRouter = new DataNodeRouter(logicSchema.getMetaData(), SHARDING_PROXY_CONTEXT.getProperties(), logicSchema.getSqlParserEngine()); + dataNodeRouter.registerDecorator(((MasterSlaveSchema) logicSchema).getMasterSlaveRule(), new MasterSlaveRouteDecorator()); + RouteContext routeContext = dataNodeRouter.route(rewriteSQL, parameters, true); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { result.getExecutionUnits().add(new ExecutionUnit(each.getDataSourceMapper().getActualName(), new SQLUnit(rewriteSQL, parameters))); } diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java index dc4cf3030fc65e87c79423d8b461e1a736a5ae9b..b6016d5040a8a89b18b315e10240008e9354c7d6 100644 --- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java +++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java @@ -46,7 +46,7 @@ import org.apache.shardingsphere.underlying.rewrite.context.SQLRewriteContext; import org.apache.shardingsphere.underlying.rewrite.context.SQLRewriteContextDecorator; import org.apache.shardingsphere.underlying.rewrite.engine.SQLRewriteResult; import org.apache.shardingsphere.underlying.rewrite.engine.impl.DefaultSQLRewriteEngine; -import org.apache.shardingsphere.underlying.route.DateNodeRouter; +import org.apache.shardingsphere.underlying.route.DataNodeRouter; import org.apache.shardingsphere.underlying.route.context.RouteContext; import org.apache.shardingsphere.underlying.route.context.RouteUnit; @@ -99,9 +99,9 @@ public final class StatementExecutorWrapper implements JDBCExecutorWrapper { sqlRewriteContext.generateSQLTokens(); String rewriteSQL = new DefaultSQLRewriteEngine().rewrite(sqlRewriteContext).getSql(); ExecutionContext result = new ExecutionContext(sqlStatementContext); - DateNodeRouter dateNodeRouter = new DateNodeRouter(logicSchema.getMetaData(), SHARDING_PROXY_CONTEXT.getProperties(), logicSchema.getSqlParserEngine()); - dateNodeRouter.registerDecorator(((MasterSlaveSchema) logicSchema).getMasterSlaveRule(), new MasterSlaveRouteDecorator()); - RouteContext routeContext = dateNodeRouter.route(rewriteSQL, Collections.emptyList(), false); + DataNodeRouter dataNodeRouter = new DataNodeRouter(logicSchema.getMetaData(), SHARDING_PROXY_CONTEXT.getProperties(), logicSchema.getSqlParserEngine()); + dataNodeRouter.registerDecorator(((MasterSlaveSchema) logicSchema).getMasterSlaveRule(), new MasterSlaveRouteDecorator()); + RouteContext routeContext = dataNodeRouter.route(rewriteSQL, Collections.emptyList(), false); for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) { result.getExecutionUnits().add(new ExecutionUnit(each.getDataSourceMapper().getActualName(), new SQLUnit(rewriteSQL, Collections.emptyList()))); } diff --git a/shardingsphere-underlying/shardingsphere-route/src/main/java/org/apache/shardingsphere/underlying/route/DateNodeRouter.java b/shardingsphere-underlying/shardingsphere-route/src/main/java/org/apache/shardingsphere/underlying/route/DataNodeRouter.java similarity index 99% rename from shardingsphere-underlying/shardingsphere-route/src/main/java/org/apache/shardingsphere/underlying/route/DateNodeRouter.java rename to shardingsphere-underlying/shardingsphere-route/src/main/java/org/apache/shardingsphere/underlying/route/DataNodeRouter.java index cde89d39978507b4f63969fd2ea61a084fb90d39..d9d1e98fd1583e99202c8e941549f3cf370eac27 100644 --- a/shardingsphere-underlying/shardingsphere-route/src/main/java/org/apache/shardingsphere/underlying/route/DateNodeRouter.java +++ b/shardingsphere-underlying/shardingsphere-route/src/main/java/org/apache/shardingsphere/underlying/route/DataNodeRouter.java @@ -39,7 +39,7 @@ import java.util.Map.Entry; * Data node router. */ @RequiredArgsConstructor -public final class DateNodeRouter { +public final class DataNodeRouter { private final ShardingSphereMetaData metaData;