Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Standardize of merge engnie #3709

Merged
merged 17 commits into from Dec 11, 2019
Merged

Standardize of merge engnie #3709

merged 17 commits into from Dec 11, 2019

Conversation

terrymanu
Copy link
Member

Changes proposed in this pull request:

  • Add LocalDataMergedResult
  • Add subclass of LocalDataMergedResult: SingleLocalDataMergedResult & MultipleLocalDataMergedResult
  • Add TransparentMergedResult
  • Move encrypt merge logic to encrypt package

@terrymanu
add LocalDataMergedResult
de87ed6
@terrymanu
remove ShowDatabasesMergedResult's constructor of queryResults
64820eb
@terrymanu
refactor LocalDataMergedResult
d361f05
@terrymanu
add LocalDataMergedResult & SingleLocalDataMergedResult
8ddb809
@terrymanu
remove LocalMergedResultAdapter
2f284ee
@terrymanu
rename MergedResultMetaData to EncryptorMetaData
84f8653
@terrymanu
rename ShowOtherMergedResult to TransparentMergedResult
ca565d9
@terrymanu
refactor test case for TransparentMergedResultTest
a6034b6
@terrymanu
refactor SingleLocalDataMergedResultTest
b5fc9a5
@terrymanu
add MultipleLocalDataMergedResultTest
19ba696
@terrymanu
add package name of encrypt.dal and encrypt.dql
6e672b1
@terrymanu
rename EncryptMergeEngine to DQLEncryptMergeEngine
92ff37b
@terrymanu
add generic for MemoryMergedResult
32327d4
@terrymanu
refactor EncryptResultSet's field as final
3ef8dbc
@terrymanu
add desc table for encrypt only
dd08e70
@terrymanu
refactor desc table for sharding + encrypt
359d103
@terrymanu
remove DescribeTableMergedResult from DALMergeEngine
c66aa34
@terrymanu terrymanu added this to the 4.0.0-Release milestone Dec 10, 2019
@coveralls
Copy link

Pull Request Test Coverage Report for Build 1124

  • 58 of 132 (43.94%) changed or added relevant lines in 17 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.05%) to 68.077%
Changes Missing Coverage Covered Lines Changed/Added Lines %
sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatement.java 5 9 55.56%
sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatement.java 5 9 55.56%
sharding-core/sharding-core-merge/src/main/java/org/apache/shardingsphere/core/merge/encrypt/dal/DALEncryptMergeEngine.java 0 5 0.0%
sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java 0 10 0.0%
sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/EncryptResultSet.java 9 60 15.0%
Totals Coverage Status
Change from base Build 602: -0.05%
Covered Lines: 11388
Relevant Lines: 16728
💛 - Coveralls

@KomachiSion KomachiSion merged commit b130b9a into apache:dev Dec 11, 2019
@terrymanu terrymanu deleted the plugin branch December 11, 2019 01:53
avalon566 pushed a commit that referenced this pull request Dec 18, 2019
@KomachiSion @avalon566
Sharding scaling synchronize main branch (#3754)
a41f437 
* Correct mismatched comments (#3594)

* #3587, cache DataSourceMetaData (#3588)

* #3587, cache DataSourceMetaData

* #3587, add test case

* fixes apollo debug & warn log, control log out by slf4j xml file. (#3583)

* fixes apollo debug & warn log.

* Move jul-to-slf4j -> root pom.

* fixes jul-to-slf4j scope -> compile.

* remove maven default scope.

* Update snowflake algorithm to support modulus of 2^n  (#3595)

* update vibration offset

* add vibration offset test case

* update vibration offset

* update vibration offset

* modify vibration offset test case

* modify vibration offset test case

* Refactor metadata (#3604)

* decouple DatabaseType and DataSourceInfo

* fix use == for string equals

* decouple DataSourceMetaData and DataSourceInfo

* fix javadoc

* refactor LogicSchema.getDataSourceInfoMap()

* reuse DatabaseAccessConfiguration and remove DataSourceInfo

* refactor SQLExecuteCallback

* change TableMetaDataInitializer's getTables parameter error. (#3589)

* Modify SnowflakeShardingKeyGeneratorTest Unit-test case (#3610)

* make all pom files consist (#3614)

* make consist with pom

* make consist with pom

* adjust dependency sequence of ui-backend

* for code style

* ignore db test (#3615)

* simplify test case assertLastDigitalOfGenerateKeySameMillisecond (#3616)

* support SELECT DATABASE() (#3622)

* Fixes #3627 (#3629)

* move StatementExecuteUnit to sql package

* move ShardingExecuteEngine to engine package

* for code style

* rename QueryResultBasedQueryResultFixture and ResultSetBasedQueryResultFixture

* refactor DistinctQueryResult.getQueryRows()

* skip distinct merge for group by and aggregation only

* add DQLMergeEngine.isNeedProcessOrderBy

* use group by to merge distinct row

* add DQLMergeEngine.setGroupByForDistinctRow

* remove useless SelectItemsSegment.findSelectItemSegments

* code style for AggregationDistinctQueryResult

* code style for AggregationDistinctQueryResult

* remove DistinctQueryResult.divide()

* remove useless DistinctQueryResult

* use group by to process aggregation distinct

* remove useless AggregationDistinctQueryResult

* remove useless AggregationDistinctQueryMetaData

* remove useless QueryResult.getQueryResultMetaData()

* remove useless QueryRow.distinctColumnIndexes

* remove useless QueryRow.distinctColumnIndexes

* remove useless QueryRow.@EqualsAndHashCode

* remove useless QueryRow

* adjust constructor seq of DQLMergeEngine

* refactor DQLMergeEngine's constructor

* move ProjectionsContext.getColumnLabels() to ProjectionsContextEngine

* remove DQLMergeEngine.tableMetas

* refactor DQLMergeEngine

* code style for ProjectionsContextEngine

* #3550, update SERVER_VERSION of Sharding-Proxy (#3632)

* Add maxVibrationOffset to LeafSnowflakeKeyGenerator (#3636)

* #3640, fix missing milliseconds when reading (#3643)

* #3640, fix missing milliseconds when reading

* #3640, for test case

* Uniform naming style for properties (#3649)

* Decouple sharding-core-execute module and encrypt (#3654)

* remove getter of StreamQueryResult.queryResultMetaData

* refactor MemoryQueryResult

* refactor StreamQueryResult

* refactor StreamQueryResult

* refactor MemoryQueryResult

* refactor QueryResultMetaData

* move decrypt from MemoryQueryResult & StreamQueryResult to EncryptResultSet, ShardingResultSet & JDBCDatabaseCommunicationEngine

* remove useless SuppressWarnings

* adjust method sequence of QueryResult

* use MergedResult.getValue(columnIndex) instead of MergedResult.getValue(columnLabel)

* remove useless MergedResult.getValue(columnLabel)

* remove useless QueryResult.getValue(columnLabel)

* decouple QueryResultMetaData and queryWithCipherColumn

* remove QueryResultMetaData.queryWithCipherColumn

* refactor QueryResultMetaData.findShardingEncryptorWithTable

* remove QueryResultMetaData.getShardingEncryptor

* remove QueryResultMetaData.columnLabelAndIndexes

* remove QueryResultMetaData

* remove QueryResultUtil

* Update docker java version (#3652)

* Update docker java version

* Revert "Update docker java version"

This reverts commit 16c913b.

* Change postgresql driver version

* Remove QueryResult‘s fixture from merge test case (#3661)

* remove useless throw exception for MergeEngineFactory

* remove useless throw exception for MergeEngineFactoryTest

* decouple MergeEngineFactoryTest and ResultSetBasedQueryResultFixture

* decouple DALMergeEngineTest and ResultSetBasedQueryResultFixture

* decouple ShowCreateTableMergedResultTest and ResultSetBasedQueryResultFixture

* decouple ShowDatabasesMergedResultTest and ResultSetBasedQueryResultFixture

* decouple ShowOtherMergedResultTest and ResultSetBasedQueryResultFixture

* decouple ShowTablesMergedResultTest and ResultSetBasedQueryResultFixture

* refactor LogicTablesMergedResult's constructor

* decouple DQLMergeEngineTest and ResultSetBasedQueryResultFixture

* decouple StreamMergedResultTest and ResultSetBasedQueryResultFixture

* decouple MemoryQueryResultRowTest and ResultSetBasedQueryResultFixture

* decouple MemoryMergedResultTest and ResultSetBasedQueryResultFixture

* decouple GroupByMemoryMergedResultTest and ResultSetBasedQueryResultFixture

* decouple GroupByRowComparatorTest and ResultSetBasedQueryResultFixture

* decouple GroupByStreamMergedResultTest and ResultSetBasedQueryResultFixture

* decouple GroupByValueTest and ResultSetBasedQueryResultFixture

* decouple IteratorStreamMergedResultTest and ResultSetBasedQueryResultFixture

* decouple OrderByStreamMergedResultTest and ResultSetBasedQueryResultFixture

* decouple OrderByValueTest and ResultSetBasedQueryResultFixture

* decouple LimitDecoratorMergedResultTest and ResultSetBasedQueryResultFixture

* decouple RowNumberDecoratorMergedResultTest and ResultSetBasedQueryResultFixture

* decouple TopAndRowNumberDecoratorMergedResultTest and ResultSetBasedQueryResultFixture

* remove ResultSetBasedQueryResultFixture

* decouple DescribeTableMergedResultTest and QueryResultBasedQueryResultFixture

* remove QueryResultBasedQueryResultFixture

* Decouple hook and route dependency for execute module (#3665)

* decouple RouteUnit and SQLExecutionHook

* decouple RouteUnit and StatementExecuteUnit

* refactor SQLExecuteCallback.executeSQL

* decouple RouteUnit and SQLExecutePrepareCallback

* refactor SQLExecutePrepareCallback.createStatementExecuteUnit()

* parse sqlserver keyword (#3667)

* ci test (#3669)

* Fixes #3671 (#3672)

* remove useless constructor for ShowDatabasesMergedResult

* refactor ShowDatabasesMergedResult

* hide plain column for desc table

* fix test case

* Simplify memory merged result  (#3682)

* for code style

* pull up currentResultSetRow to MemoryMergedResult

* remove useless labelAndIndexMap for MemoryMergedResult

* refactor MemoryMergedResult.init()

* pull up setCurrentResultSetRow to MemoryMergedResult

* remove ShowIndexMergedResult, ShowTablesMergedResult & ShowTableStatusMergedResult

* Fixes #2884 (#3663)

* Fixes #2884
* Fixes #2884, add test cases;
* Format adjustment.
* End file with a blank line.

* load-table-metadata (#3684)

* optimize orchestration datasource (#3685)

* Decouple encrypt and sharding with ResultSet (#3688)

* remove ShardingRule.isRoutingByHint()

* refactor AbstractDataSourceAdapter.close()

* remove useless getter for AbstractConnectionAdapter

* decouple encrypt and sharding from ResultSet

* clear code,delete no use empty judgment code. (#3690)

* change TableMetaDataInitializer's getTables parameter error.

* clear code,delete no use empty judgment code.

* for code style (#3689)

* fixes #3701, refactor ColumnMetaData class, remove notNull & autoIncrement fields. (#3705)

* Standardize of merge engnie (#3709)

* add LocalDataMergedResult

* remove ShowDatabasesMergedResult's constructor of queryResults

* refactor LocalDataMergedResult

* add LocalDataMergedResult & SingleLocalDataMergedResult

* remove LocalMergedResultAdapter

* rename MergedResultMetaData to EncryptorMetaData

* rename ShowOtherMergedResult to TransparentMergedResult

* refactor test case for TransparentMergedResultTest

* refactor SingleLocalDataMergedResultTest

* add MultipleLocalDataMergedResultTest

* add package name of encrypt.dal and encrypt.dql

* rename EncryptMergeEngine to DQLEncryptMergeEngine

* add generic for MemoryMergedResult

* refactor EncryptResultSet's field as final

* add desc table for encrypt only

* refactor desc table for sharding + encrypt

* remove DescribeTableMergedResult from DALMergeEngine

* statement function strtodate (#3718)

* Refactor: update a tiny issue (#3714)

* Statement function base64 aesencrypt (#3726)

* statement function base64 aesencrypt

* statement function base64 aesencrypt

* statement function base64 aesencrypt

* statement function base64 aesencrypt

* #3725, fix MemoryQueryResult wrong data type (#3728)

* Encrypt statement column (#3715)

* encrypt-statement-column

* encrypt statement column

* encrypt statement column

* encrypte statement column

* Check tableRule and throw error information friendly (#3734)

* Encrypt select statement in operator (#3733)

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* encrypt statement in operator

* Decouple Rewrite module with sharding and encrypt (#3741)

* move getLogicAndActualTables from BaseShardingEngine to ShardingSQLRewriteEngine

* refactor ShardingSQLRewriteEngine

* add DefaultSQLBuilder and ShardingSQLBuilder

* refactor DefaultSQLBuilder & ShardingSQLBuilder's input params

* add AbstractSQLBuilder

* split Alterable to LogicAndActualTablesAware and RoutingUnitAware

* remove useless toString

* split InsertValuesToken to ShardingInsertValuesToken & EncryptInsertValuesToken

* Add Multilingual Settings (#3708)

* feature[sharding-ui-frontend]:Support multilingual presentation #3266

* refactor[sharding-ui-frontend]:Improve translation content

* [sharding-ui-frontend]:Add Multilingual Settings

* feature[sharding-ui-frontend]:Keep the name unified

* Add new module shardingsphere-sql-rewriter (#3746)

* add new module shardingsphere-sql-rewriter

* rename package from org.apache.shardingsphere.core.rewrite ot org.apache.shardingsphere.sql.rewriter

* rename package from org.apache.shardingsphere.core.rewrite ot org.apache.shardingsphere.sql.rewriter

* add module shardingsphere-sql-rewriter-test

* remove useless jaxb entity

* rename EncryptRewriteAssertionsRootEntityLoader to RewriteAssertionsRootEntityLoader

* refactor EncryptSQLRewriteEngineParameterizedTest

* refactor EncryptSQLRewriteEngineParameterizedTest

* add SQLRewriteEngineTestParameters

* add AbstractSQLRewriteEngineParameterizedTest

* refactor AbstractSQLRewriteEngineParameterizedTest.testParameters

* add SQLRewriteEngineTestParameters.type

* remove useless getter for AbstractSQLRewriteEngineParameterizedTest

* rename SQLRewriteEngineParameterizedTest to SQLRewriterParameterizedTest

* remove useless param from AbstractSQLRewriterParameterizedTest

* rename AbstractSQLRewriterParameterizedTest.createSQLRewriteResults()

* refactor EncryptSQLRewriterParameterizedTest

* refactor EncryptSQLRewriterParameterizedTest

* refactor pom of shardingsphere-sql-rewriter

* use RelationMetas instead of TableMetas in rewriter module

* add InsertValue

* add ShardingInsertValue

* decouple sharding-core-common & shardingsphere-sql-rewriter

* rename package from org.apache.shardingsphere.sql.rewriter.feature to org.apache.shardingsphere.sql.rewriter

* replace removed datasourceInfo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KomachiSion KomachiSion KomachiSion approved these changes

Assignees
No one assigned
Labels
feature: encrypt feature: sharding type: refactor
Projects
None yet
Milestone
4.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@terrymanu @coveralls @KomachiSion