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 004df46 Add ShardingConditionEngine (#7690)
004df46 is described below
commit 004df46f04d4b2f1e6d32f46b41cb70b0d24f29c
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Oct 3 20:34:08 2020 +0800
Add ShardingConditionEngine (#7690)
---
.../sharding/route/engine/ShardingSQLRouter.java | 31 +++++++++++-------
.../condition/engine/ShardingConditionEngine.java | 38 ++++++++++++++++++++++
.../InsertClauseShardingConditionEngine.java | 13 +++-----
.../WhereClauseShardingConditionEngine.java | 13 +++-----
4 files changed, 65 insertions(+), 30 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/ShardingSQLRouter.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/ShardingSQLRouter.java
index a618f64..4849733 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/ShardingSQLRouter.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/ShardingSQLRouter.java
@@ -26,8 +26,9 @@ import org.apache.shardingsphere.infra.sql.LogicSQL;
import org.apache.shardingsphere.sharding.constant.ShardingOrder;
import
org.apache.shardingsphere.sharding.route.engine.condition.ShardingCondition;
import
org.apache.shardingsphere.sharding.route.engine.condition.ShardingConditions;
-import
org.apache.shardingsphere.sharding.route.engine.condition.engine.InsertClauseShardingConditionEngine;
-import
org.apache.shardingsphere.sharding.route.engine.condition.engine.WhereClauseShardingConditionEngine;
+import
org.apache.shardingsphere.sharding.route.engine.condition.engine.ShardingConditionEngine;
+import
org.apache.shardingsphere.sharding.route.engine.condition.engine.impl.InsertClauseShardingConditionEngine;
+import
org.apache.shardingsphere.sharding.route.engine.condition.engine.impl.WhereClauseShardingConditionEngine;
import
org.apache.shardingsphere.sharding.route.engine.type.ShardingRouteEngineFactory;
import
org.apache.shardingsphere.sharding.route.engine.validator.ShardingStatementValidator;
import
org.apache.shardingsphere.sharding.route.engine.validator.ShardingStatementValidatorFactory;
@@ -61,8 +62,7 @@ public final class ShardingSQLRouter implements
SQLRouter<ShardingRule> {
SQLStatement sqlStatement =
logicSQL.getSqlStatementContext().getSqlStatement();
Optional<ShardingStatementValidator> validator =
ShardingStatementValidatorFactory.newInstance(sqlStatement);
validator.ifPresent(v -> v.preValidate(rule,
logicSQL.getSqlStatementContext(), logicSQL.getParameters(),
logicSQL.getSchema().getMetaData()));
- ShardingConditions shardingConditions = getShardingConditions(
- logicSQL.getParameters(), logicSQL.getSqlStatementContext(),
logicSQL.getSchema().getMetaData().getRuleSchemaMetaData().getConfiguredSchemaMetaData(),
rule);
+ ShardingConditions shardingConditions =
getShardingConditions(logicSQL, rule);
boolean needMergeShardingValues =
isNeedMergeShardingValues(logicSQL.getSqlStatementContext(), rule);
if (sqlStatement instanceof DMLStatement && needMergeShardingValues) {
checkSubqueryShardingValues(logicSQL.getSqlStatementContext(),
rule, shardingConditions);
@@ -73,15 +73,22 @@ public final class ShardingSQLRouter implements
SQLRouter<ShardingRule> {
return result;
}
- private ShardingConditions getShardingConditions(final List<Object>
parameters,
- final
SQLStatementContext<?> sqlStatementContext, final SchemaMetaData
schemaMetaData, final ShardingRule rule) {
- if (sqlStatementContext.getSqlStatement() instanceof DMLStatement) {
- if (sqlStatementContext instanceof InsertStatementContext) {
- return new ShardingConditions(new
InsertClauseShardingConditionEngine(rule,
schemaMetaData).createShardingConditions((InsertStatementContext)
sqlStatementContext, parameters));
- }
- return new ShardingConditions(new
WhereClauseShardingConditionEngine(rule,
schemaMetaData).createShardingConditions(sqlStatementContext, parameters));
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ private ShardingConditions getShardingConditions(final LogicSQL logicSQL,
final ShardingRule rule) {
+ List<ShardingCondition> shardingConditions;
+ if (logicSQL.getSqlStatementContext().getSqlStatement() instanceof
DMLStatement) {
+ ShardingConditionEngine shardingConditionEngine =
createShardingConditionEngine(logicSQL, rule);
+ shardingConditions =
shardingConditionEngine.createShardingConditions(logicSQL.getSqlStatementContext(),
logicSQL.getParameters());
+ } else {
+ shardingConditions = Collections.emptyList();
}
- return new ShardingConditions(Collections.emptyList());
+ return new ShardingConditions(shardingConditions);
+ }
+
+ private ShardingConditionEngine<?> createShardingConditionEngine(final
LogicSQL logicSQL, final ShardingRule rule) {
+ SchemaMetaData schemaMetaData =
logicSQL.getSchema().getMetaData().getRuleSchemaMetaData().getConfiguredSchemaMetaData();
+ return logicSQL.getSqlStatementContext() instanceof
InsertStatementContext
+ ? new InsertClauseShardingConditionEngine(rule,
schemaMetaData) : new WhereClauseShardingConditionEngine(rule, schemaMetaData);
}
private boolean isNeedMergeShardingValues(final SQLStatementContext<?>
sqlStatementContext, final ShardingRule rule) {
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/ShardingConditionEngine.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/ShardingConditionEngine.java
new file mode 100644
index 0000000..df736d9
--- /dev/null
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/ShardingConditionEngine.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package org.apache.shardingsphere.sharding.route.engine.condition.engine;
+
+import
org.apache.shardingsphere.sharding.route.engine.condition.ShardingCondition;
+import
org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
+
+import java.util.List;
+
+/**
+ * Sharding condition engine.
+ */
+public interface ShardingConditionEngine<T extends SQLStatementContext<?>> {
+
+ /**
+ * Create sharding conditions.
+ *
+ * @param sqlStatementContext SQL statement context
+ * @param parameters SQL parameters
+ * @return sharding conditions
+ */
+ List<ShardingCondition> createShardingConditions(T sqlStatementContext,
List<Object> parameters);
+}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngine.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/InsertClauseShardingConditionEngine.java
similarity index 96%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngine.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/InsertClauseShardingConditionEngine.java
index bbf8093..3093df8 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngine.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/InsertClauseShardingConditionEngine.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.route.engine.condition.engine;
+package org.apache.shardingsphere.sharding.route.engine.condition.engine.impl;
import com.google.common.base.Preconditions;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.exception.ShardingSphereException;
import
org.apache.shardingsphere.sharding.route.engine.condition.ExpressionConditionUtils;
import
org.apache.shardingsphere.sharding.route.engine.condition.ShardingCondition;
+import
org.apache.shardingsphere.sharding.route.engine.condition.engine.ShardingConditionEngine;
import org.apache.shardingsphere.sharding.route.spi.SPITimeService;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.strategy.value.ListRouteValue;
@@ -48,19 +49,13 @@ import java.util.stream.IntStream;
* Sharding condition engine for insert clause.
*/
@RequiredArgsConstructor
-public final class InsertClauseShardingConditionEngine {
+public final class InsertClauseShardingConditionEngine implements
ShardingConditionEngine<InsertStatementContext> {
private final ShardingRule shardingRule;
private final SchemaMetaData schemaMetaData;
- /**
- * Create sharding conditions.
- *
- * @param insertStatementContext insert statement context
- * @param parameters SQL parameters
- * @return sharding conditions
- */
+ @Override
public List<ShardingCondition> createShardingConditions(final
InsertStatementContext insertStatementContext, final List<Object> parameters) {
List<ShardingCondition> result = new LinkedList<>();
String tableName =
insertStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/WhereClauseShardingConditionEngine.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java
similarity index 97%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/WhereClauseShardingConditionEngine.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java
index baf85f5..1e3c1c7 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/WhereClauseShardingConditionEngine.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.route.engine.condition.engine;
+package org.apache.shardingsphere.sharding.route.engine.condition.engine.impl;
import com.google.common.collect.Range;
import lombok.RequiredArgsConstructor;
@@ -24,6 +24,7 @@ import
org.apache.shardingsphere.sharding.route.engine.condition.AlwaysFalseRout
import
org.apache.shardingsphere.sharding.route.engine.condition.AlwaysFalseShardingCondition;
import org.apache.shardingsphere.sharding.route.engine.condition.Column;
import
org.apache.shardingsphere.sharding.route.engine.condition.ShardingCondition;
+import
org.apache.shardingsphere.sharding.route.engine.condition.engine.ShardingConditionEngine;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.ConditionValueGeneratorFactory;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.strategy.value.ListRouteValue;
@@ -56,19 +57,13 @@ import java.util.Optional;
* Sharding condition engine for where clause.
*/
@RequiredArgsConstructor
-public final class WhereClauseShardingConditionEngine {
+public final class WhereClauseShardingConditionEngine implements
ShardingConditionEngine<SQLStatementContext<?>> {
private final ShardingRule shardingRule;
private final SchemaMetaData schemaMetaData;
- /**
- * Create sharding conditions.
- *
- * @param sqlStatementContext SQL statement context
- * @param parameters SQL parameters
- * @return sharding conditions
- */
+ @Override
public List<ShardingCondition> createShardingConditions(final
SQLStatementContext<?> sqlStatementContext, final List<Object> parameters) {
if (!(sqlStatementContext instanceof WhereAvailable)) {
return Collections.emptyList();
