You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/02/04 09:37:30 UTC
[shardingsphere] branch master updated: Refactor EncryptSchemaMetaDataDecorator (#23998)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e5c4d7cb4e1 Refactor EncryptSchemaMetaDataDecorator (#23998)
e5c4d7cb4e1 is described below
commit e5c4d7cb4e1b3195031d1828d76539bd952b3f12
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Feb 4 17:37:24 2023 +0800
Refactor EncryptSchemaMetaDataDecorator (#23998)
---
.../encrypt/metadata/EncryptSchemaMetaDataDecorator.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptSchemaMetaDataDecorator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptSchemaMetaDataDecorator.java
index 6f29360e680..2dfb48c062b 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptSchemaMetaDataDecorator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptSchemaMetaDataDecorator.java
@@ -64,11 +64,11 @@ public final class EncryptSchemaMetaDataDecorator implements RuleBasedSchemaMeta
for (ColumnMetaData each : originalColumnMetaDataList) {
String columnName = each.getName();
if (plainColumns.contains(columnName)) {
- result.add(createColumnMetaData(encryptTable.getLogicColumnByPlainColumn(columnName), each));
+ result.add(createMetaDataByPlainColumn(encryptTable, columnName, each));
continue;
}
if (encryptTable.isCipherColumn(columnName)) {
- result.add(createColumnMetaData(encryptTable.getLogicColumnByCipherColumn(columnName), each));
+ result.add(createMetaDataByCipherColumn(encryptTable, columnName, each));
continue;
}
if (!assistedQueryColumns.contains(columnName) && !likeQueryColumns.contains(columnName)) {
@@ -78,9 +78,17 @@ public final class EncryptSchemaMetaDataDecorator implements RuleBasedSchemaMeta
return result;
}
+ private ColumnMetaData createMetaDataByPlainColumn(final EncryptTable encryptTable, final String columnName, final ColumnMetaData columnMetaData) {
+ return createColumnMetaData(encryptTable.getLogicColumnByPlainColumn(columnName), columnMetaData);
+ }
+
+ private ColumnMetaData createMetaDataByCipherColumn(final EncryptTable encryptTable, final String columnName, final ColumnMetaData columnMetaData) {
+ return createColumnMetaData(encryptTable.getLogicColumnByCipherColumn(columnName), columnMetaData);
+ }
+
private ColumnMetaData createColumnMetaData(final String columnName, final ColumnMetaData columnMetaData) {
- return new ColumnMetaData(columnName, columnMetaData.getDataType(), columnMetaData.isPrimaryKey(), columnMetaData.isGenerated(), columnMetaData.isCaseSensitive(), columnMetaData.isVisible(),
- columnMetaData.isUnsigned());
+ return new ColumnMetaData(columnName, columnMetaData.getDataType(),
+ columnMetaData.isPrimaryKey(), columnMetaData.isGenerated(), columnMetaData.isCaseSensitive(), columnMetaData.isVisible(), columnMetaData.isUnsigned());
}
@Override