strongduanmu commented on code in PR #34227: URL: https://github.com/apache/shardingsphere/pull/34227#discussion_r1926262448
########## infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/values/OnConflictUpdateContext.java: ########## @@ -0,0 +1,128 @@ +/* + * 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.infra.binder.context.segment.insert.values; + +import com.google.common.base.Preconditions; +import lombok.Getter; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ColumnExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ExpressionExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * On conflict context. + */ +@Getter +public final class OnConflictUpdateContext { + + private final int parameterCount; + + private final List<ExpressionSegment> valueExpressions; + + private final Collection<WhereSegment> whereSegments = new LinkedList<>(); + + private final Collection<ColumnSegment> columnSegments; + + private final List<ParameterMarkerExpressionSegment> parameterMarkerExpressions; + + private final List<Object> parameters; + + public OnConflictUpdateContext(final Collection<ColumnAssignmentSegment> assignments, final List<Object> params, final int parametersOffset, final Optional<WhereSegment> segment) { + List<ExpressionSegment> expressionSegments = assignments.stream().map(ColumnAssignmentSegment::getValue).collect(Collectors.toList()); + segment.ifPresent(whereSegments::add); + for (WhereSegment whereSegment : whereSegments) { Review Comment: Please rename whereSegment to each ########## infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/values/OnConflictUpdateContext.java: ########## @@ -0,0 +1,128 @@ +/* + * 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.infra.binder.context.segment.insert.values; + +import com.google.common.base.Preconditions; +import lombok.Getter; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ColumnExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ExpressionExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * On conflict context. + */ +@Getter +public final class OnConflictUpdateContext { + + private final int parameterCount; + + private final List<ExpressionSegment> valueExpressions; + + private final Collection<WhereSegment> whereSegments = new LinkedList<>(); + + private final Collection<ColumnSegment> columnSegments; + + private final List<ParameterMarkerExpressionSegment> parameterMarkerExpressions; + + private final List<Object> parameters; + + public OnConflictUpdateContext(final Collection<ColumnAssignmentSegment> assignments, final List<Object> params, final int parametersOffset, final Optional<WhereSegment> segment) { + List<ExpressionSegment> expressionSegments = assignments.stream().map(ColumnAssignmentSegment::getValue).collect(Collectors.toList()); + segment.ifPresent(whereSegments::add); + for (WhereSegment whereSegment : whereSegments) { + expressionSegments.add(whereSegment.getExpr()); + } + columnSegments = assignments.stream().map(each -> each.getColumns().get(0)).collect(Collectors.toList()); + ColumnExtractor.extractColumnSegments(columnSegments, whereSegments); + valueExpressions = getValueExpressions(expressionSegments); + parameterMarkerExpressions = ExpressionExtractor.getParameterMarkerExpressions(expressionSegments); + parameterCount = parameterMarkerExpressions.size(); + parameters = getParameters(params, parametersOffset); + } + + /** + * get value expressions from expression segments. + * + * @param assignments Collection of expression segments + * @return List of value expressions + */ + private List<ExpressionSegment> getValueExpressions(final Collection<ExpressionSegment> assignments) { + List<ExpressionSegment> result = new ArrayList<>(assignments.size()); + result.addAll(assignments); + return result; + } + + /** + * get list of parameters. + * + * @param params List of parameters + * @param paramsOffset Offset in the parameter list + * @return List of parameters + */ + private List<Object> getParameters(final List<Object> params, final int paramsOffset) { + if (params.isEmpty() || 0 == parameterCount) { + return Collections.emptyList(); + } + List<Object> result = new ArrayList<>(parameterCount); + result.addAll(params.subList(paramsOffset, paramsOffset + parameterCount)); + return result; + } + + /** + * Get value. + * + * @param index index + * @return value + */ + public Object getValue(final int index) { + ExpressionSegment valueExpression = valueExpressions.get(index); + if (valueExpression instanceof ParameterMarkerExpressionSegment) { + return parameters.get(getParameterIndex((ParameterMarkerExpressionSegment) valueExpression)); + } + if (valueExpression instanceof FunctionSegment) { + return valueExpression; + } + return ((LiteralExpressionSegment) valueExpression).getLiterals(); + } + + /** Review Comment: Please remove javadoc for private method. ########## infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/values/OnConflictUpdateContext.java: ########## @@ -0,0 +1,128 @@ +/* + * 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.infra.binder.context.segment.insert.values; + +import com.google.common.base.Preconditions; +import lombok.Getter; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ColumnExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ExpressionExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * On conflict context. + */ +@Getter +public final class OnConflictUpdateContext { + + private final int parameterCount; + + private final List<ExpressionSegment> valueExpressions; + + private final Collection<WhereSegment> whereSegments = new LinkedList<>(); + + private final Collection<ColumnSegment> columnSegments; + + private final List<ParameterMarkerExpressionSegment> parameterMarkerExpressions; + + private final List<Object> parameters; + + public OnConflictUpdateContext(final Collection<ColumnAssignmentSegment> assignments, final List<Object> params, final int parametersOffset, final Optional<WhereSegment> segment) { + List<ExpressionSegment> expressionSegments = assignments.stream().map(ColumnAssignmentSegment::getValue).collect(Collectors.toList()); + segment.ifPresent(whereSegments::add); + for (WhereSegment whereSegment : whereSegments) { + expressionSegments.add(whereSegment.getExpr()); + } + columnSegments = assignments.stream().map(each -> each.getColumns().get(0)).collect(Collectors.toList()); Review Comment: Why only call `each.getColumns().get(0)` here? ########## infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/values/OnConflictUpdateContext.java: ########## @@ -0,0 +1,128 @@ +/* + * 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.infra.binder.context.segment.insert.values; + +import com.google.common.base.Preconditions; +import lombok.Getter; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ColumnExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ExpressionExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * On conflict context. + */ +@Getter +public final class OnConflictUpdateContext { + + private final int parameterCount; + + private final List<ExpressionSegment> valueExpressions; + + private final Collection<WhereSegment> whereSegments = new LinkedList<>(); + + private final Collection<ColumnSegment> columnSegments; + + private final List<ParameterMarkerExpressionSegment> parameterMarkerExpressions; + + private final List<Object> parameters; + + public OnConflictUpdateContext(final Collection<ColumnAssignmentSegment> assignments, final List<Object> params, final int parametersOffset, final Optional<WhereSegment> segment) { + List<ExpressionSegment> expressionSegments = assignments.stream().map(ColumnAssignmentSegment::getValue).collect(Collectors.toList()); + segment.ifPresent(whereSegments::add); + for (WhereSegment whereSegment : whereSegments) { + expressionSegments.add(whereSegment.getExpr()); + } + columnSegments = assignments.stream().map(each -> each.getColumns().get(0)).collect(Collectors.toList()); + ColumnExtractor.extractColumnSegments(columnSegments, whereSegments); + valueExpressions = getValueExpressions(expressionSegments); + parameterMarkerExpressions = ExpressionExtractor.getParameterMarkerExpressions(expressionSegments); + parameterCount = parameterMarkerExpressions.size(); + parameters = getParameters(params, parametersOffset); + } + + /** + * get value expressions from expression segments. + * + * @param assignments Collection of expression segments + * @return List of value expressions + */ + private List<ExpressionSegment> getValueExpressions(final Collection<ExpressionSegment> assignments) { + List<ExpressionSegment> result = new ArrayList<>(assignments.size()); + result.addAll(assignments); + return result; + } + + /** Review Comment: Please remove javadoc for private method. ########## infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/values/OnConflictUpdateContext.java: ########## @@ -0,0 +1,128 @@ +/* + * 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.infra.binder.context.segment.insert.values; + +import com.google.common.base.Preconditions; +import lombok.Getter; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ColumnExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ExpressionExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * On conflict context. + */ +@Getter +public final class OnConflictUpdateContext { + + private final int parameterCount; + + private final List<ExpressionSegment> valueExpressions; + + private final Collection<WhereSegment> whereSegments = new LinkedList<>(); + + private final Collection<ColumnSegment> columnSegments; + + private final List<ParameterMarkerExpressionSegment> parameterMarkerExpressions; + + private final List<Object> parameters; + + public OnConflictUpdateContext(final Collection<ColumnAssignmentSegment> assignments, final List<Object> params, final int parametersOffset, final Optional<WhereSegment> segment) { + List<ExpressionSegment> expressionSegments = assignments.stream().map(ColumnAssignmentSegment::getValue).collect(Collectors.toList()); + segment.ifPresent(whereSegments::add); + for (WhereSegment whereSegment : whereSegments) { + expressionSegments.add(whereSegment.getExpr()); + } + columnSegments = assignments.stream().map(each -> each.getColumns().get(0)).collect(Collectors.toList()); + ColumnExtractor.extractColumnSegments(columnSegments, whereSegments); + valueExpressions = getValueExpressions(expressionSegments); + parameterMarkerExpressions = ExpressionExtractor.getParameterMarkerExpressions(expressionSegments); + parameterCount = parameterMarkerExpressions.size(); + parameters = getParameters(params, parametersOffset); + } + + /** Review Comment: Please remove javadoc for private method. ########## infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/values/OnConflictUpdateContext.java: ########## @@ -0,0 +1,128 @@ +/* + * 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.infra.binder.context.segment.insert.values; + +import com.google.common.base.Preconditions; +import lombok.Getter; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ColumnExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.extractor.ExpressionExtractor; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * On conflict context. + */ +@Getter +public final class OnConflictUpdateContext { + + private final int parameterCount; + + private final List<ExpressionSegment> valueExpressions; + + private final Collection<WhereSegment> whereSegments = new LinkedList<>(); + + private final Collection<ColumnSegment> columnSegments; + + private final List<ParameterMarkerExpressionSegment> parameterMarkerExpressions; + + private final List<Object> parameters; + + public OnConflictUpdateContext(final Collection<ColumnAssignmentSegment> assignments, final List<Object> params, final int parametersOffset, final Optional<WhereSegment> segment) { + List<ExpressionSegment> expressionSegments = assignments.stream().map(ColumnAssignmentSegment::getValue).collect(Collectors.toList()); + segment.ifPresent(whereSegments::add); + for (WhereSegment whereSegment : whereSegments) { + expressionSegments.add(whereSegment.getExpr()); + } + columnSegments = assignments.stream().map(each -> each.getColumns().get(0)).collect(Collectors.toList()); + ColumnExtractor.extractColumnSegments(columnSegments, whereSegments); + valueExpressions = getValueExpressions(expressionSegments); + parameterMarkerExpressions = ExpressionExtractor.getParameterMarkerExpressions(expressionSegments); + parameterCount = parameterMarkerExpressions.size(); + parameters = getParameters(params, parametersOffset); + } + + /** + * get value expressions from expression segments. + * + * @param assignments Collection of expression segments + * @return List of value expressions + */ + private List<ExpressionSegment> getValueExpressions(final Collection<ExpressionSegment> assignments) { + List<ExpressionSegment> result = new ArrayList<>(assignments.size()); Review Comment: Only for cast Collection to List? If so, please modify the origianl assignments to ArrayList. ########## infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContextTest.java: ########## @@ -121,15 +138,20 @@ void assertGenerateOptionalSQLToken() { @Test void assertGenerateCollectionSQLToken() { - QueryContext queryContext = mock(QueryContext.class, RETURNS_DEEP_STUBS); - when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext); - when(queryContext.getSql()).thenReturn("INSERT INTO tbl VALUES (?)"); - when(queryContext.getParameters()).thenReturn(Collections.singletonList(1)); - when(queryContext.getHintValueContext()).thenReturn(hintValueContext); + QueryContext queryContext = createMockQueryContext(sqlStatementContext, Collections.singletonList(1)); SQLRewriteContext sqlRewriteContext = new SQLRewriteContext(database, queryContext); sqlRewriteContext.addSQLTokenGenerators(Collections.singleton(collectionSQLTokenGenerator)); sqlRewriteContext.generateSQLTokens(); assertFalse(sqlRewriteContext.getSqlTokens().isEmpty()); assertThat(sqlRewriteContext.getSqlTokens().get(0), instanceOf(SQLToken.class)); } + + private QueryContext createMockQueryContext(final SQLStatementContext statementContext, final List<Object> parameters) { + QueryContext queryContext = mock(QueryContext.class, RETURNS_DEEP_STUBS); + when(queryContext.getSqlStatementContext()).thenReturn(statementContext); + when(queryContext.getSql()).thenReturn("INSERT INTO tbl VALUES (?)"); + when(queryContext.getParameters()).thenReturn(parameters); + when(queryContext.getHintValueContext()).thenReturn(hintValueContext); + return queryContext; Review Comment: Please rename queryContext to result. ########## parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java: ########## @@ -719,7 +719,11 @@ public ASTNode visitOptOnConflict(final OptOnConflictContext ctx) { if (null != ctx.setClauseList()) { assignments = ((SetAssignmentSegment) visit(ctx.setClauseList())).getAssignments(); } - return new OnDuplicateKeyColumnsSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), assignments); + WhereSegment whereSegment = + ctx.whereClause() != null Review Comment: Please put null to the left side. ########## parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java: ########## @@ -704,7 +704,7 @@ public ASTNode visitInsert(final InsertContext ctx) { PostgreSQLInsertStatement result = (PostgreSQLInsertStatement) visit(ctx.insertRest()); result.setTable((SimpleTableSegment) visit(ctx.insertTarget())); if (null != ctx.optOnConflict()) { - result.setOnDuplicateKeyColumnsSegment((OnDuplicateKeyColumnsSegment) visit(ctx.optOnConflict())); + result.setOnConflictKeyColumnsSegment((OnConflictKeyColumnsSegment) visit(ctx.optOnConflict())); Review Comment: What is the difference between OnDuplicateKeyColumnsSegment and OnConflictKeyColumnsSegment? If they are the same functionality, it may be better to use the same Segment. ########## infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinder.java: ########## @@ -63,6 +64,12 @@ private InsertStatement copy(final InsertStatement sqlStatement) { result.getValues().addAll(sqlStatement.getValues()); sqlStatement.getSetAssignment().ifPresent(result::setSetAssignment); sqlStatement.getOnDuplicateKeyColumns().ifPresent(result::setOnDuplicateKeyColumns); + sqlStatement.getOnConflictKeyColumns().ifPresent(segment -> { Review Comment: Please do not use PostgreSQLInsertStatement in SQLBinder. If you need call setOnConflictKeyColumnsSegment method, please add it to InsertStatement, and implement setOnConflictKeyColumnsSegment in PostgreSQLInsertStatement. ########## infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/insert/values/OnConflictUpdateContextTest.java: ########## @@ -0,0 +1,148 @@ +/* + * 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.infra.binder.context.segment.insert.values; + +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.BinaryOperationExpression; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.SimpleExpressionSegment; +import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment; +import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue; +import org.junit.jupiter.api.Test; +import org.mockito.internal.configuration.plugins.Plugins; + +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +public class OnConflictUpdateContextTest { Review Comment: Please remove public modifier for unit test class. ########## infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java: ########## @@ -68,9 +69,17 @@ public SQLRewriteContext(final ShardingSphereDatabase database, final QueryConte if (!queryContext.getHintValueContext().isSkipSQLRewrite()) { addSQLTokenGenerators(new DefaultTokenGeneratorBuilder(sqlStatementContext).getSQLTokenGenerators()); } - parameterBuilder = containsInsertValues(sqlStatementContext) - ? new GroupedParameterBuilder(((InsertStatementContext) sqlStatementContext).getGroupedParameters(), ((InsertStatementContext) sqlStatementContext).getOnDuplicateKeyUpdateParameters()) - : new StandardParameterBuilder(parameters); + if (sqlStatementContext.getSqlStatement() instanceof PostgreSQLInsertStatement) { Review Comment: Please don't use PostgreSQLInsertStatement here. This method is not pluggable. -- 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-unsubscr...@shardingsphere.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org