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

Optimize rewriting module #2435

Merged
merged 40 commits into from
May 23, 2019
Merged

Optimize rewriting module #2435

merged 40 commits into from
May 23, 2019

Conversation

tristaZero
Copy link
Contributor

Fixes #2275.

Some suggestions:

  • Remove SQLRewriteEngine.originalSQL, use sqlStatement.getLogicSQL()
  • For EncryptRule with SQLRewriteEngine, use current DatabaseType instead of DatabaseType.MySQL
  • SQLRewriteEngine.isRewriteDistinctLiteral => isMeedRewriteDistinctLiteral
  • SQLRewriteEngine.isContainsAggregationDistinctToken can move to sqlStatement, and let token type as an input parameter
  • SelectStatement.getFirstSelectItemStartIndex() should as a Token and Split append distinct from rewriteInitialLiteral
  • Make sure responsibility of rewriter and engine, only rewriter can use token
  • EncryptSQLRewriter & ShardingSQLRewriter can new instance out of loop
  • Make unify with stopPosition & stopIndex
  • sqlBuilder is global field with SQLRewriteEngine, may avoid pass from private method by input parameter
  • Make accurate with javadoc on SQLRewriter.rewrite
  • Avoid start a new line if not exceed 200 char one line, at line 107 on EncryptSQLRewriter
  • Make input parameter as same sequence for differnet methods, like: EncryptSQLRewriter.encryptInsertOptimizeResultUnit and EncryptSQLRewriter.encryptInsertOptimizeResult's param: unit add Predicate if Optional can not be absent, at line 105 on EncryptSQLRewriter
  • InsertParameterUnit => InsertParameterGroup?
  • Decouple SQLBuilder & ParameterBuilder
  • Remove SchemaPlaceholder and test cases

tristaZero added 30 commits May 22, 2019 19:28
@tristaZero
delete originalSQL
193cb86
@tristaZero
modify EncryptSQLRewriter tests
c487713
@tristaZero
modify ShardingSQLRewriter tests
bd2761a
@tristaZero
use new rewrite engine
352db56
@tristaZero
use current DatabaseType instead of DatabaseType.MySQL
ba95531
@tristaZero
rename to isNeededToRewriteDistinctLiteral()
8b94635
@tristaZero
move isContainsAggregationDistinctToken() to sql statement
9d05060
@tristaZero
delete isContainsAggregationDistinctToken()
ecfee85
@tristaZero
setSelectItemPrefixToken(selectStatement);
f1b040e
@tristaZero
add SelectItemPrefixPlaceholder
9763557
@tristaZero
add SelectItemPrefixToken
58c276b
@tristaZero
new SelectItemPrefixToken()
f825f40
@tristaZero
append SelectItemPrefixPlaceholder
7203a27
@tristaZero
delete appendAggregationDistinctLiteral()
2bc02aa
@tristaZero
add assertSelectInWithAggregationDistinct()
da0d493
@tristaZero
add BaseSQLRewriter
b531015
@tristaZero
use base rewriter
95921d6
@tristaZero
Revert "use base rewriter"
16b79f7 
This reverts commit 95921d6
@tristaZero
modify rewrite()
6f6e74d
@tristaZero
delete rewriteRestLiteral()
97968ce
@tristaZero
add rewriteInitialLiteral()
c91b33b
@tristaZero
modify pattern()
42f81ed
@tristaZero
add isToRewriteSQLTokens()
31cf0d9
@tristaZero
use stopIndex instead of stopPosition
d38c38b
@tristaZero
modify java doc
d75747c
@tristaZero
delete new line
432d711
@tristaZero
Preconditions.checkArgument(assistedColumnName.isPresent()
b230a20
@tristaZero
rename to InsertParameterGroup
800be78
@tristaZero
reverse to InsertParameterUnit
bacc2ba
@tristaZero
set logic sql
b3f447b
tristaZero added 10 commits May 23, 2019 16:10
@tristaZero
delete SchemaPlaceholder
c835e25
@tristaZero
delete parameterBuilder
a4bf9a3
@tristaZero
add parameterBuilder
6cc8e15
@tristaZero
modify rewrite interface
f144d49
@tristaZero
modify rewrite implement
50e76c7
@tristaZero
modify generateSQL()
1ec04be
@tristaZero
Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int…
fde1873 
…o dev

# Conflicts:
#	sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java
#	sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java
@tristaZero
modify new rewrite engine
d34beda
@tristaZero
modify cases
d25be11
@tristaZero
delete setUp()
c563ae5
@coveralls
Copy link

Pull Request Test Coverage Report for Build 8202

  • 46 of 55 (83.64%) changed or added relevant lines in 13 files are covered.
  • 7 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.02%) to 60.406%
Changes Missing Coverage Covered Lines Changed/Added Lines %
sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/filler/common/dml/SelectItemsFiller.java 0 1 0.0%
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java 15 16 93.75%
sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java 0 1 0.0%
sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java 0 1 0.0%
sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/filler/common/dml/SelectItemFiller.java 0 5 0.0%
Files with Coverage Reduction New Missed Lines %
sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/filler/common/dml/SelectItemFiller.java 1 0.0%
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/builder/ParameterBuilder.java 6 77.5%
Totals Coverage Status
Change from base Build 8199: -0.02%
Covered Lines: 8101
Relevant Lines: 13411
💛 - Coveralls

@terrymanu terrymanu merged commit 30a911f into apache:dev May 23, 2019
@terrymanu terrymanu added this to the 4.0.0.M2 milestone May 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.0.0-RC2
Development

Successfully merging this pull request may close these issues.

Reconstruct rewriting module
3 participants
@tristaZero @coveralls @terrymanu