Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
06a3f5d5
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 搜索 >>
提交
06a3f5d5
编写于
3月 26, 2018
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
For #673: HashMap = LinkedHashMap for test case
上级
382264fd
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
22 addition
and
23 deletion
+22
-23
sharding-core/src/main/java/io/shardingjdbc/core/rewrite/SQLRewriteEngine.java
...n/java/io/shardingjdbc/core/rewrite/SQLRewriteEngine.java
+8
-8
sharding-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingRuleConfiguration.java
...dbc/core/yaml/sharding/YamlShardingRuleConfiguration.java
+4
-5
sharding-jdbc-core-spring/sharding-jdbc-core-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/SpringBootConfiguration.java
.../io/shardingjdbc/spring/boot/SpringBootConfiguration.java
+2
-2
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/threadlocal/ExecutorDataMap.java
...ardingjdbc/core/executor/threadlocal/ExecutorDataMap.java
+2
-2
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/type/batch/BatchPreparedStatementUnit.java
.../core/executor/type/batch/BatchPreparedStatementUnit.java
+2
-2
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java
...ion/spring/boot/OrchestrationSpringBootConfiguration.java
+2
-2
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/OrchestrationFacade.java
...rdingjdbc/orchestration/internal/OrchestrationFacade.java
+2
-2
未找到文件。
sharding-core/src/main/java/io/shardingjdbc/core/rewrite/SQLRewriteEngine.java
浏览文件 @
06a3f5d5
...
...
@@ -233,26 +233,26 @@ public final class SQLRewriteEngine {
private
Map
<
String
,
String
>
getTableTokens
(
final
TableUnit
tableUnit
)
{
String
logicTableName
=
tableUnit
.
getLogicTableName
().
toLowerCase
();
Map
<
String
,
String
>
tableTokens
=
new
HashMap
<>();
tableTokens
.
put
(
logicTableName
,
tableUnit
.
getActualTableName
());
Map
<
String
,
String
>
result
=
new
HashMap
<>();
result
.
put
(
logicTableName
,
tableUnit
.
getActualTableName
());
Optional
<
BindingTableRule
>
bindingTableRule
=
shardingRule
.
findBindingTableRule
(
logicTableName
);
if
(
bindingTableRule
.
isPresent
())
{
tableTokens
.
putAll
(
getBindingTableTokens
(
tableUnit
,
bindingTableRule
.
get
()));
result
.
putAll
(
getBindingTableTokens
(
tableUnit
,
bindingTableRule
.
get
()));
}
return
tableTokens
;
return
result
;
}
private
Map
<
String
,
String
>
getTableTokens
(
final
CartesianTableReference
cartesianTableReference
)
{
Map
<
String
,
String
>
tableTokens
=
new
HashMap
<>();
Map
<
String
,
String
>
result
=
new
HashMap
<>();
for
(
TableUnit
each
:
cartesianTableReference
.
getTableUnits
())
{
String
logicTableName
=
each
.
getLogicTableName
().
toLowerCase
();
tableTokens
.
put
(
logicTableName
,
each
.
getActualTableName
());
result
.
put
(
logicTableName
,
each
.
getActualTableName
());
Optional
<
BindingTableRule
>
bindingTableRule
=
shardingRule
.
findBindingTableRule
(
logicTableName
);
if
(
bindingTableRule
.
isPresent
())
{
tableTokens
.
putAll
(
getBindingTableTokens
(
each
,
bindingTableRule
.
get
()));
result
.
putAll
(
getBindingTableTokens
(
each
,
bindingTableRule
.
get
()));
}
}
return
tableTokens
;
return
result
;
}
private
Map
<
String
,
String
>
getBindingTableTokens
(
final
TableUnit
tableUnit
,
final
BindingTableRule
bindingTableRule
)
{
...
...
sharding-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingRuleConfiguration.java
浏览文件 @
06a3f5d5
...
...
@@ -25,13 +25,12 @@ import lombok.Setter;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.HashMap
;
import
java.util.
Linked
HashMap
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map.Entry
;
import
java.util.Properties
;
import
java.util.concurrent.ConcurrentHashMap
;
/**
* Sharding rule configuration for yaml.
...
...
@@ -44,7 +43,7 @@ public class YamlShardingRuleConfiguration {
private
String
defaultDataSourceName
;
private
Map
<
String
,
YamlTableRuleConfiguration
>
tables
=
new
HashMap
<>();
private
Map
<
String
,
YamlTableRuleConfiguration
>
tables
=
new
Linked
HashMap
<>();
private
List
<
String
>
bindingTables
=
new
ArrayList
<>();
...
...
@@ -54,9 +53,9 @@ public class YamlShardingRuleConfiguration {
private
String
defaultKeyGeneratorClass
;
private
Map
<
String
,
YamlMasterSlaveRuleConfiguration
>
masterSlaveRules
=
new
HashMap
<>();
private
Map
<
String
,
YamlMasterSlaveRuleConfiguration
>
masterSlaveRules
=
new
Linked
HashMap
<>();
private
Map
<
String
,
Object
>
configMap
=
new
Concurrent
HashMap
<>();
private
Map
<
String
,
Object
>
configMap
=
new
Linked
HashMap
<>();
private
Properties
props
=
new
Properties
();
...
...
sharding-jdbc-core-spring/sharding-jdbc-core-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/SpringBootConfiguration.java
浏览文件 @
06a3f5d5
...
...
@@ -34,7 +34,7 @@ import org.springframework.core.env.Environment;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
import
java.util.HashMap
;
import
java.util.
Linked
HashMap
;
import
java.util.Map
;
/**
...
...
@@ -52,7 +52,7 @@ public class SpringBootConfiguration implements EnvironmentAware {
@Autowired
private
SpringBootMasterSlaveRuleConfigurationProperties
masterSlaveProperties
;
private
final
Map
<
String
,
DataSource
>
dataSourceMap
=
new
HashMap
<>();
private
final
Map
<
String
,
DataSource
>
dataSourceMap
=
new
Linked
HashMap
<>();
/**
* Get data source bean.
...
...
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/threadlocal/ExecutorDataMap.java
浏览文件 @
06a3f5d5
...
...
@@ -20,7 +20,7 @@ package io.shardingjdbc.core.executor.threadlocal;
import
lombok.AccessLevel
;
import
lombok.NoArgsConstructor
;
import
java.util.HashMap
;
import
java.util.
Linked
HashMap
;
import
java.util.Map
;
/**
...
...
@@ -35,7 +35,7 @@ public final class ExecutorDataMap {
@Override
protected
Map
<
String
,
Object
>
initialValue
()
{
return
new
HashMap
<>();
return
new
Linked
HashMap
<>();
}
};
...
...
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/type/batch/BatchPreparedStatementUnit.java
浏览文件 @
06a3f5d5
...
...
@@ -24,7 +24,7 @@ import lombok.Getter;
import
lombok.RequiredArgsConstructor
;
import
java.sql.PreparedStatement
;
import
java.util.HashMap
;
import
java.util.
Linked
HashMap
;
import
java.util.Map
;
/**
...
...
@@ -40,7 +40,7 @@ public final class BatchPreparedStatementUnit implements BaseStatementUnit {
private
final
PreparedStatement
statement
;
private
final
Map
<
Integer
,
Integer
>
jdbcAndActualAddBatchCallTimesMap
=
new
HashMap
<>();
private
final
Map
<
Integer
,
Integer
>
jdbcAndActualAddBatchCallTimesMap
=
new
Linked
HashMap
<>();
@Getter
(
AccessLevel
.
NONE
)
private
int
actualCallAddBatchTimes
;
...
...
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java
浏览文件 @
06a3f5d5
...
...
@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
import
java.util.HashMap
;
import
java.util.
Linked
HashMap
;
import
java.util.Map
;
/**
...
...
@@ -48,7 +48,7 @@ import java.util.Map;
@EnableConfigurationProperties
({
SpringBootShardingRuleConfigurationProperties
.
class
,
SpringBootMasterSlaveRuleConfigurationProperties
.
class
,
SpringBootOrchestrationConfigurationProperties
.
class
})
public
class
OrchestrationSpringBootConfiguration
implements
EnvironmentAware
{
private
final
Map
<
String
,
DataSource
>
dataSourceMap
=
new
HashMap
<>();
private
final
Map
<
String
,
DataSource
>
dataSourceMap
=
new
Linked
HashMap
<>();
@Autowired
private
SpringBootShardingRuleConfigurationProperties
shardingProperties
;
...
...
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/OrchestrationFacade.java
浏览文件 @
06a3f5d5
...
...
@@ -36,7 +36,7 @@ import io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperRegistryCenter;
import
lombok.extern.slf4j.Slf4j
;
import
javax.sql.DataSource
;
import
java.util.HashMap
;
import
java.util.
Linked
HashMap
;
import
java.util.Map
;
import
java.util.Map.Entry
;
import
java.util.Properties
;
...
...
@@ -128,7 +128,7 @@ public final class OrchestrationFacade implements AutoCloseable {
}
private
Map
<
String
,
DataSource
>
getActualDataSourceMapForMasterSlave
(
final
Map
<
String
,
DataSource
>
dataSourceMap
)
{
Map
<
String
,
DataSource
>
result
=
new
HashMap
<>();
Map
<
String
,
DataSource
>
result
=
new
Linked
HashMap
<>();
for
(
Entry
<
String
,
DataSource
>
entry
:
dataSourceMap
.
entrySet
())
{
if
(
entry
.
getValue
()
instanceof
MasterSlaveDataSource
)
{
MasterSlaveDataSource
masterSlaveDataSource
=
(
MasterSlaveDataSource
)
entry
.
getValue
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录