tuichenchuxin commented on a change in pull request #14309:
URL: https://github.com/apache/shardingsphere/pull/14309#discussion_r776564983
##########
File path:
shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptLiteralAssignmentToken.java
##########
@@ -56,13 +65,15 @@ public String toString() {
private final Object value;
+ private final boolean withQuotes;
+
@Override
public String toString() {
return String.format("%s = %s", columnName, toString(value));
}
private String toString(final Object value) {
- return String.class == value.getClass() ? String.format("'%s'",
value) : value.toString();
+ return (String.class == value.getClass() && withQuotes) ?
String.format("'%s'", value) : value.toString();
Review comment:
Maybe define a new class to handle this.
##########
File path:
shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptInsertOnUpdateTokenGenerator.java
##########
@@ -61,7 +64,14 @@ protected boolean isGenerateSQLTokenForEncrypt(final
SQLStatementContext sqlStat
}
String schemaName = insertStatementContext.getSchemaName();
for (AssignmentSegment each : onDuplicateKeyColumnsSegments) {
- if (getEncryptRule().findEncryptor(schemaName, tableName,
each.getColumns().get(0).getIdentifier().getValue()).isPresent()) {
+ if (each.getValue() instanceof FunctionSegment &&
"VALUES".equalsIgnoreCase(((FunctionSegment)
each.getValue()).getFunctionName())) {
+ boolean leftEncryptorPresent =
getEncryptRule().findEncryptor(schemaName, tableName,
each.getColumns().get(0).getIdentifier().getValue()).isPresent();
+ ColumnSegment rightColumn = (ColumnSegment) ((FunctionSegment)
each.getValue()).getParameters().stream().findFirst().get();
+ boolean rightEncryptorPresent =
getEncryptRule().findEncryptor(schemaName, tableName,
rightColumn.getIdentifier().getValue()).isPresent();
+ if (leftEncryptorPresent || rightEncryptorPresent) {
+ generateSQLToken(schemaName, tableName,
each).ifPresent(result::add);
Review comment:
Is same with line 75. Combine them may be better
##########
File path:
shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/OnDuplicateUpdateContext.java
##########
@@ -79,8 +80,13 @@ public OnDuplicateUpdateContext(final
Collection<AssignmentSegment> assignments,
*/
public Object getValue(final int index) {
ExpressionSegment valueExpression = valueExpressions.get(index);
- return valueExpression instanceof ParameterMarkerExpressionSegment
- ?
parameters.get(getParameterIndex((ParameterMarkerExpressionSegment)
valueExpression)) : ((LiteralExpressionSegment) valueExpression).getLiterals();
+ if (valueExpression instanceof ParameterMarkerExpressionSegment) {
+ return
parameters.get(getParameterIndex((ParameterMarkerExpressionSegment)
valueExpression));
+ }
+ if (valueExpression instanceof FunctionSegment &&
"VALUES".equalsIgnoreCase(((FunctionSegment)
valueExpression).getFunctionName())) {
+ return null;
Review comment:
Maybe just return the functionSegment, Then judge in the use place.
##########
File path:
shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptInsertOnUpdateTokenGenerator.java
##########
@@ -95,6 +108,46 @@ private EncryptAssignmentToken
generateLiteralSQLToken(final String schemaName,
return result;
}
+ private EncryptAssignmentToken generateValuesSQLToken(final String
schemaName, final String tableName, final AssignmentSegment assignmentSegment,
final FunctionSegment functionSegment) {
+ ColumnSegment columnSegment = assignmentSegment.getColumns().get(0);
+ String column = columnSegment.getIdentifier().getValue();
+ ColumnSegment valueColumnSegment = (ColumnSegment)
functionSegment.getParameters().stream().findFirst().get();
+ String valueColumn = valueColumnSegment.getIdentifier().getValue();
+
+ EncryptLiteralAssignmentToken result = new
EncryptLiteralAssignmentToken(columnSegment.getStartIndex(),
assignmentSegment.getStopIndex());
+
+ boolean cipherColumnPresent =
getEncryptRule().findEncryptor(schemaName, tableName, column).isPresent();
+ boolean cipherValueColumnPresent =
getEncryptRule().findEncryptor(schemaName, tableName, valueColumn).isPresent();
+ if (cipherColumnPresent && cipherValueColumnPresent) {
+ String cipherColumn = getEncryptRule().getCipherColumn(tableName,
column);
+ String cipherValueColumn =
getEncryptRule().getCipherColumn(tableName, valueColumn);
+ result.addAssignment(cipherColumn, String.format("VALUES(%s)",
cipherValueColumn), false);
+ } else if (cipherColumnPresent != cipherValueColumnPresent) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
Review comment:
Why can't support ? If cipherColumn is present, but value is not, we
need to support this case.
##########
File path:
shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/impl/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
##########
@@ -59,6 +59,9 @@ public void rewrite(final ParameterBuilder parameterBuilder,
final InsertStateme
Optional<EncryptAlgorithm> encryptor =
getEncryptRule().findEncryptor(schemaName, tableName, encryptLogicColumnName);
encryptor.ifPresent(optional -> {
Object plainColumnValue =
onDuplicateKeyUpdateValueContext.getValue(columnIndex);
+ if (null == plainColumnValue) {
Review comment:
Better get functionSegment then judge.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
