[shardingsphere] branch master updated (17cccd7 -> 4447558)

[me...@apache.org]

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 17cccd7  Merge pull request #6312 from tristaZero/new
     new d9f7071  update instance id to consume port info
     new 6e330e9  pass port info to orchestration instance
     new f7d4450  updated TCs
     new 3881ed6  fix typo
     new 22697e8  add uuid
     new 8ea5039  use id instead of port
     new 9ccc48c  pass thread-id for data-source
     new d3160b6  fixed styling
     new 9adf6ae  resolve conflict
     new 0dd78e8  resolve conflict
     new 9bd381b  resolve conflict
     new 4b6649f  resolve conflict
     new 061d91e  Merge branch 'master' into add-port-to-proxy-instance
     new df10436  remove unused import
     new 392bd6f  updated TC
     new ee86669  updated implementation
     new 9920914  make thread-id a string
     new fb78556  rename to instanceTag
     new e072722  merge from master
     new 20b3e14  update singleton istance impl
     new 4447558  Merge pull request #6187 from swayamraina/add-port-to-proxy-instance

The 25720 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:
 .../core/facade/ShardingOrchestrationFacade.java   |  4 +--
 .../facade/ShardingOrchestrationFacadeTest.java    |  2 +-
 .../ShardingOrchestrationListenerManagerTest.java  |  2 ++
 .../core/registrycenter/RegistryCenter.java        |  6 ++--
 .../instance/OrchestrationInstance.java            | 40 ++++++++++++++++------
 .../core/registrycenter/RegistryCenterTest.java    |  2 +-
 .../listener/InstanceStateChangedListenerTest.java |  2 ++
 .../listener/RegistryListenerManagerTest.java      |  2 ++
 .../OrchestrationShardingSphereDataSource.java     | 13 ++++---
 .../org/apache/shardingsphere/proxy/Bootstrap.java |  4 +--
 .../converter/DefaultConfigurationConverter.java   |  2 +-
 .../converter/ProxyConfigurationConverter.java     |  3 +-
 .../OrchestrationConfigurationConverter.java       |  6 ++--
 13 files changed, 61 insertions(+), 27 deletions(-)