Commit db565499 authored by terrymanu's avatar terrymanu
Browse files

for #2084, OrConditionFiller => OrPredicateFiller

parent 1a5e8df1

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

+2 −2
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ import java.util.HashSet; 
import java.util.Set;



/**

 * Or condition filler for encrypt.

 * Or predicate filler for encrypt.

 *

 * @author duhongjun

 */

@RequiredArgsConstructor

public final class EncryptOrConditionFiller implements SQLSegmentFiller<OrPredicateSegment> {

public final class EncryptOrPredicateFiller implements SQLSegmentFiller<OrPredicateSegment> {

    

    private final EncryptRule encryptRule;

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

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

    @Override

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

        new EncryptOrConditionFiller(encryptRule, shardingTableMetaData).fill(sqlSegment.getOrPredicate(), sqlStatement);

        new EncryptOrPredicateFiller(encryptRule, 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/ShardingOrConditionFiller.java→sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingOrPredicateFiller.java

+2 −2
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ import java.util.List; 
import java.util.Set;



/**

 * Or condition filler for sharding.

 * Or predicate filler for sharding.

 *

 * @author duhongjun

 * @author zhangliang

 */

@RequiredArgsConstructor

public final class ShardingOrConditionFiller implements SQLSegmentFiller<OrPredicateSegment> {

public final class ShardingOrPredicateFiller 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 ShardingOrConditionFiller(shardingRule, shardingTableMetaData).fill(sqlSegment.getOrPredicate(), sqlStatement);

        new ShardingOrPredicateFiller(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/SubqueryPredicateFiller.java

+3 −3
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.ShardingOrConditionFiller;

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

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,9 +44,9 @@ public final class SubqueryPredicateFiller implements SQLSegmentFiller<SubqueryP 
    @Override

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

        SelectStatement selectStatement = (SelectStatement) sqlStatement;

        ShardingOrConditionFiller shardingOrConditionFiller = new ShardingOrConditionFiller(shardingRule, shardingTableMetaData);

        ShardingOrPredicateFiller shardingOrPredicateFiller = new ShardingOrPredicateFiller(shardingRule, shardingTableMetaData);

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

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

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

        }

    }

}