delete MasterSlaveTokenGenerateEngine

sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java

@@ -26,7 +26,6 @@ import org.apache.shardingsphere.core.rewrite.rewriter.sql.BaseSQLRewriter;
 import org.apache.shardingsphere.core.rewrite.rewriter.sql.SQLRewriter;
 import org.apache.shardingsphere.core.rewrite.token.BaseTokenGenerateEngine;
 import org.apache.shardingsphere.core.rewrite.token.EncryptTokenGenerateEngine;
-import org.apache.shardingsphere.core.rewrite.token.MasterSlaveTokenGenerateEngine;
 import org.apache.shardingsphere.core.rewrite.token.ShardingTokenGenerateEngine;
 import org.apache.shardingsphere.core.rewrite.token.pojo.SQLToken;
 import org.apache.shardingsphere.core.route.SQLUnit;
@@ -100,8 +99,6 @@ public final class SQLRewriteEngine {
             result.addAll(new EncryptTokenGenerateEngine().generateSQLTokens(sqlStatement, shardingRule.getEncryptRule(), isSingleRoute));
         } else if (baseRule instanceof EncryptRule) {
             result.addAll(new EncryptTokenGenerateEngine().generateSQLTokens(sqlStatement, (EncryptRule) baseRule, isSingleRoute));
-        } else {
-            result.addAll(new MasterSlaveTokenGenerateEngine().generateSQLTokens(sqlStatement, null, isSingleRoute));
         }
         Collections.sort(result);
         return result;

sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/BaseTokenGenerateEngine.java

@@ -19,6 +19,7 @@ package org.apache.shardingsphere.core.rewrite.token;
 
 import org.apache.shardingsphere.core.rewrite.token.generator.InsertColumnsTokenGenerator;
 import org.apache.shardingsphere.core.rewrite.token.generator.InsertValuesTokenGenerator;
+import org.apache.shardingsphere.core.rewrite.token.generator.RemoveTokenGenerator;
 import org.apache.shardingsphere.core.rewrite.token.generator.SQLTokenGenerator;
 import org.apache.shardingsphere.core.rule.BaseRule;
 
@@ -37,6 +38,7 @@ public final class BaseTokenGenerateEngine extends SQLTokenGenerateEngine<BaseRu
     static {
         SQL_TOKEN_GENERATORS.add(new InsertColumnsTokenGenerator());
         SQL_TOKEN_GENERATORS.add(new InsertValuesTokenGenerator());
+        SQL_TOKEN_GENERATORS.add(new RemoveTokenGenerator());
     }
     
     @Override

sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/MasterSlaveTokenGenerateEngine.java

-/*
- * 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.core.rewrite.token;
-
-import org.apache.shardingsphere.core.rewrite.token.generator.RemoveTokenGenerator;
-import org.apache.shardingsphere.core.rewrite.token.generator.SQLTokenGenerator;
-import org.apache.shardingsphere.core.rule.ShardingRule;
-
-import java.util.Collection;
-import java.util.LinkedList;
-
-/**
- * SQL token generator for master-slave.
- *
- * @author zhangliang
- */
-public final class MasterSlaveTokenGenerateEngine extends SQLTokenGenerateEngine<ShardingRule> {
-    
-    private static final Collection<SQLTokenGenerator> SQL_TOKEN_GENERATORS = new LinkedList<>();
-    
-    static {
-        SQL_TOKEN_GENERATORS.add(new RemoveTokenGenerator());
-    }
-    
-    @Override
-    protected Collection<SQLTokenGenerator> getSQLTokenGenerators() {
-        return SQL_TOKEN_GENERATORS;
-    }
-}

sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/ShardingTokenGenerateEngine.java

@@ -50,7 +50,6 @@ public final class ShardingTokenGenerateEngine extends SQLTokenGenerateEngine<Sh
         SQL_TOKEN_GENERATORS.add(new OrderByTokenGenerator());
         SQL_TOKEN_GENERATORS.add(new AggregationDistinctTokenGenerator());
         SQL_TOKEN_GENERATORS.add(new IndexTokenGenerator());
-        SQL_TOKEN_GENERATORS.add(new RemoveTokenGenerator());
         SQL_TOKEN_GENERATORS.add(new OffsetTokenGenerator());
         SQL_TOKEN_GENERATORS.add(new RowCountTokenGenerator());
         SQL_TOKEN_GENERATORS.add(new InsertGeneratedKeyTokenGenerator());

sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/generator/RemoveTokenGenerator.java

@@ -21,7 +21,7 @@ import org.apache.shardingsphere.core.parse.sql.segment.RemoveAvailable;
 import org.apache.shardingsphere.core.parse.sql.segment.SQLSegment;
 import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement;
 import org.apache.shardingsphere.core.rewrite.token.pojo.RemoveToken;
-import org.apache.shardingsphere.core.rule.ShardingRule;
+import org.apache.shardingsphere.core.rule.BaseRule;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -31,10 +31,10 @@ import java.util.LinkedList;
  *
  * @author zhangliang
  */
-public final class RemoveTokenGenerator implements CollectionSQLTokenGenerator<ShardingRule> {
+public final class RemoveTokenGenerator implements CollectionSQLTokenGenerator<BaseRule> {
     
     @Override
-    public Collection<RemoveToken> generateSQLTokens(final SQLStatement sqlStatement, final ShardingRule shardingRule) {
+    public Collection<RemoveToken> generateSQLTokens(final SQLStatement sqlStatement, final BaseRule baseRule) {
         Collection<RemoveToken> result = new LinkedList<>();
         for (SQLSegment each : sqlStatement.getSqlSegments()) {
             if (each instanceof RemoveAvailable) {