Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
2b99da55
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
2b99da55
编写于
10月 29, 2020
作者:
kimmking
提交者:
GitHub
10月 29, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
minor refactoring (#7941)
* minor refactoring * fix code style
上级
1bc809c7
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
18 addition
and
18 deletion
+18
-18
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
...org/apache/shardingsphere/sharding/rule/ShardingRule.java
+12
-16
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
...va/org/apache/shardingsphere/sharding/rule/TableRule.java
+6
-2
未找到文件。
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
浏览文件 @
2b99da55
...
...
@@ -118,23 +118,17 @@ public final class ShardingRule implements DataNodeRoutedRule {
if
(
tableRuleConfigs
.
isEmpty
())
{
return
dataSourceNames
;
}
Collection
<
String
>
result
=
new
LinkedHashSet
<>();
for
(
ShardingTableRuleConfiguration
each
:
tableRuleConfigs
)
{
if
(
null
==
each
.
getActualDataNodes
())
{
if
(
tableRuleConfigs
.
stream
().
map
(
ShardingTableRuleConfiguration:
:
getActualDataNodes
).
anyMatch
(
each
->
null
==
each
||
each
.
isEmpty
()))
{
return
dataSourceNames
;
}
result
.
addAll
(
getDataSourceNames
(
each
)
);
}
Collection
<
String
>
result
=
new
LinkedHashSet
<>(
);
tableRuleConfigs
.
forEach
(
each
->
result
.
addAll
(
getDataSourceNames
(
each
)));
return
result
;
}
private
Collection
<
String
>
getDataSourceNames
(
final
ShardingTableRuleConfiguration
shardingTableRuleConfig
)
{
List
<
String
>
actualDataNodes
=
new
InlineExpressionParser
(
shardingTableRuleConfig
.
getActualDataNodes
()).
splitAndEvaluate
();
Collection
<
String
>
result
=
new
LinkedHashSet
<>(
actualDataNodes
.
size
(),
1
);
for
(
String
each
:
actualDataNodes
)
{
result
.
add
(
new
DataNode
(
each
).
getDataSourceName
());
}
return
result
;
return
actualDataNodes
.
stream
().
map
(
each
->
new
DataNode
(
each
).
getDataSourceName
()).
collect
(
Collectors
.
toList
());
}
private
Collection
<
TableRule
>
createTableRules
(
final
Collection
<
ShardingTableRuleConfiguration
>
tableRuleConfigurations
,
final
KeyGenerateStrategyConfiguration
defaultKeyGenerateStrategyConfig
)
{
...
...
@@ -144,11 +138,13 @@ public final class ShardingRule implements DataNodeRoutedRule {
private
Collection
<
TableRule
>
createAutoTableRules
(
final
Collection
<
ShardingAutoTableRuleConfiguration
>
autoTableRuleConfigurations
,
final
KeyGenerateStrategyConfiguration
defaultKeyGenerateStrategyConfig
)
{
return
autoTableRuleConfigurations
.
stream
().
map
(
each
->
{
each
->
createAutoTableRule
(
defaultKeyGenerateStrategyConfig
,
each
)).
collect
(
Collectors
.
toList
());
}
private
TableRule
createAutoTableRule
(
final
KeyGenerateStrategyConfiguration
defaultKeyGenerateStrategyConfig
,
final
ShardingAutoTableRuleConfiguration
each
)
{
ShardingAlgorithm
shardingAlgorithm
=
null
==
each
.
getShardingStrategy
()
?
null
:
shardingAlgorithms
.
get
(
each
.
getShardingStrategy
().
getShardingAlgorithmName
());
Preconditions
.
checkState
(
shardingAlgorithm
instanceof
ShardingAutoTableAlgorithm
,
"Sharding auto table rule configuration must match sharding auto table algorithm."
);
return
new
TableRule
(
each
,
dataSourceNames
,
(
ShardingAutoTableAlgorithm
)
shardingAlgorithm
,
getDefaultGenerateKeyColumn
(
defaultKeyGenerateStrategyConfig
));
}).
collect
(
Collectors
.
toList
());
}
private
String
getDefaultGenerateKeyColumn
(
final
KeyGenerateStrategyConfiguration
defaultKeyGenerateStrategyConfig
)
{
...
...
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
浏览文件 @
2b99da55
...
...
@@ -119,11 +119,15 @@ public final class TableRule {
if
(
null
==
tableShardingStrategyConfig
)
{
return
new
LinkedList
<>();
}
List
<
String
>
result
=
new
LinkedList
<>();
List
<
String
>
dataSources
=
Strings
.
isNullOrEmpty
(
tableRuleConfig
.
getActualDataSources
())
?
new
LinkedList
<>(
dataSourceNames
)
:
new
InlineExpressionParser
(
tableRuleConfig
.
getActualDataSources
()).
splitAndEvaluate
();
return
fillDataSouceNames
(
shardingAlgorithm
.
getAutoTablesAmount
(),
dataSources
);
}
private
List
<
String
>
fillDataSouceNames
(
final
int
amount
,
final
List
<
String
>
dataSources
)
{
List
<
String
>
result
=
new
LinkedList
<>();
Iterator
<
String
>
iterator
=
dataSources
.
iterator
();
for
(
int
i
=
0
;
i
<
shardingAlgorithm
.
getAutoTablesAmount
()
;
i
++)
{
for
(
int
i
=
0
;
i
<
amount
;
i
++)
{
if
(!
iterator
.
hasNext
())
{
iterator
=
dataSources
.
iterator
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录