From 02e3f6df71ccf1a34cfff537418ae3c4394acc5c Mon Sep 17 00:00:00 2001
From: terrymanu <terrymanu@163.com>
Date: Thu, 25 Apr 2019 14:47:38 +0800
Subject: [PATCH] for #2084, OrConditionFiller => ShardingOrConditionFiller

---
 .../antlr/filler/encrypt/dml/EncryptOrConditionFiller.java   | 2 +-
 ...OrConditionFiller.java => ShardingOrConditionFiller.java} | 5 +++--
 .../parse/antlr/filler/sharding/dml/ShardingWhereFiller.java | 2 +-
 .../filler/sharding/dml/select/SubqueryConditionFiller.java  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/{OrConditionFiller.java => ShardingOrConditionFiller.java} (98%)

diff --git a/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/encrypt/dml/EncryptOrConditionFiller.java b/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/encrypt/dml/EncryptOrConditionFiller.java
index 92bb64f7454f5..2636e5161bf6a 100644
--- a/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/encrypt/dml/EncryptOrConditionFiller.java
+++ b/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/encrypt/dml/EncryptOrConditionFiller.java
@@ -42,7 +42,7 @@
 import java.util.Set;
 
 /**
- * Encrypt or condition filler.
+ * Or condition filler for encrypt.
  *
  * @author duhongjun
  */
diff --git a/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/OrConditionFiller.java b/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingOrConditionFiller.java
similarity index 98%
rename from sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/OrConditionFiller.java
rename to sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingOrConditionFiller.java
index 0206f8dfdf077..34ae5dd64cf3f 100644
--- a/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/OrConditionFiller.java
+++ b/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingOrConditionFiller.java
@@ -48,12 +48,13 @@
 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;
     
diff --git a/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingWhereFiller.java b/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingWhereFiller.java
index 3a134e734e7bc..60597c29f1c4f 100644
--- a/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingWhereFiller.java
+++ b/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/ShardingWhereFiller.java
@@ -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;
diff --git a/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/select/SubqueryConditionFiller.java b/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/select/SubqueryConditionFiller.java
index d0d63217846ec..666ce6766ab11 100644
--- a/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/select/SubqueryConditionFiller.java
+++ b/sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/select/SubqueryConditionFiller.java
@@ -22,7 +22,7 @@
 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));
         }