This is an automated email from the ASF dual-hosted git repository. wuweijie pushed a commit to branch opengauss_adapt in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
commit 4ac17d1463954a6ac48ae41c995ceb1907a2f494 Merge: 9df8fde 2a1f5b1 Author: 吴伟杰 <[email protected]> AuthorDate: Mon Jul 12 10:21:17 2021 +0800 Merge remote-tracking branch 'apache-readonly/master' into opengauss_adapt docs/blog/content/material/CNCF.cn.md | 2 +- docs/blog/content/material/CNCF.en.md | 2 +- docs/blog/content/material/ElasticJob.cn.md | 2 +- docs/blog/content/material/ElasticJob.en.md | 2 +- docs/blog/content/material/_index.cn.md | 28 +- docs/blog/content/material/_index.en.md | 28 +- docs/blog/content/material/alpha.cn.md | 2 +- docs/blog/content/material/alpha.en.md | 2 +- docs/blog/content/material/committer.cn.md | 2 +- docs/blog/content/material/committer.en.md | 2 +- docs/blog/content/material/community.cn.md | 2 +- docs/blog/content/material/community.en.md | 2 +- docs/blog/content/material/database.cn.md | 2 +- docs/blog/content/material/database.en.md | 2 +- docs/blog/content/material/engine.cn.md | 2 +- docs/blog/content/material/engine.en.md | 2 +- docs/blog/content/material/graduate.cn.md | 2 +- docs/blog/content/material/graduate.en.md | 2 +- docs/blog/content/material/proxy.cn.md | 2 +- docs/blog/content/material/proxy.en.md | 2 +- docs/blog/content/material/realization.cn.md | 2 +- docs/blog/content/material/realization.en.md | 2 +- docs/blog/content/material/result.cn.md | 2 +- docs/blog/content/material/result.en.md | 2 +- docs/blog/content/material/solution.cn.md | 2 +- docs/blog/content/material/solution.en.md | 2 +- docs/blog/content/material/ss_5.0.0beta.cn.md | 124 +++ docs/blog/content/material/ss_5.0.0beta.en.md | 196 ++++ docs/blog/static/img/ss_5.0.0beta1.jpg | Bin 0 -> 14688 bytes .../blog/themes/tale4zh/layouts/_default/list.html | 2 +- .../themes/tale4zh/layouts/_default/taxonomy.html | 2 +- .../themes/tale4zh/layouts/_default/terms.html | 4 +- docs/document/content/dev-manual/sharding.cn.md | 4 +- docs/document/content/dev-manual/sharding.en.md | 4 +- docs/document/content/faq/_index.cn.md | 12 +- docs/document/content/faq/_index.en.md | 12 +- .../dist-sql/syntax/rdl/rdl-resource.cn.md | 26 +- .../dist-sql/syntax/rdl/rdl-resource.en.md | 26 +- .../configuration/spring-boot-starter/_index.cn.md | 6 +- .../configuration/spring-boot-starter/_index.en.md | 6 +- .../jdbc/repository/ShadowUserRepositoryImpl.java | 2 +- .../core/jdbc/repository/UserRepositoryImpl.java | 4 +- .../core/jpa/repository/AddressRepositoryImpl.java | 2 +- .../META-INF/mappers/ShadowUserMapper.xml | 2 +- .../main/resources/META-INF/mappers/UserMapper.xml | 2 +- examples/pom.xml | 19 +- .../governance-spring-boot-example/pom.xml | 6 +- .../spring/boot/GovernanceSpringBootExample.java | 6 +- .../src/main/resources/META-INF/mybatis-config.xml | 19 +- .../application-local-zookeeper-encrypt.properties | 18 +- ...-local-zookeeper-readwrite-splitting.properties | 43 +- .../application-local-zookeeper-shadow.properties | 14 +- ...-zookeeper-sharding-databases-tables.properties | 54 +- .../src/main/resources/application.properties | 6 +- .../encrypt-spring-boot-example/pom.xml | 6 +- .../spring/boot/EncryptSpringBootExample.java | 8 +- .../src/main/resources/META-INF/mybatis-config.xml | 15 +- .../application-encrypt-databases.properties | 13 +- .../src/main/resources/application.properties | 4 +- .../shadow-spring-boot-example/pom.xml | 8 +- .../table/spring/boot/ShadowSpringBootExample.java | 8 +- .../src/main/resources/META-INF/mybatis-config.xml | 19 +- ...application-encrypt-shadow-databases.properties | 24 +- ...readwrite-splitting-shadow-databases.properties | 50 +- .../application-shadow-databases.properties | 14 +- ...pplication-sharding-shadow-databases.properties | 66 +- .../src/main/resources/application.properties | 4 +- .../application-readwrite-splitting.properties | 36 +- ...pplication-sharding-databases-tables.properties | 52 +- .../application-sharding-databases.properties | 32 +- ...ication-sharding-readwrite-splitting.properties | 88 +- .../application-sharding-tables.properties | 12 +- .../application-readwrite-splitting.properties | 36 +- ...pplication-sharding-databases-tables.properties | 44 +- .../application-sharding-databases.properties | 32 +- ...ication-sharding-readwrite-splitting.properties | 76 +- .../application-sharding-tables.properties | 12 +- .../META-INF/application-readwrite-splitting.xml | 4 +- .../application-sharding-databases-tables.xml | 2 +- .../META-INF/application-sharding-databases.xml | 4 +- .../application-sharding-readwrite-splitting.xml | 2 +- .../META-INF/application-sharding-tables.xml | 2 +- .../boot/TransactionXaSpringBootExample.java | 4 +- ...pplication-sharding-databases-tables.properties | 36 +- .../application-sharding-databases.properties | 30 +- .../application-sharding-tables.properties | 6 +- ...pplication-sharding-databases-tables.properties | 36 +- .../application-sharding-databases.properties | 30 +- .../application-sharding-tables.properties | 8 +- .../src/main/resources/application.properties | 1 - examples/shardingsphere-parser-example/pom.xml | 10 + .../example/parser/SQLParserFormatExample.java | 38 - .../parser/SQLParserParameterizedExample.java | 37 - .../mysql/format/MySQLParserFormatExample.java | 65 ++ .../statement/MySQLParserStatementExample.java | 63 ++ .../statement/OracleParserStatementExample.java | 61 ++ .../statement/SQL92ParserStatementExample.java | 61 ++ .../src/main/resources/conf/agent.yaml | 5 + .../service/PrometheusPluginBootService.java | 7 +- .../shardingsphere-agent-plugin-tracing/pom.xml | 3 + .../pom.xml | 85 ++ .../advice/CommandExecutorTaskAdvice.java | 61 ++ .../advice/JDBCExecutorCallbackAdvice.java | 79 ++ .../advice/SQLParserEngineAdvice.java | 64 ++ .../constant/OpenTelemetryConstants.java | 57 + ...penTelemetryTracingPluginDefinitionService.java | 70 ++ .../OpenTelemetryTracingPluginBootService.java | 29 +- ...shardingsphere.agent.spi.boot.PluginBootService | 2 +- ...re.agent.spi.definition.PluginDefinitionService | 2 +- .../advice/CommandExecutorTaskAdviceTest.java | 78 ++ .../advice/JDBCExecutorCallbackAdviceTest.java | 86 ++ .../advice/SQLParserEngineAdviceTest.java | 97 ++ .../collector/OpenTelemetryCollector.java | 63 ++ ...elemetryTracingPluginDefinitionServiceTest.java | 34 +- .../OpenTelemetryTracingPluginBootServiceTest.java | 56 + shardingsphere-db-protocol/pom.xml | 8 + .../query/binary/MySQLBinaryStatementRegistry.java | 7 +- .../binary/close/MySQLComStmtClosePacket.java | 2 +- .../binary/MySQLBinaryStatementRegistryTest.java | 4 +- .../command/PostgreSQLCommandPacketFactory.java | 2 +- .../command/query/PostgreSQLColumnDescription.java | 2 +- .../ConnectionScopeBinaryStatementRegistry.java | 64 -- .../query/binary}/PostgreSQLBinaryColumnType.java | 2 +- .../query/binary/PostgreSQLBinaryStatement.java | 4 +- .../binary/PostgreSQLBinaryStatementRegistry.java | 57 +- .../query/binary/bind/PostgreSQLComBindPacket.java | 12 +- .../PostgreSQLBinaryProtocolValueFactory.java | 2 +- .../binary/parse/PostgreSQLComParsePacket.java | 2 +- .../constant/PostgreSQLBinaryColumnTypeTest.java | 1 + .../PostgreSQLCommandPacketFactoryTest.java | 13 +- ...ConnectionScopeBinaryStatementRegistryTest.java | 58 - .../PostgreSQLBinaryStatementRegistryTest.java | 54 +- .../binary/bind/PostgreSQLComBindPacketTest.java | 14 +- .../PostgreSQLBinaryProtocolValueFactoryTest.java | 2 +- .../binary/parse/PostgreSQLComParsePacketTest.java | 2 +- .../query/text/PostgreSQLDataRowPacketTest.java | 2 +- .../src/main/resources/conf/server.yaml | 3 + .../src/main/resources/bin/server_start.sh | 33 +- .../src/main/resources/bin/server_stop.sh | 35 +- .../resources/bin/{worker_start.sh => start.sh} | 18 +- .../main/resources/bin/{worker_stop.sh => stop.sh} | 12 +- .../src/main/resources/bin/worker_start.sh | 33 +- .../src/main/resources/bin/worker_stop.sh | 35 +- .../src/main/antlr4/imports/Keyword.g4 | 4 + .../src/main/antlr4/imports/RDLStatement.g4 | 22 +- .../resource/ResourceDistSQLStatementVisitor.java | 26 +- .../api/DistSQLStatementParserEngineTest.java | 93 +- .../distsql/parser/segment/DataSourceSegment.java | 2 + .../statement/ral/QueryableRALStatement.java | 8 +- .../statement/ral/UpdatableRALStatement.java | 8 +- .../statement/rql/show/ShowRulesStatement.java | 2 +- .../query/DatabaseDiscoveryRuleQueryResultSet.java | 4 +- ...ingsphere.infra.distsql.query.DistSQLResultSet} | 0 .../DatabaseDiscoveryRuleQueryResultSetTest.java | 4 +- .../handler/query/EncryptRuleQueryResultSet.java | 4 +- ...ingsphere.infra.distsql.query.DistSQLResultSet} | 0 .../query/EncryptRuleQueryResultSetTest.java | 4 +- .../ReadwriteSplittingRuleQueryResultSet.java | 4 +- ...ingsphere.infra.distsql.query.DistSQLResultSet} | 0 .../shardingsphere-sharding-api/pom.xml | 2 +- .../datetime/IntervalShardingAlgorithm.java | 3 +- .../datetime/IntervalShardingAlgorithmTest.java | 46 + .../ShardingBindingTableRuleQueryResultSet.java | 4 +- .../ShardingBroadcastTableRuleQueryResultSet.java | 4 +- .../query/ShardingTableRuleQueryResultSet.java | 4 +- ...ingsphere.infra.distsql.query.DistSQLResultSet} | 0 .../query/ShardingTableRuleQueryResultSetTest.java | 4 +- .../authority/checker/AuthorityChecker.java | 61 ++ .../orderby/engine/OrderByContextEngine.java | 19 +- .../pagination/engine/PaginationContextEngine.java | 3 +- .../select/projection/ProjectionsContext.java | 6 +- .../statement/dml/SelectStatementContext.java | 2 +- .../orderby/engine/OrderByContextEngineTest.java | 1 + .../config/datasource/DataSourceConfiguration.java | 19 +- .../config/datasource/DataSourceParameter.java | 4 + .../properties/ConfigurationPropertyKey.java | 8 +- .../{RQLResultSet.java => DistSQLResultSet.java} | 4 +- .../infra/distsql/update/RALUpdater.java | 23 +- .../infra/config/DataSourceConfigurationTest.java | 26 +- .../CreateTableStatementSchemaRefresherTest.java | 7 +- .../infra/executor/check/SQLCheckEngine.java | 2 + .../kernel/model/ExecutionGroupContext.java | 7 + .../sql/process/model/ExecuteProcessContext.java | 11 + .../model/yaml/YamlExecuteProcessContext.java | 9 + .../converter/impl/OffsetSqlNodeConverter.java | 4 +- .../converter/impl/RowCountSqlNodeConverter.java | 4 +- .../shardingsphere-proxy-backend/pom.xml | 2 +- .../backend/communication/ProxySQLExecutor.java | 4 + .../jdbc/connection/ConnectionUrlParser.java | 86 ++ .../decorator/HikariJDBCParameterDecorator.java | 38 +- ...ySQLStatementMemoryStrictlyFetchSizeSetter.java | 5 +- ...eSQLStatementMemoryStrictlyFetchSizeSetter.java | 5 +- .../proxy/backend/context/ProxyContext.java | 19 + .../text/TextProtocolBackendHandlerFactory.java | 8 +- .../mysql/executor/ShowProcessListExecutor.java | 21 +- .../text/distsql/DistSQLBackendHandlerFactory.java | 2 +- .../text/distsql/ral/RALBackendHandlerFactory.java | 45 +- .../ral/impl/CheckScalingJobBackendHandler.java | 98 -- .../ral/impl/ShowScalingJobListBackendHandler.java | 96 -- .../impl/ShowScalingJobStatusBackendHandler.java | 100 -- .../query/QueryableRALBackendHandler.java} | 24 +- .../query/QueryableRALBackendHandlerFactory.java} | 24 +- .../UpdatableRALBackendHandler.java} | 34 +- .../update/UpdatableRALBackendHandlerFactory.java} | 30 +- .../text/distsql/rql/DataSourceQueryResultSet.java | 4 +- .../text/distsql/rql/RQLBackendHandler.java | 6 +- .../text/distsql/rql/RQLBackendHandlerFactory.java | 8 +- ...ingsphere.infra.distsql.query.DistSQLResultSet} | 0 .../jdbc/connection/ConnectionUrlParserTest.java | 115 ++ .../HikariJDBCParameterDecoratorTest.java | 26 + .../mysql/executor/ShowDatabasesExecutorTest.java | 2 +- .../executor/ShowProcessListExecutorTest.java | 68 +- .../resource/AddResourceBackendHandlerTest.java | 2 +- .../text/distsql/rql/RQLBackendHandlerTest.java | 6 +- .../src/main/resources/conf/server.yaml | 3 + .../config/util/DataSourceParameterConverter.java | 7 + .../proxy/config/yaml/YamlDataSourceParameter.java | 4 + .../converter/AddResourcesStatementConverter.java | 4 + .../util/DataSourceParameterConverterTest.java | 17 +- .../AddResourcesStatementConverterTest.java | 8 +- .../authentication/MySQLAuthenticationHandler.java | 16 +- .../prepare/MySQLComStmtPrepareExecutor.java | 15 +- .../postgresql/PostgreSQLFrontendEngine.java | 2 - .../PostgreSQLAuthenticationEngine.java | 5 +- .../command/PostgreSQLConnectionContext.java | 22 +- .../command/query/binary/PostgreSQLPortal.java | 13 +- .../binary/bind/PostgreSQLComBindExecutor.java | 5 +- .../binary/close/PostgreSQLComCloseExecutor.java | 10 +- .../binary/parse/PostgreSQLComParseExecutor.java | 4 +- .../postgresql/PostgreSQLFrontendEngineTest.java | 7 - .../PostgreSQLAuthenticationEngineTest.java | 8 - .../PostgreSQLCommandExecutorFactoryTest.java | 16 +- .../binary/bind/PostgreSQLComBindExecutorTest.java | 12 +- .../close/PostgreSQLComCloseExecutorTest.java | 11 +- .../parse/PostgreSQLComParseExecutorTest.java | 5 - .../scaling/web/HttpServerHandler.java | 6 +- .../preparer/splitter/InventoryTaskSplitter.java | 9 +- .../shardingsphere-scaling-distsql/pom.xml | 1 + .../pom.xml | 17 +- .../exception/ScalingJobOperateException.java | 13 +- .../handler/CheckScalingJobQueryResultSet.java | 38 +- .../distsql/handler/DropScalingJobUpdater.java | 22 +- .../distsql/handler/ResetScalingJobUpdater.java | 26 +- .../handler/ShowScalingJobListQueryResultSet.java | 39 +- .../ShowScalingJobStatusQueryResultSet.java | 75 ++ .../distsql/handler/StartScalingJobUpdater.java | 22 +- .../distsql/handler/StopScalingJobUpdater.java | 22 +- ...dingsphere.infra.distsql.query.DistSQLResultSet | 4 +- ....shardingsphere.infra.distsql.update.RALUpdater | 5 +- .../core/ScalingStatementParserEngineTest.java | 41 - .../statement/CheckScalingJobStatement.java | 4 +- .../distsql/statement/DropScalingJobStatement.java | 4 +- .../statement/ResetScalingJobStatement.java | 4 +- .../statement/ShowScalingJobListStatement.java | 4 +- .../statement/ShowScalingJobStatusStatement.java | 4 +- .../statement/StartScalingJobStatement.java | 4 +- .../distsql/statement/StopScalingJobStatement.java | 4 +- .../src/main/antlr4/imports/mysql/BaseRule.g4 | 2 + .../impl/MySQLDCLStatementSQLVisitor.java | 3 - .../statement/impl/MySQLStatementSQLVisitor.java | 2 +- .../src/main/antlr4/imports/oracle/BaseRule.g4 | 40 +- .../src/main/antlr4/imports/oracle/DDLStatement.g4 | 28 + .../src/main/antlr4/imports/oracle/DMLStatement.g4 | 352 +++++- .../main/antlr4/imports/oracle/OracleKeyword.g4 | 132 +++ .../sql/parser/autogen/OracleStatement.g4 | 2 + .../impl/OracleDDLStatementSQLVisitor.java | 14 + .../impl/OracleDMLStatementSQLVisitor.java | 225 ++-- .../core/database/visitor/SQLVisitorRule.java | 10 +- .../common/value/identifier/IdentifierValue.java | 7 +- .../handler/dml/SelectStatementHandler.java | 2 +- .../statement/oracle/ddl/OracleAuditStatement.java | 28 +- .../oracle/ddl/OracleNoAuditStatement.java | 28 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../scaling/test/mysql/util/ScalingUtil.java | 3 +- .../junit/compose/ContainerCompose.java | 3 + .../storage/impl/PostgreSQLContainer.java | 1 + .../test/integration/engine/it/BaseITCase.java | 3 + .../ddl/dataset/sharding_governance/alter_add.xml} | 13 +- .../dataset/sharding_governance/alter_change.xml} | 12 +- .../dataset/sharding_governance/alter_drop.xml} | 11 +- .../dataset/sharding_governance/create_index.xml} | 13 +- .../dataset/sharding_governance/create_table.xml} | 12 +- .../sharding_governance/create_unique_index.xml} | 13 +- .../dataset/sharding_governance/drop_table.xml} | 9 +- .../cases/ddl/ddl-integration-test-cases.xml | 30 +- .../test/resources/docker/db/docker-compose.yml | 13 + .../docker-compose.yml | 15 +- .../docker-compose.yml | 15 +- .../resources/docker/encrypt/docker-compose.yml | 15 +- .../docker/readwrite_splitting/docker-compose.yml | 17 +- .../docker/sharding_governance/docker-compose.yml | 17 +- .../test/resources/docker/tbl/docker-compose.yml | 15 +- .../resources/env/db/init-sql/postgresql/init.sql | 148 +++ .../init-sql/postgresql/init.sql | 1133 ++++++++++++++++++++ .../init-sql/postgresql/init.sql | 1094 +++++++++++++++++++ .../env/encrypt/init-sql/postgresql/init.sql | 10 + .../init-sql/postgresql/init.sql | 41 + .../init-sql/postgresql/init.sql | 8 + .../resources/env/tbl/init-sql/postgresql/init.sql | 29 + .../shardingsphere-parser-test/pom.xml | 7 +- .../asserts/SQLCaseAssertContext.java | 11 +- .../asserts/segment/distsql/DataSourceAssert.java | 2 + ...Assert.java => AbstractSQLStatementAssert.java} | 31 +- .../asserts/statement/SQLStatementAssert.java | 16 +- .../asserts/statement/ddl/DDLStatementAssert.java | 10 + .../statement/ddl/impl/AuditStatementAssert.java} | 42 +- .../ddl/impl/NoAuditStatementAssert.java} | 42 +- .../statement/distsql/DistSQLStatementAssert.java | 54 + .../RALStatementAssert.java} | 37 +- .../impl/QueryableRALStatementAssert.java} | 35 +- .../ral/impl/UpdatableRALStatementAssert.java} | 31 +- .../query/ShowScalingJobListStatementAssert.java} | 39 +- .../distsql/rql/impl/ShowRulesStatementAssert.java | 12 +- .../ShowDatabaseDiscoveryRulesStatementAssert.java | 2 +- .../impl/rule/ShowEncryptRulesStatementAssert.java | 2 +- ...ShowReadwriteSplittingRulesStatementAssert.java | 2 +- ...owShardingBindingTableRulesStatementAssert.java | 2 +- ...ShardingBroadcastTableRulesStatementAssert.java | 2 +- .../ShowShardingTableRulesStatementAssert.java | 2 +- .../engine/SQLParserParameterizedTest.java | 26 +- .../UnsupportedSQLParserParameterizedTest.java | 4 +- .../jaxb/{sql/SQLCase.java => Case.java} | 14 +- .../test/sql/parser/parameterized/jaxb/Cases.java | 8 +- .../SQLCasesRegistry.java => CasesRegistry.java} | 20 +- .../jaxb/cases/domain/SQLParserTestCases.java | 31 +- .../segment/impl/distsql/ExpectedDataSource.java | 3 + .../statement/ddl/AuditStatementTestCase.java | 8 +- .../statement/ddl/NoAuditStatementTestCase.java | 8 +- .../ral/ShowScalingJobListStatementTestCase.java | 8 +- ...howDataBaseDiscoveryRulesStatementTestCase.java | 2 +- .../ShowEncryptRulesStatementTestCase.java | 2 +- ...owReadWriteSplittingRulesStatementTestCase.java | 2 +- ...ShardingBindingTableRulesStatementTestCase.java | 2 +- ...ardingBroadcastTableRulesStatementTestCase.java | 2 +- .../ShowShardingTableRulesStatementTestCase.java | 2 +- .../{sql/SQLCase.java => distsql/DistSQLCase.java} | 20 +- .../SQLCases.java => distsql/DistSQLCases.java} | 15 +- .../jaxb/distsql/loader/DistSQLCasesLoader.java | 71 ++ .../sql/parser/parameterized/jaxb/sql/SQLCase.java | 9 +- .../parser/parameterized/jaxb/sql/SQLCases.java | 3 +- .../jaxb/sql/loader/SQLCasesLoader.java | 103 +- .../parser/parameterized/loader/CasesLoader.java | 104 ++ .../dml/select-relation.xml => case/ddl/audit.xml} | 12 +- .../select-relation.xml => case/ddl/no-audit.xml} | 11 +- .../main/resources/case/dml/select-aggregate.xml | 18 + .../main/resources/case/dml/select-expression.xml | 144 +++ .../src/main/resources/case/dml/select-join.xml | 246 +++++ .../src/main/resources/case/dml/select.xml | 248 +++++ .../dml/select-relation.xml => case/ral/query.xml} | 8 +- .../src/main/resources/case/rdl/create.xml | 19 +- .../{dml/select-relation.xml => ddl/audit.xml} | 8 +- .../{dml/select-relation.xml => ddl/no-audit.xml} | 7 +- .../sql/supported/dml/select-aggregate.xml | 2 + .../sql/supported/dml/select-distinct.xml | 2 + .../sql/supported/dml/select-expression.xml | 5 +- .../sql/supported/dml/select-order-by.xml | 2 +- .../sql/supported/dml/select-relation.xml | 5 + .../sql/supported/dml/select-sub-query.xml | 2 +- .../main/resources/sql/supported/dml/select.xml | 12 +- .../{dml/select-relation.xml => ral/query.xml} | 6 +- .../src/main/resources/sql/supported/rdl/alter.xml | 12 +- .../main/resources/sql/supported/rdl/create.xml | 23 +- .../src/main/resources/sql/supported/rdl/drop.xml | 16 +- .../src/main/resources/sql/supported/rql/show.xml | 18 +- .../DistSQLParserParameterizedTest.java | 64 ++ 367 files changed, 8003 insertions(+), 2466 deletions(-)
