Commit 02e3f6df authored by terrymanu's avatar terrymanu
Browse files

for #2084, OrConditionFiller => ShardingOrConditionFiller

parent e93506d0

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/encrypt/dml/EncryptOrConditionFiller.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import java.util.Map; 
import java.util.Set;



/**

 * Encrypt or condition filler.

 * Or condition filler for encrypt.

 *

 * @author duhongjun

 */

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/OrConditionFiller.java→sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingOrConditionFiller.java

+3 −2
Original line number Diff line number Diff line
@@ -48,12 +48,13 @@ import java.util.Map; 
import java.util.Set;



/**

 * Or condition filler.

 * Or condition filler for sharding.

 *

 * @author duhongjun

 * @author zhangliang

 */

@RequiredArgsConstructor

public final class OrConditionFiller implements SQLSegmentFiller<OrPredicateSegment> {

public final class ShardingOrConditionFiller implements SQLSegmentFiller<OrPredicateSegment> {

    

    private final ShardingRule shardingRule;

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingWhereFiller.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public final class ShardingWhereFiller implements SQLSegmentFiller<WhereSegment> 
    

    @Override

    public void fill(final WhereSegment sqlSegment, final SQLStatement sqlStatement) {

        new OrConditionFiller(shardingRule, shardingTableMetaData).fill(sqlSegment.getOrPredicate(), sqlStatement);

        new ShardingOrConditionFiller(shardingRule, shardingTableMetaData).fill(sqlSegment.getOrPredicate(), sqlStatement);

        sqlStatement.setParametersIndex(sqlSegment.getParameterCount());

        if (sqlStatement instanceof DeleteStatement) {

            DeleteStatement deleteStatement = (DeleteStatement) sqlStatement;

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/select/SubqueryConditionFiller.java

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData; 
import org.apache.shardingsphere.core.parse.antlr.filler.api.SQLSegmentFiller;

import org.apache.shardingsphere.core.parse.antlr.filler.api.ShardingRuleAwareFiller;

import org.apache.shardingsphere.core.parse.antlr.filler.api.ShardingTableMetaDataAwareFiller;

import org.apache.shardingsphere.core.parse.antlr.filler.sharding.dml.OrConditionFiller;

import org.apache.shardingsphere.core.parse.antlr.filler.sharding.dml.ShardingOrConditionFiller;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.predicate.OrPredicateSegment;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.predicate.SubqueryPredicateSegment;

import org.apache.shardingsphere.core.parse.antlr.sql.statement.SQLStatement;
@@ -44,7 +44,7 @@ public final class SubqueryConditionFiller implements SQLSegmentFiller<SubqueryP 
    @Override

    public void fill(final SubqueryPredicateSegment sqlSegment, final SQLStatement sqlStatement) {

        SelectStatement selectStatement = (SelectStatement) sqlStatement;

        OrConditionFiller orConditionFiller = new OrConditionFiller(shardingRule, shardingTableMetaData);

        ShardingOrConditionFiller orConditionFiller = new ShardingOrConditionFiller(shardingRule, shardingTableMetaData);

        for (OrPredicateSegment each : sqlSegment.getOrPredicates()) {

            selectStatement.getSubqueryConditions().add(orConditionFiller.buildCondition(each, sqlStatement, shardingRule, shardingTableMetaData));

        }