[shardingsphere] branch master updated (40da075 -> e5b9782)

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.


    from 40da075  fix sql with distinct shorthand project merge exception (#12573)
     add e5b9782  Optimize shadow table rule (#12562)

No new revisions were added by this update.

Summary of changes:
 .../pom.xml                                        |  8 ++--
 .../mybatis/ShadowSpringBootMybatisExample.java    | 12 ++---
 .../spring/boot}/mybatis/domain/OrderInfo.java     | 10 +++-
 .../boot/mybatis/repository/OrderMapper.java       | 16 ++-----
 .../spring/boot/mybatis/service/OrderService.java} |  6 +--
 .../mybatis/service/impl/OrderServiceImpl.java     | 56 ++++++++++++++++++++++
 .../application-shadow-databases.properties        | 12 +++++
 ...plication-shadow-sharding-databases.properties} | 30 +++++++-----
 .../src/main/resources/application.properties      |  6 ++-
 .../src/main/resources/logback.xml                 |  2 +-
 .../src/main/resources/mapper/OrderMapper.xml}     | 12 +++--
 .../META-INF/application-shadow-databases.xml      |  4 +-
 .../future-shadow-example/pom.xml                  |  1 +
 .../api/config/table/ShadowTableConfiguration.java |  5 +-
 .../future/engine/AbstractShadowRouteEngine.java   | 24 +++++-----
 .../shardingsphere/shadow/rule/ShadowRule.java     | 32 ++++++++++---
 .../shadow/rule/ShadowTableRule.java               |  5 +-
 .../shadow/rule/checker/ShadowRuleChecker.java     |  9 ++++
 .../config/table/YamlShadowTableConfiguration.java |  2 +-
 .../table/ShadowTableConfigurationYamlSwapper.java |  4 +-
 .../ColumnShadowAlgorithmDeterminerTest.java       |  3 +-
 .../NoteShadowAlgorithmDeterminerTest.java         |  3 +-
 .../ShadowInsertStatementRoutingEngineTest.java    |  3 +-
 .../shardingsphere/shadow/rule/ShadowRuleTest.java |  4 +-
 ...orithmProviderConfigurationYamlSwapperTest.java |  2 +-
 .../ShadowTableConfigurationYamlSwapperTest.java   | 11 +++--
 .../PropertiesShadowSpringBootStarterTest.java     |  7 +--
 .../boot/YmlShadowSpringBootStarterTest.java       |  7 +--
 .../application-shadow-properties.properties       |  4 +-
 .../src/test/resources/application-shadow-yml.yml  |  4 +-
 .../parser/ShadowRuleBeanDefinitionParser.java     | 10 +++-
 .../namespace/tag/ShadowRuleBeanDefinitionTag.java |  2 +-
 .../main/resources/META-INF/namespace/shadow.xsd   | 12 ++---
 .../ShadowAlgorithmSpringNamespaceTest.java        |  7 +--
 .../shadow-algorithm-application-context.xml       |  4 +-
 35 files changed, 232 insertions(+), 107 deletions(-)
 copy examples/shardingsphere-jdbc-example/other-feature-example/{encrypt-example/encrypt-spring-boot-mybatis-example => future-shadow-example/future-shadow-spring-boot-mybatis-example}/pom.xml (93%)
 copy examples/shardingsphere-jdbc-example/other-feature-example/{shadow-example/shadow-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/table => future-shadow-example/future-shadow-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow}/spring/boot/mybatis/ShadowSpringBootMybatisExample.java (73%)
 copy examples/shardingsphere-jdbc-example/other-feature-example/future-shadow-example/{future-shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace => future-shadow-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot}/mybatis/domain/OrderInfo.java (79%)
 copy shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/entity/TargetPoint.java => examples/shardingsphere-jdbc-example/other-feature-example/future-shadow-example/future-shadow-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/mybatis/repository/OrderMapper.java (77%)
 copy examples/{example-core/config-utility/src/main/java/org/apache/shardingsphere/example/type/RegistryCenterType.java => shardingsphere-jdbc-example/other-feature-example/future-shadow-example/future-shadow-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/mybatis/service/OrderService.java} (85%)
 create mode 100644 examples/shardingsphere-jdbc-example/other-feature-example/future-shadow-example/future-shadow-spring-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/mybatis/service/impl/OrderServiceImpl.java
 copy examples/shardingsphere-jdbc-example/other-feature-example/{shadow-example/shadow-spring-boot-mybatis-example => future-shadow-example/future-shadow-spring-boot-mybatis-example}/src/main/resources/application-shadow-databases.properties (69%)
 copy examples/shardingsphere-jdbc-example/other-feature-example/{shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-sharding-shadow-databases.properties => future-shadow-example/future-shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-sharding-databases.properties} (71%)
 copy examples/shardingsphere-jdbc-example/other-feature-example/{encrypt-example/encrypt-spring-boot-mybatis-example => future-shadow-example/future-shadow-spring-boot-mybatis-example}/src/main/resources/application.properties (81%)
 copy examples/shardingsphere-jdbc-example/other-feature-example/{encrypt-example/encrypt-spring-boot-mybatis-example => future-shadow-example/future-shadow-spring-boot-mybatis-example}/src/main/resources/logback.xml (94%)
 copy examples/shardingsphere-jdbc-example/other-feature-example/future-shadow-example/{future-shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/mappers/ShadowMapper.xml => future-shadow-spring-boot-mybatis-example/src/main/resources/mapper/OrderMapper.xml} (63%)