-
Notifications
You must be signed in to change notification settings - Fork 3.6k
HHH-19498 - improve upserts on MySQL and Maria #10275
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jrenaat
wants to merge
1
commit into
hibernate:main
Choose a base branch
from
jrenaat:HHH-19498_mysqlupsertimprovement
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
hibernate-core/src/main/java/org/hibernate/dialect/MySQLDeleteOrUpsertOperation.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * Copyright Red Hat Inc. and Hibernate Authors | ||
| */ | ||
| package org.hibernate.dialect; | ||
|
|
||
|
|
||
| import org.hibernate.StaleStateException; | ||
| import org.hibernate.engine.jdbc.mutation.JdbcValueBindings; | ||
| import org.hibernate.engine.spi.SharedSessionContractImplementor; | ||
| import org.hibernate.jdbc.Expectation; | ||
| import org.hibernate.persister.entity.mutation.EntityMutationTarget; | ||
| import org.hibernate.persister.entity.mutation.EntityTableMapping; | ||
| import org.hibernate.sql.model.ValuesAnalysis; | ||
| import org.hibernate.sql.model.internal.OptionalTableUpdate; | ||
| import org.hibernate.sql.model.jdbc.DeleteOrUpsertOperation; | ||
| import org.hibernate.sql.model.jdbc.UpsertOperation; | ||
|
|
||
| import java.sql.PreparedStatement; | ||
|
|
||
|
|
||
| /** | ||
| * @author Jan Schatteman | ||
| */ | ||
| public class MySQLDeleteOrUpsertOperation extends DeleteOrUpsertOperation { | ||
|
|
||
| private Expectation customExpectation; | ||
|
|
||
| public MySQLDeleteOrUpsertOperation(EntityMutationTarget mutationTarget, EntityTableMapping tableMapping, UpsertOperation upsertOperation, OptionalTableUpdate optionalTableUpdate) { | ||
| super( mutationTarget, tableMapping, upsertOperation, optionalTableUpdate ); | ||
| } | ||
|
|
||
| @Override | ||
| public void performMutation(JdbcValueBindings jdbcValueBindings, ValuesAnalysis valuesAnalysis, SharedSessionContractImplementor session) { | ||
| customExpectation = new MySQLRowCountExpectation(); | ||
| super.performMutation( jdbcValueBindings, valuesAnalysis, session ); | ||
| } | ||
|
|
||
| @Override | ||
| protected Expectation getExpectation() { | ||
| return customExpectation; | ||
| } | ||
|
|
||
| private class MySQLRowCountExpectation implements Expectation { | ||
| @Override | ||
| public final void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) { | ||
| if ( rowCount > 2 ) { | ||
| throw new StaleStateException( | ||
| "Unexpected row count" | ||
| + " (the expected row count for an ON DUPLICATE KEY UPDATE statement should be either 0, 1 or 2 )" | ||
| + " [" + sql + "]" | ||
| ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
125 changes: 125 additions & 0 deletions
125
...src/main/java/org/hibernate/dialect/sql/ast/SqlAstTranslatorWithOnDuplicateKeyUpdate.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * Copyright Red Hat Inc. and Hibernate Authors | ||
| */ | ||
| package org.hibernate.dialect.sql.ast; | ||
|
|
||
|
|
||
| import org.hibernate.dialect.MySQLDeleteOrUpsertOperation; | ||
| import org.hibernate.engine.spi.SessionFactoryImplementor; | ||
| import org.hibernate.persister.entity.mutation.EntityTableMapping; | ||
| import org.hibernate.sql.ast.spi.SqlAstTranslatorWithUpsert; | ||
| import org.hibernate.sql.ast.tree.Statement; | ||
| import org.hibernate.sql.exec.spi.JdbcOperation; | ||
| import org.hibernate.sql.model.MutationOperation; | ||
| import org.hibernate.sql.model.ast.ColumnValueBinding; | ||
| import org.hibernate.sql.model.internal.OptionalTableUpdate; | ||
| import org.hibernate.sql.model.jdbc.UpsertOperation; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * @author Jan Schatteman | ||
| */ | ||
| public class SqlAstTranslatorWithOnDuplicateKeyUpdate<T extends JdbcOperation> extends SqlAstTranslatorWithUpsert<T> { | ||
|
|
||
| public SqlAstTranslatorWithOnDuplicateKeyUpdate(SessionFactoryImplementor sessionFactory, Statement statement) { | ||
| super( sessionFactory, statement ); | ||
| } | ||
|
|
||
| @Override | ||
| public MutationOperation createMergeOperation(OptionalTableUpdate optionalTableUpdate) { | ||
| assert optionalTableUpdate.getNumberOfOptimisticLockBindings() == 0; | ||
|
|
||
| renderUpsertStatement( optionalTableUpdate ); | ||
|
|
||
| final UpsertOperation upsertOperation = new UpsertOperation( | ||
| optionalTableUpdate.getMutatingTable().getTableMapping(), | ||
| optionalTableUpdate.getMutationTarget(), | ||
| getSql(), | ||
| getParameterBinders() | ||
| ); | ||
|
|
||
| return new MySQLDeleteOrUpsertOperation( | ||
| optionalTableUpdate.getMutationTarget(), | ||
| (EntityTableMapping) optionalTableUpdate.getMutatingTable().getTableMapping(), | ||
| upsertOperation, | ||
| optionalTableUpdate | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| protected void renderUpsertStatement(OptionalTableUpdate optionalTableUpdate) { | ||
| /* | ||
| Template: (for an entity WITHOUT @Version) | ||
| INSERT INTO employees (id, name, salary, version) | ||
| VALUES (?, ?, ?, ?) AS tr | ||
| ON DUPLICATE KEY UPDATE | ||
| name = tr.name, | ||
| salary = tr.salary, | ||
| */ | ||
| renderInsertInto( optionalTableUpdate ); | ||
| appendSql( " " ); | ||
| renderOnDuplicateKeyUpdate( optionalTableUpdate ); | ||
| } | ||
|
|
||
| protected void renderInsertInto(OptionalTableUpdate optionalTableUpdate) { | ||
| appendSql( "insert into " ); | ||
| appendSql( optionalTableUpdate.getMutatingTable().getTableName() ); | ||
| appendSql( " (" ); | ||
|
|
||
| final List<ColumnValueBinding> keyBindings = optionalTableUpdate.getKeyBindings(); | ||
| for ( ColumnValueBinding keyBinding : keyBindings ) { | ||
| appendSql( keyBinding.getColumnReference().getColumnExpression() ); | ||
| appendSql( ',' ); | ||
| } | ||
|
|
||
| optionalTableUpdate.forEachValueBinding( (columnPosition, columnValueBinding) -> { | ||
| appendSql( columnValueBinding.getColumnReference().getColumnExpression() ); | ||
| if ( columnPosition != optionalTableUpdate.getValueBindings().size() - 1 ) { | ||
| appendSql( ',' ); | ||
| } | ||
| } ); | ||
|
|
||
| appendSql( ") values (" ); | ||
|
|
||
| for ( ColumnValueBinding keyBinding : keyBindings ) { | ||
| keyBinding.getValueExpression().accept( this ); | ||
| appendSql( ',' ); | ||
| } | ||
|
|
||
| optionalTableUpdate.forEachValueBinding( (columnPosition, columnValueBinding) -> { | ||
| if ( columnPosition > 0 ) { | ||
| appendSql( ',' ); | ||
| } | ||
| columnValueBinding.getValueExpression().accept( this ); | ||
| } ); | ||
| appendSql( ") as " ); | ||
| renderAlias(); | ||
| appendSql( " " ); | ||
| } | ||
|
|
||
| protected void renderAlias() { | ||
| appendSql( "tr" ); | ||
| } | ||
|
|
||
| protected void renderOnDuplicateKeyUpdate(OptionalTableUpdate optionalTableUpdate) { | ||
| appendSql( "on duplicate key update " ); | ||
| optionalTableUpdate.forEachValueBinding( (columnPosition, columnValueBinding) -> { | ||
| final String columnName = columnValueBinding.getColumnReference().getColumnExpression(); | ||
| if ( columnPosition > 0 ) { | ||
| appendSql( ',' ); | ||
| } | ||
| appendSql( columnName ); | ||
| append( " = " ); | ||
| renderNonVersionedUpdate( columnValueBinding ); | ||
| } ); | ||
| } | ||
|
|
||
| private void renderNonVersionedUpdate(ColumnValueBinding columnValueBinding) { | ||
| renderAlias(); | ||
| appendSql( "." ); | ||
| appendSql( columnValueBinding.getColumnReference().getColumnExpression() ); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check notice
Code scanning / CodeQL
Inner class could be static Note