This is an automated email from the ASF dual-hosted git repository. zhangliang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from b357cf8 Enhanced timestamp parsing in AutoIntervalShardingAlgorithm (#15131) add f171ef2 Add EncryptContext parameter to EncryptAlgorithm and QueryAssistedEncryptAlgorithm SPI interface (#15133) No new revisions were added by this update. Summary of changes: .../TestQueryAssistedShardingEncryptAlgorithm.java | 10 +-- .../TestQueryAssistedShardingEncryptAlgorithm.java | 7 +- .../TestQueryAssistedShardingEncryptAlgorithm.java | 7 +- .../TestQueryAssistedShardingEncryptAlgorithm.java | 7 +- .../TestQueryAssistedShardingEncryptAlgorithm.java | 7 +- .../TestQueryAssistedShardingEncryptAlgorithm.java | 7 +- .../TestQueryAssistedShardingEncryptAlgorithm.java | 7 +- .../TestQueryAssistedShardingEncryptAlgorithm.java | 7 +- .../TestQueryAssistedShardingEncryptAlgorithm.java | 7 +- .../TestQueryAssistedShardingEncryptAlgorithm.java | 7 +- .../encrypt/spi/EncryptAlgorithm.java | 7 +- .../encrypt/spi/QueryAssistedEncryptAlgorithm.java | 5 +- .../spi/context}/EncryptColumnDataType.java | 13 ++-- .../encrypt/spi/context/EncryptContext.java | 83 ++++++++++++++++++++++ .../encrypt/algorithm/AESEncryptAlgorithm.java | 5 +- .../encrypt/algorithm/MD5EncryptAlgorithm.java | 5 +- .../encrypt/algorithm/RC4EncryptAlgorithm.java | 5 +- .../encrypt/algorithm/SM3EncryptAlgorithm.java | 5 +- .../encrypt/algorithm/SM4EncryptAlgorithm.java | 5 +- .../encrypt/context/EncryptContextBuilder.java | 53 ++++++++++++++ .../merge/dql/EncryptAlgorithmMetaData.java | 70 +++++++++--------- .../encrypt/merge/dql/EncryptMergedResult.java | 8 ++- .../rewrite/condition/EncryptConditionEngine.java | 4 +- .../context/EncryptSQLRewriteContextDecorator.java | 3 +- .../EncryptAssignmentParameterRewriter.java | 6 +- ...OnDuplicateKeyUpdateValueParameterRewriter.java | 9 ++- .../EncryptInsertValueParameterRewriter.java | 29 ++++---- .../generator/EncryptAssignmentTokenGenerator.java | 2 +- .../EncryptInsertOnUpdateTokenGenerator.java | 20 +++--- .../EncryptInsertValuesTokenGenerator.java | 28 ++++---- .../shardingsphere/encrypt/rule/EncryptColumn.java | 1 + .../shardingsphere/encrypt/rule/EncryptRule.java | 40 +++-------- .../shardingsphere/encrypt/rule/EncryptTable.java | 1 + .../encrypt/algorithm/AESEncryptAlgorithmTest.java | 20 ++++-- .../algorithm/CustomizedEncryptAlgorithmTest.java | 8 ++- .../encrypt/algorithm/MD5EncryptAlgorithmTest.java | 8 ++- .../encrypt/algorithm/RC4EncryptAlgorithmTest.java | 10 +-- .../encrypt/algorithm/SM3EncryptAlgorithmTest.java | 20 ++++-- .../encrypt/algorithm/SM4EncryptAlgorithmTest.java | 14 ++-- .../fixture/CustomizedEncryptAlgorithm.java | 5 +- .../encrypt/fixture/TestEncryptAlgorithm.java | 5 +- .../fixture/TestQueryAssistedEncryptAlgorithm.java | 7 +- .../merge/dql/EncryptAlgorithmMetaDataTest.java | 45 ++++++++---- .../encrypt/merge/dql/EncryptMergedResultTest.java | 34 ++++++--- .../metadata/EncryptTableMetaDataBuilderTest.java | 2 +- .../impl/EncryptCreateTableTokenGeneratorTest.java | 22 ++++-- .../encrypt/rule/EncryptColumnDataTypeTest.java | 1 + .../encrypt/rule/EncryptRuleTest.java | 4 +- .../driver/fixture/TestEncryptAlgorithm.java | 5 +- .../fixture/TestQueryAssistedEncryptAlgorithm.java | 7 +- .../namespace/AbstractSpringNamespaceTest.java | 4 +- .../fixture/NormalEncryptAlgorithmFixture.java | 5 +- .../QueryAssistedEncryptAlgorithmFixture.java | 7 +- 53 files changed, 472 insertions(+), 241 deletions(-) rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule => shardingsphere-encrypt-api/src/main/java/org/apache/shardingsphere/encrypt/spi/context}/EncryptColumnDataType.java (81%) create mode 100644 shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-api/src/main/java/org/apache/shardingsphere/encrypt/spi/context/EncryptContext.java create mode 100644 shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/context/EncryptContextBuilder.java