support Cartesian Product for readWriteConfig, add check database for writedatasoucename #19808
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… write datasource
Codecov Report
@@ Coverage Diff @@
## master #19808 +/- ##
============================================
+ Coverage 60.07% 60.20% +0.13%
- Complexity 2399 2423 +24
============================================
Files 3856 3875 +19
Lines 54920 55026 +106
Branches 7681 7699 +18
============================================
+ Hits 32993 33130 +137
+ Misses 19098 19051 -47
- Partials 2829 2845 +16
📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more |
terrymanu
requested changes
Aug 3, 2022
| Preconditions.checkArgument(writeInlineNames.size() == inlineNames.size(), "Inline expression write data source names size error"); | ||
| readInlineNames.forEach(e -> Preconditions.checkArgument(e.size() == inlineNames.size(), "Inline expression read data source names size error")); | ||
| for (int i = 0; i < inlineNames.size(); i++) { | ||
| final int finalI = i; |
There was a problem hiding this comment.
This variable does not make sense, could you rename it?
.../src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
Outdated
Show resolved
Hide resolved
| List<String> inlineNames = new InlineExpressionParser(config.getName()).splitAndEvaluate(); | ||
| if (null != config.getStaticStrategy()) { | ||
| List<String> writeInlineNames = new InlineExpressionParser(config.getStaticStrategy().getWriteDataSourceName()).splitAndEvaluate(); | ||
| List<List<String>> readInlineNames = config.getStaticStrategy().getReadDataSourceNames().stream().map(e -> new InlineExpressionParser(e).splitAndEvaluate()).collect(Collectors.toList()); |
There was a problem hiding this comment.
How about change readInlineNames to readInlineDataSourceNames?
.../src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
Outdated
Show resolved
Hide resolved
.../src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
Outdated
Show resolved
Hide resolved
...pring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application.properties
Outdated
Show resolved
Hide resolved
terrymanu
requested changes
Aug 6, 2022
.../src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
Outdated
Show resolved
Hide resolved
.../src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
Show resolved
Hide resolved
terrymanu
approved these changes
Aug 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #19693 .