Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
cad130f8
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 搜索 >>
提交
cad130f8
编写于
11月 01, 2017
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor orchestration
上级
33a08cc1
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
72 addition
and
42 deletion
+72
-42
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java
.../datasource/OrchestrationSpringMasterSlaveDataSource.java
+8
-8
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java
...ing/datasource/OrchestrationSpringShardingDataSource.java
+6
-6
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java
...ration/api/OrchestrationMasterSlaveDataSourceFactory.java
+3
-1
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java
...estration/api/OrchestrationShardingDataSourceFactory.java
+4
-2
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/datasource/OrchestrationMasterSlaveDataSource.java
...on/api/datasource/OrchestrationMasterSlaveDataSource.java
+18
-3
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/datasource/OrchestrationShardingDataSource.java
...ation/api/datasource/OrchestrationShardingDataSource.java
+24
-10
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/config/ConfigurationService.java
...c/orchestration/internal/config/ConfigurationService.java
+3
-3
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/state/InstanceStateService.java
...bc/orchestration/internal/state/InstanceStateService.java
+2
-5
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/storage/DataNodeStorage.java
...gjdbc/orchestration/internal/storage/DataNodeStorage.java
+4
-4
未找到文件。
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java
浏览文件 @
cad130f8
...
...
@@ -44,24 +44,24 @@ public class OrchestrationSpringMasterSlaveDataSource extends MasterSlaveDataSou
private
final
InstanceStateService
instanceStateService
;
private
final
OrchestrationMasterSlaveConfiguration
orchestrationMasterSlaveC
onfig
;
private
final
OrchestrationMasterSlaveConfiguration
c
onfig
;
@Setter
private
ApplicationContext
applicationContext
;
public
OrchestrationSpringMasterSlaveDataSource
(
final
String
name
,
final
boolean
overwrite
,
final
CoordinatorRegistryCenter
registryCenter
,
final
Map
<
String
,
DataSource
>
dataSourceMap
,
final
Ma
sterSlaveRuleConfiguration
masterSlaveRuleC
onfig
)
throws
SQLException
{
super
(
masterSlaveRuleC
onfig
.
build
(
dataSourceMap
));
orchestrationMasterSlaveConfig
=
new
OrchestrationMasterSlaveConfiguration
(
name
,
overwrite
,
registryCenter
,
dataSourceMap
,
masterSlaveRuleC
onfig
);
configurationService
=
new
ConfigurationService
(
registryCenter
,
name
);
instanceStateService
=
new
InstanceStateService
(
registryCenter
,
name
);
public
OrchestrationSpringMasterSlaveDataSource
(
final
String
name
,
final
boolean
overwrite
,
final
CoordinatorRegistryCenter
registryCenter
,
final
Ma
p
<
String
,
DataSource
>
dataSourceMap
,
final
MasterSlaveRuleConfiguration
c
onfig
)
throws
SQLException
{
super
(
c
onfig
.
build
(
dataSourceMap
));
this
.
config
=
new
OrchestrationMasterSlaveConfiguration
(
name
,
overwrite
,
registryCenter
,
dataSourceMap
,
c
onfig
);
configurationService
=
new
ConfigurationService
(
name
,
registryCenter
);
instanceStateService
=
new
InstanceStateService
(
name
,
registryCenter
);
}
/**
* initial orchestration spring master-slave data source.
*/
public
void
init
()
{
configurationService
.
addMasterSlaveConfiguration
(
orchestrationMasterSlaveC
onfig
,
this
);
configurationService
.
addMasterSlaveConfiguration
(
c
onfig
,
this
);
instanceStateService
.
addMasterSlaveState
(
this
);
}
...
...
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java
浏览文件 @
cad130f8
...
...
@@ -48,7 +48,7 @@ public class OrchestrationSpringShardingDataSource extends ShardingDataSource im
private
final
InstanceStateService
instanceStateService
;
private
final
OrchestrationShardingConfiguration
orchestrationShardingC
onfig
;
private
final
OrchestrationShardingConfiguration
c
onfig
;
private
final
Properties
props
;
...
...
@@ -58,9 +58,9 @@ public class OrchestrationSpringShardingDataSource extends ShardingDataSource im
public
OrchestrationSpringShardingDataSource
(
final
String
name
,
final
boolean
overwrite
,
final
CoordinatorRegistryCenter
registryCenter
,
final
Map
<
String
,
DataSource
>
dataSourceMap
,
final
ShardingRuleConfiguration
shardingRuleConfig
,
final
Properties
props
)
throws
SQLException
{
super
(
shardingRuleConfig
.
build
(
dataSourceMap
),
props
);
configurationService
=
new
ConfigurationService
(
registryCenter
,
name
);
instanceStateService
=
new
InstanceStateService
(
registryCenter
,
name
);
orchestrationShardingC
onfig
=
new
OrchestrationShardingConfiguration
(
configurationService
=
new
ConfigurationService
(
name
,
registryCenter
);
instanceStateService
=
new
InstanceStateService
(
name
,
registryCenter
);
c
onfig
=
new
OrchestrationShardingConfiguration
(
name
,
overwrite
,
registryCenter
,
getActualDataSourceMapAndReviseShardingRuleConfiguration
(
dataSourceMap
,
shardingRuleConfig
),
shardingRuleConfig
);
this
.
props
=
props
;
}
...
...
@@ -69,8 +69,8 @@ public class OrchestrationSpringShardingDataSource extends ShardingDataSource im
* initial orchestration spring sharding data source.
*/
public
void
init
()
{
configurationService
.
persistShardingConfiguration
(
orchestrationShardingC
onfig
,
props
);
configurationService
.
addShardingConfigurationChangeListener
(
orchestrationShardingConfig
.
getName
(),
orchestrationShardingC
onfig
.
getRegistryCenter
(),
this
);
configurationService
.
persistShardingConfiguration
(
c
onfig
,
props
);
configurationService
.
addShardingConfigurationChangeListener
(
config
.
getName
(),
c
onfig
.
getRegistryCenter
(),
this
);
instanceStateService
.
addShardingState
(
this
);
}
...
...
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java
浏览文件 @
cad130f8
...
...
@@ -42,6 +42,8 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
* @throws SQLException SQL exception
*/
public
static
DataSource
createDataSource
(
final
OrchestrationMasterSlaveConfiguration
config
)
throws
SQLException
{
return
new
OrchestrationMasterSlaveDataSource
(
config
).
getDataSource
();
OrchestrationMasterSlaveDataSource
orchestrationMasterSlaveDataSource
=
new
OrchestrationMasterSlaveDataSource
(
config
);
orchestrationMasterSlaveDataSource
.
init
();
return
orchestrationMasterSlaveDataSource
.
getDataSource
();
}
}
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java
浏览文件 @
cad130f8
...
...
@@ -43,7 +43,7 @@ public final class OrchestrationShardingDataSourceFactory {
* @throws SQLException SQL exception
*/
public
static
DataSource
createDataSource
(
final
OrchestrationShardingConfiguration
config
)
throws
SQLException
{
return
new
OrchestrationShardingDataSource
(
config
).
getDataSource
(
);
return
createDataSource
(
config
,
new
Properties
()
);
}
/**
...
...
@@ -55,6 +55,8 @@ public final class OrchestrationShardingDataSourceFactory {
* @throws SQLException SQL exception
*/
public
static
DataSource
createDataSource
(
final
OrchestrationShardingConfiguration
config
,
final
Properties
props
)
throws
SQLException
{
return
new
OrchestrationShardingDataSource
(
config
,
props
).
getDataSource
();
OrchestrationShardingDataSource
orchestrationShardingDataSource
=
new
OrchestrationShardingDataSource
(
config
,
props
);
orchestrationShardingDataSource
.
init
();
return
orchestrationShardingDataSource
.
getDataSource
();
}
}
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/datasource/OrchestrationMasterSlaveDataSource.java
浏览文件 @
cad130f8
...
...
@@ -34,12 +34,27 @@ import java.sql.SQLException;
@Getter
public
class
OrchestrationMasterSlaveDataSource
{
private
MasterSlaveDataSource
dataSource
;
private
final
OrchestrationMasterSlaveConfiguration
config
;
private
final
MasterSlaveDataSource
dataSource
;
private
final
ConfigurationService
configurationService
;
private
final
InstanceStateService
instanceStateService
;
public
OrchestrationMasterSlaveDataSource
(
final
OrchestrationMasterSlaveConfiguration
config
)
throws
SQLException
{
config
.
getRegistryCenter
().
init
();
this
.
config
=
config
;
dataSource
=
(
MasterSlaveDataSource
)
MasterSlaveDataSourceFactory
.
createDataSource
(
config
.
getDataSourceMap
(),
config
.
getMasterSlaveRuleConfiguration
());
new
ConfigurationService
(
config
.
getRegistryCenter
(),
config
.
getName
()).
addMasterSlaveConfiguration
(
config
,
dataSource
);
new
InstanceStateService
(
config
.
getRegistryCenter
(),
config
.
getName
()).
addMasterSlaveState
(
dataSource
);
configurationService
=
new
ConfigurationService
(
config
.
getName
(),
config
.
getRegistryCenter
());
instanceStateService
=
new
InstanceStateService
(
config
.
getName
(),
config
.
getRegistryCenter
());
}
/**
* Initial orchestration master-slave data source.
*/
public
void
init
()
{
configurationService
.
addMasterSlaveConfiguration
(
config
,
dataSource
);
instanceStateService
.
addMasterSlaveState
(
dataSource
);
}
}
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/datasource/OrchestrationShardingDataSource.java
浏览文件 @
cad130f8
...
...
@@ -35,21 +35,35 @@ import java.util.Properties;
@Getter
public
class
OrchestrationShardingDataSource
{
private
ShardingDataSource
dataSource
;
private
final
OrchestrationShardingConfiguration
config
;
private
final
Properties
props
;
private
final
ShardingDataSource
dataSource
;
private
final
ConfigurationService
configurationService
;
private
final
InstanceStateService
instanceStateService
;
public
OrchestrationShardingDataSource
(
final
OrchestrationShardingConfiguration
config
)
throws
SQLException
{
config
.
getRegistryCenter
().
init
();
new
ConfigurationService
(
config
.
getRegistryCenter
(),
config
.
getName
()).
persistShardingConfiguration
(
config
,
new
Properties
());
dataSource
=
(
ShardingDataSource
)
ShardingDataSourceFactory
.
createDataSource
(
config
.
getDataSourceMap
(),
config
.
getShardingRuleConfig
());
new
ConfigurationService
(
config
.
getRegistryCenter
(),
config
.
getName
()).
addShardingConfigurationChangeListener
(
config
.
getName
(),
config
.
getRegistryCenter
(),
dataSource
);
new
InstanceStateService
(
config
.
getRegistryCenter
(),
config
.
getName
()).
addShardingState
(
dataSource
);
this
(
config
,
new
Properties
());
}
public
OrchestrationShardingDataSource
(
final
OrchestrationShardingConfiguration
config
,
final
Properties
props
)
throws
SQLException
{
config
.
getRegistryCenter
().
init
();
new
ConfigurationService
(
config
.
getRegistryCenter
(),
config
.
getName
()).
persistShardingConfiguration
(
config
,
props
);
dataSource
=
(
ShardingDataSource
)
ShardingDataSourceFactory
.
createDataSource
(
config
.
getDataSourceMap
(),
config
.
getShardingRuleConfig
(),
props
);
new
ConfigurationService
(
config
.
getRegistryCenter
(),
config
.
getName
()).
addShardingConfigurationChangeListener
(
config
.
getName
(),
config
.
getRegistryCenter
(),
dataSource
);
new
InstanceStateService
(
config
.
getRegistryCenter
(),
config
.
getName
()).
addShardingState
(
dataSource
);
this
.
config
=
config
;
this
.
props
=
props
;
dataSource
=
(
ShardingDataSource
)
ShardingDataSourceFactory
.
createDataSource
(
config
.
getDataSourceMap
(),
config
.
getShardingRuleConfig
());
configurationService
=
new
ConfigurationService
(
config
.
getName
(),
config
.
getRegistryCenter
());
instanceStateService
=
new
InstanceStateService
(
config
.
getName
(),
config
.
getRegistryCenter
());
}
/**
* Initial orchestration master-slave data source.
*/
public
void
init
()
{
configurationService
.
persistShardingConfiguration
(
config
,
new
Properties
());
configurationService
.
addShardingConfigurationChangeListener
(
config
.
getName
(),
config
.
getRegistryCenter
(),
dataSource
);
instanceStateService
.
addShardingState
(
dataSource
);
}
}
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/config/ConfigurationService.java
浏览文件 @
cad130f8
...
...
@@ -40,7 +40,7 @@ import java.util.Map;
import
java.util.Properties
;
/**
*
Data
configuration service.
* configuration service.
*
* @author caohao
*/
...
...
@@ -48,8 +48,8 @@ public final class ConfigurationService {
private
final
DataNodeStorage
dataNodeStorage
;
public
ConfigurationService
(
final
CoordinatorRegistryCenter
regCenter
,
final
String
name
)
{
dataNodeStorage
=
new
DataNodeStorage
(
regCenter
,
name
);
public
ConfigurationService
(
final
String
name
,
final
CoordinatorRegistryCenter
regCenter
)
{
dataNodeStorage
=
new
DataNodeStorage
(
name
,
regCenter
);
}
/**
...
...
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/state/InstanceStateService.java
浏览文件 @
cad130f8
...
...
@@ -29,6 +29,7 @@ import io.shardingjdbc.orchestration.internal.json.GsonFactory;
import
io.shardingjdbc.orchestration.internal.json.ShardingRuleConfigurationConverter
;
import
io.shardingjdbc.orchestration.reg.base.CoordinatorRegistryCenter
;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.curator.framework.CuratorFramework
;
import
org.apache.curator.framework.recipes.cache.ChildData
;
import
org.apache.curator.framework.recipes.cache.TreeCache
;
...
...
@@ -44,6 +45,7 @@ import java.util.Properties;
*
* @author caohao
*/
@RequiredArgsConstructor
@Getter
public
final
class
InstanceStateService
{
...
...
@@ -51,11 +53,6 @@ public final class InstanceStateService {
private
final
CoordinatorRegistryCenter
registryCenter
;
public
InstanceStateService
(
final
CoordinatorRegistryCenter
regCenter
,
final
String
name
)
{
this
.
registryCenter
=
regCenter
;
this
.
name
=
name
;
}
/**
* Add sharding state.
*
...
...
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/storage/DataNodeStorage.java
浏览文件 @
cad130f8
...
...
@@ -28,15 +28,15 @@ import org.apache.curator.framework.recipes.cache.TreeCacheListener;
*/
public
final
class
DataNodeStorage
{
private
final
CoordinatorRegistryCenter
regCenter
;
private
final
String
name
;
private
final
CoordinatorRegistryCenter
regCenter
;
private
final
DataNodePath
nodePath
;
public
DataNodeStorage
(
final
CoordinatorRegistryCenter
regCenter
,
final
String
name
)
{
this
.
regCenter
=
regCenter
;
public
DataNodeStorage
(
final
String
name
,
final
CoordinatorRegistryCenter
regCenter
)
{
this
.
name
=
name
;
this
.
regCenter
=
regCenter
;
nodePath
=
new
DataNodePath
(
name
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录