1. 08 10月, 2019 5 次提交
  2. 07 10月, 2019 2 次提交
    • K
      Fix NullPointerException bug (#3176) · a0ffcf02
      kezhenxu94 提交于
      a0ffcf02
    • L
      Use SQLRewriteEngine and SQLRewriteDecorator decouple rewrite core and features (#3175) · 97e932c1
      Liang Zhang 提交于
      * split RewriteEngine to ShardingRewriteEngine, EncryptRewriteEngineTest, MasterSlaveRewriteEngineTest
      
      * rename MasterSlaveRewriteEngine to BasicRewriteEngine
      
      * refactor ShardingRewriteEngine and EncryptRewriteEngine
      
      * rename RewriteEngine to Rewriter
      
      * refactor SQLBuilder's constructor
      
      * use EncryptRewriteDecorator instead of EncryptRewriter
      
      * use ShardingRewriterDecorator instead of ShardingRewriter
      
      * rename BasicRewriter to SQLRewriteEngine
      
      * add SQLRewriteDecorator
      
      * remove SQLRewriteEngine.sqlStatementContext
      97e932c1
  3. 05 10月, 2019 3 次提交
    • P
      fix jacoco local report (#3173) · 00df40fe
      Pramy 提交于
      Change-Id: I9bad46fbc7527df5d59d10023820ee0bb118fa89
      00df40fe
    • L
      Add checkstyle template for CI check only (#3172) · 50bd12e9
      Liang Zhang 提交于
      * for checkstyle
      
      * add checkstyle goal to maven validate
      
      * skip autogen check
      50bd12e9
    • L
      Decouple insert SQL with generated key and encrypt (#3170) · 23829483
      Liang Zhang 提交于
      * remove ParameterBuilderFactory
      
      * refactor package of sql.builder
      
      * rename SQLRewriteEngine to RewriteEngine
      
      * refactor InsertSetGeneratedKeyColumnTokenGenerator
      
      * refactor InsertSetGeneratedKeyColumnTokenGenerator with SQLRouteResultAware
      
      * add OptionalSQLTokenGenerator.isGenerateSQLToken()
      
      * refactor OptionalSQLTokenGenerator.generateSQLToken()
      
      * refactor InsertEncryptColumnFromMetadataTokenGenerator
      
      * refactor InsertGeneratedKeyFromMetadataTokenGenerator
      
      * refactor InsertGeneratedKeyNameTokenGenerator
      
      * refactor InsertGeneratedKeyColumnTokenGenerator
      
      * refactor InsertAssistedQueryAndPlainColumnNamesTokenGenerator
      
      * add BaseGeneratedKeyTokenGenerator
      
      * refactor InsertValuesTokenGenerator
      
      * use InsertRegularNamesToken for key gen and encrypt together
      
      * rename InsertRegularNamesToken to FullInsertColumnsToken
      
      * merge GeneratedKeyForPartInsertColumnsTokenGenerator & EncryptForPartInsertColumnsTokenGenerator
      
      * rename FullInsertColumnsToken to InsertColumnsToken
      
      * rename GeneratedKeyInsertColumnsTokenGenerator and EncryptForInsertColumnsTokenGenerator
      
      * rename GeneratedKeyForInsertColumnsTokenGenerator
      
      * fix javadoc
      
      * refactor AssistQueryAndPlainInsertColumnsToken
      
      * refactor GeneratedKeyAssignmentTokenGenerator
      
      * split GeneratedKeyAssignmentToken to LiteralGeneratedKeyAssignmentToken and ParameterMarkerGeneratedKeyAssignmentToken
      
      * refactor SetAssignmentsSegment.assignments to collection
      
      * add SQLTokenGenerator.isGenerateSQLToken()
      
      * add LiteralInsertCipherAssignmentToken and ParameterMarkerInsertCipherAssignmentToken
      
      * rename InsertCipherAssignmentTokenGenerator
      
      * refactor InsertSetQueryAndPlainColumnsTokenGenerator
      
      * rename InsertAssistedQueryAndPlainAssignmentsToken
      
      * add LiteralInsertAssistedQueryAndPlainAssignmentsToken & ParameterMarkerInsertAssistedQueryAndPlainAssignmentsToken
      
      * use ParametersAware for InsertCipherAssignmentTokenGenerator
      
      * move insert set cipher's logic from RewriteEngine to InsertCipherAssignmentTokenGenerator
      
      * move insert set assisted query and plain column's logic from RewriteEngine to InsertAssistedQueryAndPlainAssignmentsTokenGenerator
      
      * move insert values's logic from RewriteEngine to InsertValuesTokenGenerator
      
      * make InsertValuesTokenGenerator as append-able
      
      * remove useless DerivedColumnType
      
      * clean useless method of InsertValueContext
      23829483
  4. 04 10月, 2019 1 次提交
  5. 03 10月, 2019 1 次提交
    • L
      Refactor ParameterBuilder as append-able (#3166) · 4d0c06ea
      Liang Zhang 提交于
      * add ParameterBuilderAware
      
      * refactor AggregationDistinctToken
      
      * remove toString for EncryptColumnToken
      
      * remove useless getter for UpdateEncryptLiteralColumnToken
      
      * refactor UpdateEncryptLiteralColumnToken
      
      * remove useless getter for UpdateEncryptParameterColumnToken
      
      * remove useless getter for WhereEncryptColumnToken
      
      * remove useless getter for IndexToken
      
      * remove useless getter for SQLToken
      
      * refactor GroupedParameterBuilder
      
      * split encrypt where with token and parameters
      
      * split encrypt update item with token and parameters
      
      * rename WhereEncryptColumnToken to EncryptPredicateToken
      
      * decouple EncryptPredicateToken & EncryptColumnToken
      
      * rename EncryptColumnToken to EncryptAssignmentToken
      
      * refactor ParameterBuilderAware to ParametersAware
      
      * refactor package of ParameterRewriter
      
      * move token to impl package
      
      * avoid change value of from parameterBuilder.getOriginalParameters()
      
      * refactor ParameterBuilder.getParameters()
      
      * remove ParameterBuilder.getOriginalParameters()
      
      * refactor GroupedParameterBuilder.shardingConditions
      
      * add new constructor of GroupedParameterBuilder
      
      * remove ParametersGroup
      
      * split ShardingParameterBuilderFactory & EncryptParameterBuilderFactory
      
      * modify javadoc
      
      * add GeneratedKeyInsertValueParameterRewriter & EncryptInsertValueParameterRewriter
      
      * change signature of ParameterBuilder.getParameters()
      
      * remove treemap's dependency of StandardParameterBuilder
      
      * refactor EncryptAssignmentParameterRewriter
      
      * refactor GroupedParameterBuilder
      
      * use map to instead of list of GroupedParameterBuilder.addedParameterGroups
      
      * refactor GroupedParameterBuilder
      
      * move pagination parameter rewrite logic from StandardParameterBuilder to PaginationParameterRewriter
      
      * remove useless parameter of StandardParameterBuilder
      
      * use SQLRouteResultAware instead of GeneratedKeyAware
      
      * use SQLRouteResultAware instead of ShardingConditionsAware
      4d0c06ea
  6. 02 10月, 2019 1 次提交
    • S
      testcase code added for package of org.apache.shardingsphere.core.optimize.segment.insert (#3158) · dd33dd99
      sluk3r 提交于
      * unit test LogicSchema#getDataSources
      
      * powermock.version extracted
      
      * 1. remove powermock-api-mockito2
      2. Apache copyright added, and several code style corrected
      3. replace assertEquals with assertThat
      
      * delete blank lines
      
      * add a group of testcases: DerivedLiteralExpressionSegmentTest,DerivedParameterMarkerExpressionSegmentTest,InsertValueContextTest
      
      * generic type added for MethodInvocation
      
      * EqualsAndHashCode added for class of DerivedParameterMarkerExpressionSegment and DerivedLiteralExpressionSegment
      
      * Generic Subtypes added for InsertValueContext's constructor
      
      * Testcased added for InsertValueContext
      
      * copyright added
      
      * the unused test case LogicSchemaTest deleted
      
      * 1. remove EqualsAndHashCode in class of DerivedLiteralExpressionSegment and DerivedParameterMarkerExpressionSegment
      2. remove unnecessary blank lines
      3. change "List<? extends Object>" back to List<Object>
      
      * remove convenience class MethodInvocation
      
      * InsertValueContext's generic subtype support changed back to original
      
      * 1. remove unused import of EqualsAndHashCode,Getter,RequiredArgsConstructor and SneakyThrows
      2. InsertValueContext's generic subtype support changed back to original
      3. remove unnecessary blank lines
      4. add final key word for TestCase class
      5. remove unnecessary class definition of MethodInvocation
      
      * generic type added to InsertValueContext's constructor
      
      * 1. generic type removed for  InsertValueContext's constructor
      2. generic type added for Collections.singletonList invocation
      
      * 1. Lists.<ExpressionSegment>newArrayList changed to Collections.<ExpressionSegment>singleton
      
      * 1. revert to the original indent
      
      * 1. add a blank line for end of file
      2. set "Keep indents on empty lines" in IDE, and the starting indents reserved
      3. variable of result changed to  valueFromInsertValueContext
      dd33dd99
  7. 30 9月, 2019 4 次提交
    • L
      For checkstyle (#3161) · 58ffbe93
      Liang Zhang 提交于
      * for checkstyle
      
      * refactor SQLLoggerTest
      58ffbe93
    • C
    • J
      fix dcl g4 and fix mysql createuser test case (#3159) · ad53de71
      JingShang Lu 提交于
      * add DAL grammar
      
      * supplement for dal grammar
      
      * fix mysqlkeyword.g4 format
      
      * fix dcl grammar
      
      * fix dcl g4 and fix mysql create user testcase
      ad53de71
    • L
      Simplify and refactor SQLTokenGenerator (#3157) · 7a593f3f
      Liang Zhang 提交于
      * add ParameterBuilderFactory
      
      * group token generator
      
      * add TableMetasAware
      
      * move EncryptCondition's logic from RewriteStatementFactory to WhereEncryptColumnTokenGenerator
      
      * remove EncryptConditions
      
      * rename WhereClauseEncryptConditionEngine to EncryptConditionEngine
      
      * refactor EncryptConditionEngine.createEncryptConditions()
      
      * add ShardingRuleAware & EncryptRuleAware
      
      * refactor SelectEncryptItemTokenGenerator
      
      * add QueryWithCipherColumnAware
      
      * refactor SQLRewriteEngine's constructor
      
      * add SQLTokenGenerators
      
      * refactor SQLTokenGenerators
      
      * avoid to using singleton for SQLTokenGenerator
      
      * move SQLTokenGenerateEngine to builder package
      
      * rename BaseTokenGenerateEngine to SQLTokenGeneratorBuilder
      
      * add ShardingConditionsAware
      
      * remove RewriteStatement.shardingConditions
      
      * refactor InsertGeneratedKeyNameTokenGenerator
      
      * refactor InsertRegularNamesTokenGenerator.isNeedToGenerateSQLToken()
      
      * refactor InsertRegularNamesTokenGenerator
      
      * add PreviousSQLTokensAware to split generate key and encrypt column's SQL token generator
      
      * add GeneratedKeyAware
      
      * remove InsertRewriteStatement.generatedKey
      
      * move InsertRewriteStatement's logic to SQLRewriteEngine
      
      * remove RewriteStatement
      7a593f3f
  8. 29 9月, 2019 3 次提交
  9. 27 9月, 2019 4 次提交
  10. 26 9月, 2019 4 次提交
    • C
    • L
      support query hint context for sharding-proxy (#3086) · 8c17bdd4
      liya 提交于
      * add hint query context for sharding-proxy
      
      * implement HintShowStatusExecutor&HintShowTableStatusExecutor
      
      * complete test for hint in  sharding-proxy
      
      * refactor HintShowTableStatusExecutor.java
      
      * add database_only for HintShowTableStatusExecutor.java
      
      * format HintManager
      
      * delete @Getter on HintShowTableStatusCommand
      
      * Refactor HintManager&ShardingRule&HintShowTableStatusExecutor
      
      * transfer BackendConnection to HintShowTableStatusExecutor
      
      * Refactor HintCommandExecutorFactoryTest
      
      * Refactor HintCommandExecutorFactory
      
      * Refactor HintCommandExecutor use MergedResult
      
      * delete HintShowStatusResult
      
      * Refactor HintManager
      
      * Refactor ShardingCTLShowBackendHandler
      
      * Reactor AbstractHintQueryExecutor
      
      * Refactor hint for sharding-proxy
      
      * delete unused @RequiredArgsConstructor
      
      * Refactor Hintmanager
      
      * Refactor HintShowTableStatusExecutor
      8c17bdd4
    • L
      Rename OptimizedStatement to SQLStatementContext (#3114) · ba366bdc
      Liang Zhang 提交于
      * rename OptimizedStatement to SQLStatementContext
      
      * rename Tables to TablesContext
      
      * move tablecontext to table package
      
      * rename InsertValue to InsertValueContext
      
      * rename GroupBy to GroupByContext
      
      * refactor PaginationTest
      
      * rename OrderBy to OrderByContext
      
      * rename Pagination to PaginationContext
      
      * rename SelectItems to SelectItemsContext
      ba366bdc
    • J
      supplement for dal grammar (#3116) · 4937d602
      JingShang Lu 提交于
      * add DAL grammar
      
      * supplement for dal grammar
      
      * fix mysqlkeyword.g4 format
      4937d602
  11. 25 9月, 2019 5 次提交
  12. 24 9月, 2019 3 次提交
    • A
      Removed unnecessary setter for RouteUnit (#3103) · 21e644ed
      Andrew Usanin 提交于
      21e644ed
    • L
      Move encrypt from optimized module to rewrite module (#3100) · e2cdbe10
      Liang Zhang 提交于
      * change position of EncryptCondition's positionValueMap & positionIndexMap
      
      * move generate EncryptConditions from optimize to rewrite module
      
      * remove EncryptConditionOptimizedStatement.encryptConditions
      
      * move encrypt condition to rewrite module
      
      * remove EncryptWhereOptimizeEngine
      
      * remove useless parameter for EncryptOptimizeEngineFactory.newInstance()
      
      * remove EncryptTransparentOptimizedStatement
      
      * remove EncryptOptimizedStatement
      
      * remove ShardingTransparentOptimizedStatement
      
      * remove ShardingOptimizedStatement
      
      * remove rule parameter for OptimizeEngine.optimize()
      
      * remove EncryptOptimizeEngineFactory
      
      * rename ShardingOptimizeEngineFactory to OptimizedStatementFactory
      
      * rename ShardingSelectOptimizedStatement to SelectOptimizedStatement
      e2cdbe10
    • Z
      Fix SCTL statement execute error with comments (#3093) · 3df4aadf
      zhyee 提交于
      * Fix SCTL statement execute error with comment
      
      * Add  SCTLUtils class to trim sql
      3df4aadf
  13. 23 9月, 2019 4 次提交
    • Fixes #3068 Add a judgment for user's database privileges. (#3079) · c91225b3
      孙不服 提交于
      * 
      1. modify MySQLAuthenticationHandler's login method to return Optional<ProxyUser>.
      2. check response41 database with ProxyUser's database.
      3. add UT.
      
      * resolve conflicts.
      
      * try CI check again.
      
      * 
      1. move schema judgement to MySQLAuthenticationHandler.
      2. modify UT.
      
      * 
      1. modify the input parameter of MySQLAuthenticationHandler.login().
      2. modify UT.
      
      * try CI check again.
      
      * 
      1. add ER_DBACCESS_DENIED_ERROR in MySQLServerErrorCode.
      2. modify the result of MySQLAuthenticationHandler.login() to Optional<MySQLServerErrorCode>.
      3. modify UT classes.
      c91225b3
    • L
      Generic insert statement for Sharding and encrypt on optimize module (#3091) · 0591b067
      Liang Zhang 提交于
      * delete ShardingDropIndexOptimizedStatement
      
      * avoid using ShardingConditionOptimizedStatement
      
      * remove ShardingConditionOptimizedStatement
      
      * decouple GeneratedKey and columnNames
      
      * refactor InsertClauseShardingConditionEngine
      
      * refactor InsertClauseShardingConditionEngine's constructor
      
      * move GeneratedKey from optimize module to route module
      
      * rename package name org.apache.shardingsphere.core.optimize.sharding.segment.select to org.apache.shardingsphere.core.optimize.sharding.segment
      
      * merge ShardingInsertOptimizedStatement and EncryptInsertOptimizedStatement to InsertOptimizedStatement
      
      * rename OptimizedStatement.getSQLStatement() to getSqlStatement
      
      * remove ShardingOptimizeEngine & EncryptOptimizeEngine
      
      * move constant of derived values from optimize module to rewrite module
      
      * Update StandardRoutingEngineTest.java
      
      * Update ComplexRoutingEngineTest.java
      
      * Merge branch 'dev' of https://github.com/apache/incubator-shardingsphere into issue3061
      
      # Conflicts:
      #	sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/core/route/type/complex/ComplexRoutingEngineTest.java
      #	sharding-core/sharding-core-route/src/test/java/org/apache/shardingsphere/core/route/type/standard/StandardRoutingEngineTest.java
      0591b067
    • 0856b0d8
    • C