tuichenchuxin commented on a change in pull request #14309:
URL: https://github.com/apache/shardingsphere/pull/14309#discussion_r777785833
##########
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();
+
+ EncryptFunctionAssignmentToken result = new
EncryptFunctionAssignmentToken(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));
+ } 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:
Please remove empty line.
##########
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();
+
+ EncryptFunctionAssignmentToken result = new
EncryptFunctionAssignmentToken(columnSegment.getStartIndex(),
assignmentSegment.getStopIndex());
+
Review comment:
Please remove empty line.
##########
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();
+
+ EncryptFunctionAssignmentToken result = new
EncryptFunctionAssignmentToken(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));
+ } else if (cipherColumnPresent != cipherValueColumnPresent) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
+ }
+
+ Optional<String> assistedQueryColumn =
getEncryptRule().findAssistedQueryColumn(tableName, column);
+ Optional<String> valueAssistedQueryColumn =
getEncryptRule().findAssistedQueryColumn(tableName, valueColumn);
+ if (assistedQueryColumn.isPresent() &&
valueAssistedQueryColumn.isPresent()) {
+ result.addAssignment(assistedQueryColumn.get(),
String.format("VALUES(%s)", valueAssistedQueryColumn.get()));
+ } else if (assistedQueryColumn.isPresent() !=
valueAssistedQueryColumn.isPresent()) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
+ }
+
Review comment:
Please remove empty line.
##########
File path:
shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptFunctionAssignmentToken.java
##########
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.encrypt.rewrite.token.pojo;
+
+import com.google.common.base.Joiner;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+/**
+ * Function assignment token for encrypt.
+ */
+public final class EncryptFunctionAssignmentToken extends
EncryptAssignmentToken {
+
+ private final Collection<LiteralAssignment> assignments = new
LinkedList<>();
+
+ public EncryptFunctionAssignmentToken(final int startIndex, final int
stopIndex) {
+ super(startIndex, stopIndex);
+ }
+
+ /**
+ * Add assignment.
+ *
+ * @param columnName column name
+ * @param value assignment value
+ */
+ public void addAssignment(final String columnName, final Object value) {
+ assignments.add(new LiteralAssignment(columnName, value));
+ }
+
+ /**
+ * Get assignments.
+ * @return LiteralAssignment collection
+ */
+ public Collection<LiteralAssignment> getAssignment() {
+ return assignments;
+ }
+
+ @Override
+ public String toString() {
+ return Joiner.on(", ").join(assignments);
+ }
+
+ @RequiredArgsConstructor
+ private static final class LiteralAssignment {
Review comment:
This code is same with `EncryptLiteralAssignmentToken`, Can we extract
them?
##########
File path:
shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptInsertOnUpdateTokenGenerator.java
##########
@@ -61,9 +65,15 @@ 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()) {
- generateSQLToken(schemaName, tableName,
each).ifPresent(result::add);
- }
+ 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) {
+ continue;
+ }
+ }
+ generateSQLToken(schemaName, tableName,
each).ifPresent(result::add);
Review comment:
This function logic may be not right. Without encrypt check?
##########
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();
+
Review comment:
Please remove empty line.
##########
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();
+
+ EncryptFunctionAssignmentToken result = new
EncryptFunctionAssignmentToken(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));
+ } else if (cipherColumnPresent != cipherValueColumnPresent) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
+ }
+
+ Optional<String> assistedQueryColumn =
getEncryptRule().findAssistedQueryColumn(tableName, column);
+ Optional<String> valueAssistedQueryColumn =
getEncryptRule().findAssistedQueryColumn(tableName, valueColumn);
+ if (assistedQueryColumn.isPresent() &&
valueAssistedQueryColumn.isPresent()) {
+ result.addAssignment(assistedQueryColumn.get(),
String.format("VALUES(%s)", valueAssistedQueryColumn.get()));
+ } else if (assistedQueryColumn.isPresent() !=
valueAssistedQueryColumn.isPresent()) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
+ }
+
+ Optional<String> plainColumn =
getEncryptRule().findPlainColumn(tableName, column);
+ Optional<String> valuePlainColumn =
getEncryptRule().findPlainColumn(tableName, valueColumn);
+ if (plainColumn.isPresent() && valuePlainColumn.isPresent()) {
+ result.addAssignment(plainColumn.get(),
String.format("VALUES(%s)", valuePlainColumn.get()));
+ } else if (plainColumn.isPresent() != valuePlainColumn.isPresent()) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
+ }
+
Review comment:
Please remove empty line.
##########
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();
+
+ EncryptFunctionAssignmentToken result = new
EncryptFunctionAssignmentToken(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));
+ } else if (cipherColumnPresent != cipherValueColumnPresent) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
+ }
+
+ Optional<String> assistedQueryColumn =
getEncryptRule().findAssistedQueryColumn(tableName, column);
+ Optional<String> valueAssistedQueryColumn =
getEncryptRule().findAssistedQueryColumn(tableName, valueColumn);
+ if (assistedQueryColumn.isPresent() &&
valueAssistedQueryColumn.isPresent()) {
+ result.addAssignment(assistedQueryColumn.get(),
String.format("VALUES(%s)", valueAssistedQueryColumn.get()));
+ } else if (assistedQueryColumn.isPresent() !=
valueAssistedQueryColumn.isPresent()) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
+ }
+
+ Optional<String> plainColumn =
getEncryptRule().findPlainColumn(tableName, column);
+ Optional<String> valuePlainColumn =
getEncryptRule().findPlainColumn(tableName, valueColumn);
+ if (plainColumn.isPresent() && valuePlainColumn.isPresent()) {
+ result.addAssignment(plainColumn.get(),
String.format("VALUES(%s)", valuePlainColumn.get()));
+ } else if (plainColumn.isPresent() != valuePlainColumn.isPresent()) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
+ }
+
+ if (result.getAssignment().isEmpty()) {
+ throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
+ }
+ return result;
+ }
+
Review comment:
Please remove empty line.
--
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]
