You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by GitBox <gi...@apache.org> on 2021/09/18 11:47:22 UTC
[GitHub] [shardingsphere] strongduanmu commented on a change in pull request #12504: Support encrypt rewrite for join table segment (SimpleTableSegment)
strongduanmu commented on a change in pull request #12504:
URL: https://github.com/apache/shardingsphere/pull/12504#discussion_r711579605
##########
File path: shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptProjectionTokenGenerator.java
##########
@@ -88,6 +111,90 @@ protected boolean isGenerateSQLTokenForEncrypt(final SQLStatementContext sqlStat
return result;
}
+ private Map<String, SimpleTableSegment> distinct(final Collection<SimpleTableSegment> simpleTableSegments) {
Review comment:
@cheese8 Does this method just for distinct? If so, you can use `TablesContext.uniqueTables`.
##########
File path: shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateColumnTokenGenerator.java
##########
@@ -75,35 +77,43 @@ protected boolean isGenerateSQLTokenForEncrypt(final SQLStatementContext sqlStat
private Collection<SubstitutableColumnNameToken> generateSQLTokens(final Collection<ExpressionSegment> predicates, final Map<String, String> columnTableNames) {
Collection<SubstitutableColumnNameToken> result = new LinkedList<>();
for (ExpressionSegment each : predicates) {
- Optional<ColumnSegment> column = ColumnExtractor.extract(each);
- if (!column.isPresent()) {
- continue;
- }
- Optional<EncryptTable> encryptTable = findEncryptTable(columnTableNames, column.get());
- if (!encryptTable.isPresent() || !encryptTable.get().findEncryptorName(column.get().getIdentifier().getValue()).isPresent()) {
- continue;
- }
- int startIndex = column.get().getOwner().isPresent() ? column.get().getOwner().get().getStopIndex() + 2 : column.get().getStartIndex();
- int stopIndex = column.get().getStopIndex();
- if (!queryWithCipherColumn) {
- Optional<String> plainColumn = encryptTable.get().findPlainColumn(column.get().getIdentifier().getValue());
- if (plainColumn.isPresent()) {
- result.add(new SubstitutableColumnNameToken(startIndex, stopIndex, getColumnProjections(plainColumn.get())));
+ Collection<Optional<ColumnSegment>> columns = ColumnExtractor.extractAll(each);
+ for (Optional<ColumnSegment> column : columns) {
+ if (!column.isPresent()) {
+ continue;
+ }
+ Optional<EncryptTable> encryptTable = findEncryptTable(columnTableNames, column.get());
+ if (!encryptTable.isPresent() || !encryptTable.get().findEncryptorName(column.get().getIdentifier().getValue()).isPresent()) {
continue;
}
+ int startIndex = column.get().getOwner().isPresent() ? column.get().getOwner().get().getStopIndex() + 2 : column.get().getStartIndex();
+ int stopIndex = column.get().getStopIndex();
+ if (!queryWithCipherColumn) {
+ Optional<String> plainColumn = encryptTable.get().findPlainColumn(column.get().getIdentifier().getValue());
+ if (plainColumn.isPresent()) {
+ result.add(new SubstitutableColumnNameToken(startIndex, stopIndex, getColumnProjections(plainColumn.get())));
+ continue;
+ }
+ }
+ Optional<String> assistedQueryColumn = encryptTable.get().findAssistedQueryColumn(column.get().getIdentifier().getValue());
+ SubstitutableColumnNameToken encryptColumnNameToken = assistedQueryColumn.map(columnName
+ -> new SubstitutableColumnNameToken(startIndex, stopIndex, getColumnProjections(columnName))).orElseGet(()
+ -> new SubstitutableColumnNameToken(startIndex, stopIndex, getColumnProjections(encryptTable.get().getCipherColumn(column.get().getIdentifier().getValue()))));
+ result.add(encryptColumnNameToken);
}
- Optional<String> assistedQueryColumn = encryptTable.get().findAssistedQueryColumn(column.get().getIdentifier().getValue());
- SubstitutableColumnNameToken encryptColumnNameToken = assistedQueryColumn.map(columnName
- -> new SubstitutableColumnNameToken(startIndex, stopIndex, getColumnProjections(columnName))).orElseGet(()
- -> new SubstitutableColumnNameToken(startIndex, stopIndex, getColumnProjections(encryptTable.get().getCipherColumn(column.get().getIdentifier().getValue()))));
- result.add(encryptColumnNameToken);
}
return result;
}
private Map<String, String> getColumnTableNames(final SQLStatementContext sqlStatementContext, final Collection<AndPredicate> andPredicates) {
- Collection<ColumnSegment> columns = andPredicates.stream().flatMap(each -> each.getPredicates().stream())
- .map(each -> ColumnExtractor.extract(each).orElse(null)).filter(Objects::nonNull).collect(Collectors.toList());
+ Collection<ColumnSegment> columns = new ArrayList<ColumnSegment>();
+ for (AndPredicate andPredicate : andPredicates) {
Review comment:
@cheese8 Use `each` may be better.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org