This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from 7a6cab5 Revise scope of postgresql's dependency (#16213)
add 4956368 Add `IMPORT SCHEMA CONFIGURATION` syntax to DistSQL. (#16162)
No new revisions were added by this update.
Summary of changes:
.../src/main/antlr4/imports/Keyword.g4 | 4 +
.../src/main/antlr4/imports/RALStatement.g4 | 4 +
.../parser/autogen/CommonDistSQLStatement.g4 | 1 +
.../core/common/CommonDistSQLStatementVisitor.java | 9 ++
.../ImportSchemaConfigurationStatement.java | 18 +--
.../proxy/backend}/config/ProxyConfiguration.java | 2 +-
.../backend}/config/ProxyConfigurationLoader.java | 6 +-
.../backend}/config/ProxyGlobalConfiguration.java | 2 +-
.../backend}/config/YamlProxyConfiguration.java | 6 +-
.../yaml/YamlProxyDataSourceConfiguration.java | 2 +-
.../config/yaml/YamlProxySchemaConfiguration.java | 2 +-
.../config/yaml/YamlProxyServerConfiguration.java | 2 +-
.../swapper/YamlProxyConfigurationSwapper.java | 16 +-
.../YamlProxyDataSourceConfigurationSwapper.java | 6 +-
.../text/distsql/ral/RALBackendHandlerFactory.java | 3 +
.../ImportSchemaConfigurationHandler.java | 153 +++++++++++++++++++
.../config/ProxyConfigurationLoaderTest.java | 6 +-
.../swapper/YamlProxyConfigurationSwapperTest.java | 8 +-
...amlProxyDataSourceConfigurationSwapperTest.java | 14 +-
.../ImportSchemaConfigurationHandlerTest.java | 162 +++++++++++++++++++++
.../resources/conf/config_loader/config-empty.yaml | 0
.../conf/config_loader/config-encrypt.yaml | 0
.../config_loader/config-readwrite-splitting.yaml | 0
.../conf/config_loader/config-sharding.yaml | 0
.../test/resources/conf/config_loader/server.yaml | 0
.../resources/conf/import/config-sharding.yaml | 108 ++++++++++++++
.../conf/swap/config-readwrite-splitting.yaml | 0
.../src/test/resources/conf/swap/server.yaml | 0
.../org/apache/shardingsphere/proxy/Bootstrap.java | 4 +-
.../proxy/initializer/BootstrapInitializer.java | 6 +-
.../ral/impl/UpdatableRALStatementAssert.java | 7 +-
.../ImportSchemaConfigurationStatementAssert.java | 55 +++++++
.../jaxb/cases/domain/SQLParserTestCases.java | 33 +++--
...ImportSchemaConfigurationStatementTestCase.java | 19 ++-
.../src/main/resources/case/ral/common.xml | 3 +
.../main/resources/sql/supported/ral/common.xml | 1 +
36 files changed, 586 insertions(+), 76 deletions(-)
copy
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
=>
shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/updatable/ImportSchemaConfigurationStatement.java
(65%)
copy
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend}/config/ProxyConfiguration.java
(95%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend}/config/ProxyConfigurationLoader.java
(95%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend}/config/ProxyGlobalConfiguration.java
(95%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend}/config/YamlProxyConfiguration.java
(83%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend}/config/yaml/YamlProxyDataSourceConfiguration.java
(96%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend}/config/yaml/YamlProxySchemaConfiguration.java
(96%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend}/config/yaml/YamlProxyServerConfiguration.java
(97%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend}/config/yaml/swapper/YamlProxyConfigurationSwapper.java
(87%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend}/config/yaml/swapper/YamlProxyDataSourceConfigurationSwapper.java
(93%)
create mode 100644
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportSchemaConfigurationHandler.java
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend}/config/ProxyConfigurationLoaderTest.java
(97%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend}/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
(95%)
rename
shardingsphere-proxy/{shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy
=>
shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend}/config/yaml/swapper/YamlProxyDataSourceConfigurationSwapperTest.java
(89%)
create mode 100644
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportSchemaConfigurationHandlerTest.java
rename shardingsphere-proxy/{shardingsphere-proxy-bootstrap =>
shardingsphere-proxy-backend}/src/test/resources/conf/config_loader/config-empty.yaml
(100%)
rename shardingsphere-proxy/{shardingsphere-proxy-bootstrap =>
shardingsphere-proxy-backend}/src/test/resources/conf/config_loader/config-encrypt.yaml
(100%)
rename shardingsphere-proxy/{shardingsphere-proxy-bootstrap =>
shardingsphere-proxy-backend}/src/test/resources/conf/config_loader/config-readwrite-splitting.yaml
(100%)
rename shardingsphere-proxy/{shardingsphere-proxy-bootstrap =>
shardingsphere-proxy-backend}/src/test/resources/conf/config_loader/config-sharding.yaml
(100%)
rename shardingsphere-proxy/{shardingsphere-proxy-bootstrap =>
shardingsphere-proxy-backend}/src/test/resources/conf/config_loader/server.yaml
(100%)
create mode 100644
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/resources/conf/import/config-sharding.yaml
rename shardingsphere-proxy/{shardingsphere-proxy-bootstrap =>
shardingsphere-proxy-backend}/src/test/resources/conf/swap/config-readwrite-splitting.yaml
(100%)
rename shardingsphere-proxy/{shardingsphere-proxy-bootstrap =>
shardingsphere-proxy-backend}/src/test/resources/conf/swap/server.yaml (100%)
create mode 100644
shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/common/updatable/ImportSchemaConfigurationStatementAssert.java
rename
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
=>
shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ImportSchemaConfigurationStatementTestCase.java
(63%)
