Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

To make Sharding-Orchestration independent. #1188

Merged
merged 150 commits into from
Aug 28, 2018
Merged

To make Sharding-Orchestration independent. #1188

merged 150 commits into from
Aug 28, 2018

Conversation

tristaZero
Copy link
Contributor

Fixes #1153 .

Changes proposed in this pull request:

  • Do not extend ShardingDataSource
  • Do not extend MasterSlaveDataSource
  • Fix some test cases.

@tristaZero
Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int…
e2d2ab2 
…o dev
@tristaZero
Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int…
1ce042b 
…o dev
@tristaZero
remove extends
b7627e6
@tristaZero
add disabledDataSourceNames
a87551c
@tristaZero
add properties.
1733f38
@tristaZero
add initial function
5025a32
@tristaZero
watch ConfigurationNode.MASTER_SLAVE_PROPS_NODE_PATH
46759d8
@tristaZero
remove orchestration.
49916e5
@tristaZero
add orchestration
a08340d
@tristaZero
add api for dataSource
91e2ebb
@tristaZero
add api for props
7845e52
@tristaZero
remove init function.
697c2b9
@tristaZero
remove construction finction
c8a89f5
@tristaZero
reverse
902a011
@tristaZero
add getConnection function
fda6129
@tristaZero
super(dataSourceMap.values())
2dbfcad
@tristaZero
add renewDisabledDataSourceNames
c2dac6d
@tristaZero
add data source map
e56390a
@tristaZero
add closeOriginalDataSources
52753ea
@tristaZero
remove disabledDataSourceNames
a2976ce
@tristaZero
add dataSourceMap
22ca6a7
@tristaZero
do not use getRawDataSourceMap
235a355
@tristaZero
add renew
a8d90b2
@tristaZero
rewrite renew
f1f13ae
@tristaZero
add showSQL()
4379564
@tristaZero
rewrite renewDisabledDataSourceNames
5666343
@tristaZero
add isCircuitBreak
5d547e3
@tristaZero
add renewDisabledDataSourceNames
9870a4b
@tristaZero
remove blank line
7d78f69
@tristaZero
add @Getter(AccessLevel.NONE)
158c48e
@tristaZero
shardingDataSource.getDataSourceMap();
51391fa
@tristaZero
((ShardingDataSource)dataSource)
ba3d83f
@tristaZero
dataSource.getDataSourceMap();
baf5c28
@tristaZero
dataSource.getDataSourceMap();
f3b32e6
@tristaZero
shardingDataSource.getDataSourceMap().values()
957d03d
@tristaZero
Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int…
54a58c1 
…o dev
@tristaZero
mock shardingDatasource
c35d22a
@tristaZero
use mock shardingDatasource
120b655
@tristaZero
mock shardingDatasource
fd95f20
@tristaZero
mock shardingDatasource
1bec9d8
@tristaZero
rewrite OrchestrationShardingDataSource
0ab11a1
@tristaZero
rewriete CircuitBreaker function
5c8570e
@tristaZero
rewrite getConnection()
30b7a23
@tristaZero
add renewCircuitBreakerDataSourceNames()
1ae1b1c
@tristaZero
overload
412ec73
@tristaZero
add initOrchestrationFacade()
7a5474b
@tristaZero
add isCircuitBreak
10e4302
@tristaZero
rewrite getConnection()
30b8c66
@tristaZero
add final
16ee375
@tristaZero
modify to final properties
e29aa04
@tristaZero
remove getter
9de8bc9
@tristaZero
remove getter
5474c97
@tristaZero
create datasource
345d5b4
@tristaZero
rewrite create datasource
a852667
@tristaZero
use shardingDataSource.getDataSourceMap()
d64a733
@tristaZero
Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int…
18eb875 
…o dev
@tristaZero
use reflection
aa8705f
@tristaZero
use reflection.
5109261
@tristaZero
dataSourceField.setAccessible(true);
11524e2
@terrymanu terrymanu merged commit 9934607 into apache:dev Aug 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tristaZero @coveralls @terrymanu