[shardingsphere] branch master updated (76226e9 -> 9d7e087)

[zh...@apache.org]

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

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


    from 76226e9  Fixed SHOW DB_DISCOVERY RULES result not right. (#14665)
     add 9d7e087  Adjust the jdbc template and add jdbc example of mixed rules (#14673)

No new revisions were added by this update.

Summary of changes:
 .../example/engine/ExampleTemplateFactory.java     |  6 +-
 .../src/main/resources/data-model/data-model.yaml  |  4 +-
 .../template/java/config/configuration.ftl         |  6 +-
 .../resources/template/java/config/encrypt.ftl     |  1 -
 .../template/java/config/readwrite-splitting.ftl   |  3 +-
 .../main/resources/template/java/config/shadow.ftl |  1 -
 .../resources/template/java/config/sharding.ftl    |  3 +-
 .../pom.xml                                        |  1 +
 .../pom.xml                                        |  7 +-
 .../pom.xml                                        |  4 +-
 .../jdbc/MemoryLocalMixedJdbcConfiguration.java}   | 81 ++++++++++++++++------
 .../mixed/jdbc/MemoryLocalMixedJdbcExample.java}   |  8 +--
 .../jdbc/MemoryLocalMixedJdbcExampleService.java}  | 18 ++---
 .../TestQueryAssistedShardingEncryptAlgorithm.java |  5 +-
 .../example/mixed}/jdbc/entity/Address.java        |  2 +-
 .../example/mixed}/jdbc/entity/Order.java          |  2 +-
 .../example/mixed}/jdbc/entity/OrderItem.java      |  2 +-
 .../mixed}/jdbc/repository/AddressRepository.java  |  4 +-
 .../jdbc/repository/OrderItemRepository.java       |  4 +-
 .../mixed}/jdbc/repository/OrderRepository.java    |  4 +-
 ...che.shardingsphere.encrypt.spi.EncryptAlgorithm |  2 +-
 .../src/main/resources/logback.xml                 |  0
 22 files changed, 105 insertions(+), 63 deletions(-)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/{ => shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-mixed-example}/pom.xml (85%)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example}/pom.xml (91%)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-sharding-example/shardingsphere-jdbc-memory-local-sharding-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/jdbc/MemoryLocalShardingJdbcConfiguration.java => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/e [...]
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/jdbc/MemoryLocalShadowJdbcExample.java => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/example/mixed/j [...]
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/jdbc/MemoryLocalEncryptJdbcExampleService.java => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/exam [...]
 copy examples/{example-core/config-utility/src/main/java/org/apache/shardingsphere/example/fixture => shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/example/mixed/jdbc}/TestQueryAssistedShardingEncryptAlgorithm.java (96%)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/example/mixed}/jdbc/entity/Address.java (96%)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/example/mixed}/jdbc/entity/Order.java (97%)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/example/mixed}/jdbc/entity/OrderItem.java (97%)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/example/mixed}/jdbc/repository/AddressRepository.java (96%)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/example/mixed}/jdbc/repository/OrderItemRepository. [...]
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example/src/main/java/org/apache/shardingsphere/example/mixed}/jdbc/repository/OrderRepository.java (97%)
 copy examples/{example-core/config-utility => shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example}/src/main/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm (90%)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-sharding-example/shardingsphere-jdbc-memory-local-sharding-spring-namespace-mybatis-example => shardingsphere-jdbc-memory-local-mixed-example/shardingsphere-jdbc-memory-local-mixed-jdbc-example}/src/main/resources/logback.xml (100%)