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

Sharding-JDBC spring namespace enhancement #1211

Merged
merged 36 commits into from
Aug 31, 2018
Merged

Sharding-JDBC spring namespace enhancement #1211

merged 36 commits into from
Aug 31, 2018

Conversation

tristaZero
Copy link
Contributor

Fixes #1203 .

Changes proposed in this pull request:

  • Add master-slave rules configuration for spring name
  • Add master-slave rule configuration for spring name
  • Add and modify some test case

@tristaZero
Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int…
16890fb 
…o dev
@tristaZero
Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int…
46b8368 
…o dev
@tristaZero
add MASTER_SLAVE_RULES_TAG
e612838
@tristaZero
add <xsd:element name="master-slave-rule">
87740fd
@tristaZero
add parseMasterSlaveRulesConfig
d1a4ca9
@tristaZero
add null == masterSlaveRulesElement ?
a74680b
@tristaZero
add masterSlaveShardingDataSource
f662981
@tristaZero
add assertMasterSlaveShardingDataSource
19a4f88
@tristaZero
modify assertMasterSlaveShardingDataSource
a0ce400
@tristaZero
add default-key-generator-ref
fb00087
@tristaZero
add NoArgsConstructor
5fc0b74
@tristaZero
add parseStrategyType
81ac90f
@tristaZero
add RoundRobinMasterSlaveLoadBalanceAlgorithm test
5e29caf
@tristaZero
add strategy-ref="randomStrategy"
f672767
@tristaZero
add <xsd:element ref="master-slave-rules" minOccurs="0" />
c71dc19
@tristaZero
add parseMasterSlaveRulesConfig
9611790
@tristaZero
add assertMasterSlaveShardingDataSourceByUserStrategy
6b2cfe7
@tristaZero
add MASTER_SLAVE_RULES_TAG
0178b96
@tristaZero
modify tests
1cd8103
@tristaZero
modify test
8e52a3a
@tristaZero
modify config
8835a26
@tristaZero
add default-data-source-name="dbtbl_0"
c46fdcf
@tristaZero
modify test case
02f8220
@tristaZero
delete getRawDataSourceMap
b8bbb7b
@tristaZero
add datasource/dataSource.xml
082b46f
@tristaZero
modify config
232a301
@tristaZero
add datasource/dataSource.xml import
cd31f46
@tristaZero
modify withNamespaceForMasterSlaveWithStrategyType
d196aa9
@tristaZero
modify withNamespaceForMasterSlaveWithStrategyRef
203c84a
@tristaZero
modify withNamespaceForMasterSlaveWithDefaultStrategy
41fe0c1
@terrymanu terrymanu merged commit c532fa0 into apache:dev Aug 31, 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.

None yet
2 participants
@tristaZero @terrymanu