Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
a58b6afd
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,发现更多精彩内容 >>
提交
a58b6afd
编写于
6月 05, 2019
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
for #2441, refactor ShardingRouter.route(), remove useless param: logicSQL
上级
ce7e1f18
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
10 addition
and
9 deletion
+10
-9
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/PreparedStatementRoutingEngine.java
...dingsphere/core/route/PreparedStatementRoutingEngine.java
+1
-1
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/StatementRoutingEngine.java
...che/shardingsphere/core/route/StatementRoutingEngine.java
+1
-1
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/router/sharding/DatabaseHintSQLRouter.java
...ere/core/route/router/sharding/DatabaseHintSQLRouter.java
+1
-1
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/router/sharding/ParsingSQLRouter.java
...ngsphere/core/route/router/sharding/ParsingSQLRouter.java
+3
-3
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/router/sharding/ShardingRouter.java
...dingsphere/core/route/router/sharding/ShardingRouter.java
+1
-2
sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/core/route/router/DatabaseHintSQLRouterTest.java
...ngsphere/core/route/router/DatabaseHintSQLRouterTest.java
+3
-1
未找到文件。
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/PreparedStatementRoutingEngine.java
浏览文件 @
a58b6afd
...
...
@@ -63,6 +63,6 @@ public final class PreparedStatementRoutingEngine {
if
(
null
==
sqlStatement
)
{
sqlStatement
=
shardingRouter
.
parse
(
logicSQL
,
true
);
}
return
masterSlaveRouter
.
route
(
shardingRouter
.
route
(
logicSQL
,
parameters
,
sqlStatement
));
return
masterSlaveRouter
.
route
(
shardingRouter
.
route
(
sqlStatement
,
parameters
));
}
}
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/StatementRoutingEngine.java
浏览文件 @
a58b6afd
...
...
@@ -54,6 +54,6 @@ public final class StatementRoutingEngine {
*/
public
SQLRouteResult
route
(
final
String
logicSQL
)
{
SQLStatement
sqlStatement
=
shardingRouter
.
parse
(
logicSQL
,
false
);
return
masterSlaveRouter
.
route
(
shardingRouter
.
route
(
logicSQL
,
Collections
.
emptyList
(),
sqlStatement
));
return
masterSlaveRouter
.
route
(
shardingRouter
.
route
(
sqlStatement
,
Collections
.
emptyList
()
));
}
}
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/router/sharding/DatabaseHintSQLRouter.java
浏览文件 @
a58b6afd
...
...
@@ -51,7 +51,7 @@ public final class DatabaseHintSQLRouter implements ShardingRouter {
@Override
// TODO insert SQL need parse gen key
public
SQLRouteResult
route
(
final
S
tring
logicSQL
,
final
List
<
Object
>
parameters
,
final
SQLStatement
sqlStatement
)
{
public
SQLRouteResult
route
(
final
S
QLStatement
sqlStatement
,
final
List
<
Object
>
parameters
)
{
SQLRouteResult
result
=
new
SQLRouteResult
(
sqlStatement
);
RoutingResult
routingResult
=
new
DatabaseHintRoutingEngine
(
shardingRule
.
getShardingDataSourceNames
().
getDataSourceNames
(),
(
HintShardingStrategy
)
shardingRule
.
getDefaultDatabaseShardingStrategy
()).
route
();
...
...
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/router/sharding/ParsingSQLRouter.java
浏览文件 @
a58b6afd
...
...
@@ -91,7 +91,7 @@ public final class ParsingSQLRouter implements ShardingRouter {
}
@Override
public
SQLRouteResult
route
(
final
S
tring
logicSQL
,
final
List
<
Object
>
parameters
,
final
SQLStatement
sqlStatement
)
{
public
SQLRouteResult
route
(
final
S
QLStatement
sqlStatement
,
final
List
<
Object
>
parameters
)
{
Optional
<
GeneratedKey
>
generatedKey
=
sqlStatement
instanceof
InsertStatement
?
GeneratedKey
.
getGenerateKey
(
shardingRule
,
parameters
,
(
InsertStatement
)
sqlStatement
)
:
Optional
.<
GeneratedKey
>
absent
();
SQLRouteResult
result
=
new
SQLRouteResult
(
sqlStatement
,
generatedKey
.
orNull
());
...
...
@@ -109,7 +109,7 @@ public final class ParsingSQLRouter implements ShardingRouter {
}
RoutingResult
routingResult
=
RoutingEngineFactory
.
newInstance
(
shardingRule
,
shardingMetaData
.
getDataSource
(),
sqlStatement
,
optimizeResult
).
route
();
if
(
sqlStatement
instanceof
SelectStatement
&&
null
!=
((
SelectStatement
)
sqlStatement
).
getLimit
()
&&
!
routingResult
.
isSingleRouting
())
{
result
.
setLimit
(
getProcessedLimit
(
parameters
,
(
SelectStatement
)
sqlStatement
));
result
.
setLimit
(
createLimit
((
SelectStatement
)
sqlStatement
,
parameters
));
}
if
(
needMerge
)
{
Preconditions
.
checkState
(
1
==
routingResult
.
getRoutingUnits
().
size
(),
"Must have one sharding with subquery."
);
...
...
@@ -189,7 +189,7 @@ public final class ParsingSQLRouter implements ShardingRouter {
}
}
private
Limit
getProcessedLimit
(
final
List
<
Object
>
parameters
,
final
SelectStatement
selectStatement
)
{
private
Limit
createLimit
(
final
SelectStatement
selectStatement
,
final
List
<
Object
>
parameters
)
{
boolean
isNeedFetchAll
=
(!
selectStatement
.
getGroupByItems
().
isEmpty
()
||
!
selectStatement
.
getAggregationSelectItems
().
isEmpty
())
&&
!
selectStatement
.
isSameGroupByAndOrderByItems
();
Limit
result
=
createLimit
(
selectStatement
.
getLimit
());
result
.
processParameters
(
parameters
,
isNeedFetchAll
,
databaseType
.
name
());
...
...
sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/router/sharding/ShardingRouter.java
浏览文件 @
a58b6afd
...
...
@@ -41,10 +41,9 @@ public interface ShardingRouter {
/**
* Route SQL.
*
* @param logicSQL logic SQL
* @param sqlStatement SQL statement
* @param parameters parameters
* @return parse result
*/
SQLRouteResult
route
(
S
tring
logicSQL
,
List
<
Object
>
parameters
,
SQLStatement
sqlStatement
);
SQLRouteResult
route
(
S
QLStatement
sqlStatement
,
List
<
Object
>
parameters
);
}
sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/core/route/router/DatabaseHintSQLRouterTest.java
浏览文件 @
a58b6afd
...
...
@@ -66,6 +66,8 @@ public final class DatabaseHintSQLRouterTest {
@Test
public
void
assertRoute
()
{
hintManager
.
addDatabaseShardingValue
(
""
,
1
);
assertNotNull
(
databaseHintSQLRouter
.
route
(
"select t from tbl t"
,
Collections
.
emptyList
(),
new
DQLStatement
()));
DQLStatement
dqlStatement
=
new
DQLStatement
();
dqlStatement
.
setLogicSQL
(
"select t from tbl t"
);
assertNotNull
(
databaseHintSQLRouter
.
route
(
dqlStatement
,
Collections
.
emptyList
()));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录