Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
5eef44da
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
5eef44da
编写于
6月 06, 2019
作者:
L
Liang Zhang
提交者:
GitHub
6月 06, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2510 from tristaZero/dev
delete MasterSlaveTokenGenerateEngine
上级
97d6d3bb
d9500855
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
5 addition
and
51 deletion
+5
-51
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java
.../apache/shardingsphere/core/rewrite/SQLRewriteEngine.java
+0
-3
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/BaseTokenGenerateEngine.java
...ingsphere/core/rewrite/token/BaseTokenGenerateEngine.java
+2
-0
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/MasterSlaveTokenGenerateEngine.java
...re/core/rewrite/token/MasterSlaveTokenGenerateEngine.java
+0
-44
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/ShardingTokenGenerateEngine.java
...phere/core/rewrite/token/ShardingTokenGenerateEngine.java
+0
-1
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/generator/RemoveTokenGenerator.java
...re/core/rewrite/token/generator/RemoveTokenGenerator.java
+3
-3
未找到文件。
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java
浏览文件 @
5eef44da
...
...
@@ -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
浏览文件 @
5eef44da
...
...
@@ -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
已删除
100644 → 0
浏览文件 @
97d6d3bb
/*
* 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
浏览文件 @
5eef44da
...
...
@@ -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
浏览文件 @
5eef44da
...
...
@@ -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.
Sharding
Rule
;
import
org.apache.shardingsphere.core.rule.
Base
Rule
;
import
java.util.Collection
;
import
java.util.LinkedList
;
...
...
@@ -31,10 +31,10 @@ import java.util.LinkedList;
*
* @author zhangliang
*/
public
final
class
RemoveTokenGenerator
implements
CollectionSQLTokenGenerator
<
Sharding
Rule
>
{
public
final
class
RemoveTokenGenerator
implements
CollectionSQLTokenGenerator
<
Base
Rule
>
{
@Override
public
Collection
<
RemoveToken
>
generateSQLTokens
(
final
SQLStatement
sqlStatement
,
final
ShardingRule
sharding
Rule
)
{
public
Collection
<
RemoveToken
>
generateSQLTokens
(
final
SQLStatement
sqlStatement
,
final
BaseRule
base
Rule
)
{
Collection
<
RemoveToken
>
result
=
new
LinkedList
<>();
for
(
SQLSegment
each
:
sqlStatement
.
getSqlSegments
())
{
if
(
each
instanceof
RemoveAvailable
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录