You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/10/12 09:08:36 UTC
[shardingsphere] branch master updated (61fb19d -> e008eea)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from 61fb19d Decouple LogicSQL and schema (#7753)
add e008eea Move all metadata related to infra-common module (#7755)
No new revisions were added by this update.
Summary of changes:
.../route/engine/ConsensusReplicationSQLRouter.java | 2 +-
.../encrypt/metadata/EncryptColumnMetaData.java | 2 +-
.../encrypt/metadata/EncryptMetaDataDecorator.java | 4 ++--
.../encrypt/metadata/EncryptMetaDataLoader.java | 6 +++---
.../encrypt/metadata/EncryptMetaDataDecoratorTest.java | 4 ++--
.../encrypt/metadata/EncryptMetaDataLoaderTest.java | 4 ++--
.../encrypt/merge/EncryptResultDecoratorEngine.java | 2 +-
.../encrypt/merge/dal/EncryptDALResultDecorator.java | 2 +-
.../dal/impl/DecoratedEncryptColumnsMergedResult.java | 2 +-
.../merge/dal/impl/EncryptColumnsMergedResult.java | 4 ++--
.../merge/dal/impl/MergedEncryptColumnsMergedResult.java | 2 +-
.../encrypt/merge/dql/EncryptAlgorithmMetaData.java | 2 +-
.../encrypt/merge/dql/EncryptDQLResultDecorator.java | 2 +-
.../encrypt/merge/EncryptResultDecoratorEngineTest.java | 2 +-
.../encrypt/merge/dal/EncryptDALResultDecoratorTest.java | 2 +-
.../merge/dal/MergedEncryptColumnsMergedResultTest.java | 4 ++--
.../impl/DecoratedEncryptColumnsMergedResultTest.java | 2 +-
.../encrypt/merge/dql/EncryptAlgorithmMetaDataTest.java | 2 +-
.../encrypt/merge/dql/EncryptDQLResultDecoratorTest.java | 2 +-
.../dql/fixture/EncryptColumnsMergedResultFixture.java | 2 +-
.../merge/dql/impl/EncryptColumnsMergedResultTest.java | 6 +++---
.../rewrite/condition/EncryptConditionEngine.java | 2 +-
.../parameter/EncryptParameterRewriterBuilder.java | 2 +-
.../impl/EncryptPredicateParameterRewriter.java | 2 +-
.../impl/EncryptPredicateColumnTokenGenerator.java | 2 +-
.../impl/EncryptPredicateRightValueTokenGenerator.java | 2 +-
.../EncryptSQLRewriterParameterizedTest.java | 4 ++--
.../route/engine/PrimaryReplicaReplicationSQLRouter.java | 2 +-
.../engine/PrimaryReplicaReplicationSQLRouterTest.java | 2 +-
.../shardingsphere-shadow-common/pom.xml | 6 ++++++
.../parameter/ShadowParameterRewriterBuilder.java | 2 +-
.../shadow/route/engine/ShadowSQLRouter.java | 2 +-
.../shadow/route/engine/ShadowSQLRouterTest.java | 2 +-
.../judge/impl/PreparedShadowDataSourceRouterTest.java | 2 +-
.../judge/impl/SimpleShadowDataSourceRouterTest.java | 2 +-
.../sharding/metadata/ShardingMetaDataDecorator.java | 6 +++---
.../sharding/metadata/ShardingMetaDataLoader.java | 6 +++---
.../sharding/merge/dal/ShardingDALResultMerger.java | 2 +-
.../sharding/merge/dal/show/LogicTablesMergedResult.java | 2 +-
.../merge/dal/show/ShowCreateTableMergedResult.java | 2 +-
.../sharding/merge/dql/ShardingDQLResultMerger.java | 2 +-
.../merge/dql/groupby/GroupByMemoryMergedResult.java | 6 +++---
.../merge/dql/groupby/GroupByStreamMergedResult.java | 2 +-
.../merge/dql/orderby/OrderByStreamMergedResult.java | 2 +-
.../sharding/merge/dql/orderby/OrderByValue.java | 6 +++---
.../sharding/merge/ShardingResultMergerEngineTest.java | 2 +-
.../merge/dal/show/ShowCreateTableMergedResultTest.java | 4 ++--
.../merge/dal/show/ShowTablesMergedResultTest.java | 4 ++--
.../sharding/merge/dql/ShardingDQLResultMergerTest.java | 6 +++---
.../merge/dql/groupby/GroupByStreamMergedResultTest.java | 6 +++---
.../merge/dql/orderby/OrderByStreamMergedResultTest.java | 6 +++---
.../sharding/merge/dql/orderby/OrderByValueTest.java | 2 +-
.../parameter/ShardingParameterRewriterBuilder.java | 2 +-
.../parameterized/MixSQLRewriterParameterizedTest.java | 10 +++++-----
.../ShardingSQLRewriterParameterizedTest.java | 10 +++++-----
.../sharding/route/engine/ShardingSQLRouter.java | 2 +-
.../condition/engine/ShardingConditionEngineFactory.java | 4 ++--
.../engine/impl/InsertClauseShardingConditionEngine.java | 2 +-
.../engine/impl/WhereClauseShardingConditionEngine.java | 2 +-
.../route/engine/type/ShardingRouteEngineFactory.java | 2 +-
.../broadcast/ShardingTableBroadcastRoutingEngine.java | 2 +-
.../engine/ShardingConditionEngineFactoryTest.java | 4 ++--
.../ShardingTableBroadcastRoutingEngineTest.java | 6 +++---
.../route/engine/type/standard/AbstractSQLRouteTest.java | 8 ++++----
.../ShardingCreateFunctionStatementValidatorTest.java | 2 +-
.../ShardingCreateProcedureStatementValidatorTest.java | 2 +-
.../impl/ShardingInsertStatementValidatorTest.java | 2 +-
.../core/yaml/swapper/RuleSchemaMetaDataYamlSwapper.java | 8 ++++----
shardingsphere-infra/shardingsphere-infra-binder/pom.xml | 5 +++++
.../apache/shardingsphere/infra/binder}/LogicSQL.java | 2 +-
.../infra/binder/SQLStatementContextFactory.java | 2 +-
.../insert/keygen/engine/GeneratedKeyContextEngine.java | 4 ++--
.../select/projection/engine/ProjectionEngine.java | 2 +-
.../projection/engine/ProjectionsContextEngine.java | 2 +-
.../infra/binder/segment/table/TablesContext.java | 2 +-
.../binder/statement/dml/InsertStatementContext.java | 2 +-
.../binder/statement/dml/SelectStatementContext.java | 2 +-
.../keygen/engine/GeneratedKeyContextEngineTest.java | 6 +++---
.../select/projection/engine/ProjectionEngineTest.java | 2 +-
.../projection/engine/ProjectionsContextEngineTest.java | 2 +-
.../infra/binder/segment/table/TablesContextTest.java | 2 +-
.../binder/statement/SQLStatementContextFactoryTest.java | 2 +-
.../statement/impl/InsertStatementContextTest.java | 2 +-
shardingsphere-infra/shardingsphere-infra-common/pom.xml | 2 +-
.../infra/metadata/database}/MetaDataConnection.java | 2 +-
.../infra/metadata/database}/column/ColumnMetaData.java | 2 +-
.../metadata/database}/column/ColumnMetaDataLoader.java | 4 ++--
.../infra/metadata/database}/index/IndexMetaData.java | 2 +-
.../metadata/database}/index/IndexMetaDataLoader.java | 4 ++--
.../infra/metadata/database}/schema/SchemaMetaData.java | 4 ++--
.../metadata/database}/schema/SchemaMetaDataLoader.java | 6 +++---
.../infra/metadata/database}/table/TableMetaData.java | 6 +++---
.../metadata/database}/table/TableMetaDataLoader.java | 10 +++++-----
.../infra/metadata/database}/util/JdbcUtil.java | 2 +-
.../metadata/refresh/TableMetaDataLoaderCallback.java | 2 +-
.../impl/AlterTableStatementMetaDataRefreshStrategy.java | 4 ++--
.../CreateIndexStatementMetaDataRefreshStrategy.java | 2 +-
.../CreateTableStatementMetaDataRefreshStrategy.java | 2 +-
.../impl/DropIndexStatementMetaDataRefreshStrategy.java | 4 ++--
.../infra/metadata/schema/RuleSchemaMetaData.java | 4 ++--
.../infra/metadata/schema/RuleSchemaMetaDataLoader.java | 6 +++---
.../infra/metadata/schema/spi/RuleMetaDataDecorator.java | 2 +-
.../infra/metadata/schema/spi/RuleMetaDataLoader.java | 4 ++--
.../infra/metadata/database}/MetaDataConnectionTest.java | 2 +-
.../database}/column/ColumnMetaDataLoaderTest.java | 2 +-
.../database}/index/IndexMetaDataLoaderTest.java | 16 ++++++++--------
.../database}/schema/SchemaMetaDataLoaderTest.java | 2 +-
.../metadata/database}/schema/SchemaMetaDataTest.java | 6 +++---
.../database}/table/TableMetaDataLoaderTest.java | 6 +++---
.../metadata/database}/table/TableMetaDataTest.java | 4 ++--
.../infra/metadata/database}/util/JdbcUtilTest.java | 7 ++++---
.../DataNodeRoutedFixtureRuleMetaDataDecorator.java | 4 ++--
.../fixture/loader/CommonFixtureRuleMetaDataLoader.java | 4 ++--
.../loader/DataNodeRoutedFixtureRuleMetaDataLoader.java | 4 ++--
.../refresh/AbstractMetaDataRefreshStrategyTest.java | 8 ++++----
.../AlterTableStatementMetaDataRefreshStrategyTest.java | 6 +++---
.../CreateTableStatementMetaDataRefreshStrategyTest.java | 6 +++---
.../DropIndexStatementMetaDataRefreshStrategyTest.java | 2 +-
.../infra/metadata/schema/RuleSchemaMetaDataTest.java | 4 ++--
.../shardingsphere-infra-context/pom.xml | 2 +-
.../infra/context/kernel/KernelProcessor.java | 2 +-
.../executor/sql/context/ExecutionContextBuilder.java | 2 +-
.../shardingsphere/infra/executor/sql/log/SQLLogger.java | 2 +-
.../sql/context/ExecutionContextBuilderTest.java | 6 +++---
.../infra/executor/sql/log/SQLLoggerTest.java | 2 +-
shardingsphere-infra/shardingsphere-infra-merge/pom.xml | 5 -----
.../apache/shardingsphere/infra/merge/MergeEngine.java | 2 +-
.../infra/merge/engine/decorator/ResultDecorator.java | 2 +-
.../merge/engine/decorator/ResultDecoratorEngine.java | 2 +-
.../decorator/impl/TransparentResultDecorator.java | 2 +-
.../infra/merge/engine/merger/ResultMerger.java | 2 +-
.../engine/merger/impl/TransparentResultMerger.java | 2 +-
.../merge/result/impl/memory/MemoryMergedResult.java | 2 +-
.../shardingsphere/infra/merge/MergeEngineTest.java | 2 +-
.../decorator/impl/TransparentResultDecoratorTest.java | 2 +-
.../engine/merger/impl/TransparentResultMergerTest.java | 2 +-
.../fixture/decorator/ResultDecoratorEngineFixture.java | 2 +-
.../merge/fixture/decorator/ResultDecoratorFixture.java | 2 +-
.../infra/merge/fixture/merger/ResultMergerFixture.java | 2 +-
.../impl/memory/fixture/TestMemoryMergedResult.java | 2 +-
.../shardingsphere-infra-rewrite-engine/pom.xml | 11 -----------
.../shardingsphere/infra/rewrite/SQLRewriteEntry.java | 2 +-
.../infra/rewrite/context/SQLRewriteContext.java | 2 +-
.../parameter/rewriter/ParameterRewriterBuilder.java | 2 +-
.../rewrite/sql/token/generator/SQLTokenGenerators.java | 2 +-
.../sql/token/generator/aware/SchemaMetaDataAware.java | 2 +-
.../infra/rewrite/SQLRewriteEntryTest.java | 2 +-
.../infra/rewrite/context/SQLRewriteContextTest.java | 2 +-
.../rewrite/engine/GenericSQLRewriteEngineTest.java | 2 +-
.../infra/rewrite/engine/RouteSQLRewriteEngineTest.java | 2 +-
shardingsphere-infra/shardingsphere-infra-route/pom.xml | 5 -----
.../org/apache/shardingsphere/infra/route/SQLRouter.java | 2 +-
.../infra/route/UnconfiguredSchemaSQLRouter.java | 2 +-
.../infra/route/engine/SQLRouteEngine.java | 2 +-
.../shardingsphere/infra/route/hook/RoutingHook.java | 2 +-
.../shardingsphere/infra/route/hook/SPIRoutingHook.java | 2 +-
.../infra/route/engine/SQLRouteEngineTest.java | 4 ++--
.../route/fixture/router/SQLRouterFailureFixture.java | 2 +-
.../infra/route/fixture/router/SQLRouterFixture.java | 2 +-
.../infra/route/hook/SPIRoutingHookTest.java | 2 +-
.../infra/route/hook/fixture/RoutingHookFixture.java | 2 +-
.../core/statement/ShardingSpherePreparedStatement.java | 4 ++--
.../jdbc/core/statement/ShardingSphereStatement.java | 4 ++--
.../DatabaseCommunicationEngineFactory.java | 4 ++--
.../jdbc/JDBCDatabaseCommunicationEngine.java | 4 ++--
.../proxy/backend/response/query/QueryHeaderBuilder.java | 2 +-
.../sctl/explain/ShardingCTLExplainBackendHandler.java | 4 ++--
.../backend/response/query/QueryHeaderBuilderTest.java | 8 ++++----
.../sctl/hint/ShardingCTLHintBackendHandlerTest.java | 4 ++--
.../core/execute/executor/dumper/AbstractJDBCDumper.java | 2 +-
.../job/preparer/splitter/InventoryDataTaskSplitter.java | 2 +-
.../scaling/core/metadata/MetaDataManager.java | 4 ++--
.../scaling/core/metadata/MetaDataManagerTest.java | 4 ++--
.../shardingsphere/scaling/mysql/MySQLBinlogDumper.java | 2 +-
.../scaling/postgresql/wal/WalEventConverter.java | 2 +-
175 files changed, 285 insertions(+), 294 deletions(-)
rename shardingsphere-infra/{shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/sql => shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder}/LogicSQL.java (96%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/MetaDataConnection.java (99%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/column/ColumnMetaData.java (95%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/column/ColumnMetaDataLoader.java (97%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/index/IndexMetaData.java (94%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/index/IndexMetaDataLoader.java (94%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/schema/SchemaMetaData.java (96%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/schema/SchemaMetaDataLoader.java (93%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/table/TableMetaData.java (94%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/table/TableMetaDataLoader.java (86%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database}/util/JdbcUtil.java (96%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database}/MetaDataConnectionTest.java (97%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database}/column/ColumnMetaDataLoaderTest.java (98%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database}/index/IndexMetaDataLoaderTest.java (95%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database}/schema/SchemaMetaDataLoaderTest.java (97%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database}/schema/SchemaMetaDataTest.java (94%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database}/table/TableMetaDataLoaderTest.java (96%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database}/table/TableMetaDataTest.java (94%)
rename shardingsphere-infra/{shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/metadata => shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database}/util/JdbcUtilTest.java (96%)