You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/08/22 15:46:06 UTC

[shardingsphere] branch master updated (3e0332b -> aa1502f)

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

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


    from 3e0332b  Merge pull request #6995 from terrymanu/dev
     new 5924571  Add DatabaseServerInfoTest
     new 7b382da  Refactor OrchestrationBootstrap
     new a402015  Add OrchestrationBootstrapTest
     new aa1502f  Merge pull request #6999 from terrymanu/dev

The 26299 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../proxy/db/DatabaseServerInfo.java               |  2 +-
 .../orchestration/OrchestrationBootstrap.java      | 19 +++---
 .../proxy/db/DatabaseServerInfoTest.java           | 38 +++++++-----
 .../shardingsphere/proxy/fixture/FixtureRule.java  |  9 +--
 .../orchestration/OrchestrationBootstrapTest.java  | 68 ++++++++++++++++++++++
 .../src/test/resources/conf/local/config-db.yaml}  | 34 +++++------
 .../src/test/resources/conf/local}/server.yaml     | 15 +++--
 .../src/test/resources/conf/reg_center/server.yaml |  7 ++-
 8 files changed, 132 insertions(+), 60 deletions(-)
 copy shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/test/java/org/apache/shardingsphere/sql/parser/binder/metadata/util/JdbcUtilTest.java => shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/db/DatabaseServerInfoTest.java (50%)
 copy shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/StoreProcedure.g4 => shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRule.java (90%)
 create mode 100644 shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationBootstrapTest.java
 copy shardingsphere-proxy/{shardingsphere-proxy-common/src/test/resources/conf/config-sharding.yaml => shardingsphere-proxy-bootstrap/src/test/resources/conf/local/config-db.yaml} (74%)
 copy shardingsphere-proxy/{shardingsphere-proxy-common/src/test/resources/conf => shardingsphere-proxy-bootstrap/src/test/resources/conf/local}/server.yaml (79%)
 copy examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml => shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml (84%)