From ecf8e1ce39dc27633b3d9753daeaaa91b6d10830 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Fri, 10 Feb 2023 11:16:00 +0100 Subject: [PATCH] Get rid of Clause parameter in JdbcParameterBindings --- .../loader/ast/internal/AbstractNaturalIdLoader.java | 2 -- .../loader/ast/internal/CollectionElementLoaderByIndex.java | 3 --- .../loader/ast/internal/CollectionLoaderBatchKey.java | 2 -- .../loader/ast/internal/CollectionLoaderSingleKey.java | 3 --- .../loader/ast/internal/DatabaseSnapshotExecutor.java | 3 --- .../loader/ast/internal/MultiIdLoaderStandard.java | 3 --- .../loader/ast/internal/MultiNaturalIdLoadingBatcher.java | 3 --- .../ast/internal/SingleIdEntityLoaderDynamicBatch.java | 3 --- .../org/hibernate/loader/ast/internal/SingleIdLoadPlan.java | 3 --- .../ast/internal/SingleUniqueKeyEntityLoaderStandard.java | 3 --- .../mapping/internal/GeneratedValuesProcessor.java | 2 -- .../main/java/org/hibernate/query/sqm/internal/SqmUtil.java | 2 -- .../org/hibernate/sql/exec/spi/JdbcParameterBindings.java | 6 +----- 13 files changed, 1 insertion(+), 37 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java index 257ed62546..0b35b2d819 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java @@ -30,7 +30,6 @@ import org.hibernate.query.internal.SimpleQueryOptions; import org.hibernate.query.spi.QueryOptions; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.SimpleFromClauseAccessImpl; import org.hibernate.sql.ast.spi.SqlAliasBaseManager; @@ -316,7 +315,6 @@ public Object resolveIdToNaturalId(Object id, SharedSessionContractImplementor s final JdbcParameterBindings jdbcParamBindings = new JdbcParameterBindingsImpl( jdbcParameters.size() ); int offset = jdbcParamBindings.registerParametersForEachJdbcValue( id, - Clause.WHERE, entityDescriptor().getIdentifierMapping(), jdbcParameters, session diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java index 37ff815aa2..04a3eedd13 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java @@ -23,7 +23,6 @@ import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.internal.EntityCollectionPart; import org.hibernate.query.spi.QueryOptions; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; @@ -116,14 +115,12 @@ public Object load(Object key, Object index, SharedSessionContractImplementor se int offset = jdbcParameterBindings.registerParametersForEachJdbcValue( key, - Clause.WHERE, attributeMapping.getKeyDescriptor(), jdbcParameters, session ); offset += jdbcParameterBindings.registerParametersForEachJdbcValue( incrementIndexByBase( index ), - Clause.WHERE, offset, attributeMapping.getIndexDescriptor(), jdbcParameters, diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderBatchKey.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderBatchKey.java index 728a691fa3..6554eb427c 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderBatchKey.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderBatchKey.java @@ -25,7 +25,6 @@ import org.hibernate.loader.ast.spi.CollectionLoader; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.query.spi.QueryOptions; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; @@ -180,7 +179,6 @@ private void batchLoad( for ( int i = smallBatchStart; i < smallBatchStart + smallBatchLength; i++ ) { offset += jdbcParameterBindings.registerParametersForEachJdbcValue( batchIds[i], - Clause.WHERE, offset, getLoadable().getKeyDescriptor(), jdbcParameters, diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java index 242b02cff9..98e87aa55a 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java @@ -22,8 +22,6 @@ import org.hibernate.loader.ast.spi.CollectionLoader; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.query.spi.QueryOptions; -import org.hibernate.query.spi.QueryParameterBindings; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; @@ -99,7 +97,6 @@ public PersistentCollection load(Object key, SharedSessionContractImplementor final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl( keyJdbcCount ); int offset = jdbcParameterBindings.registerParametersForEachJdbcValue( key, - Clause.WHERE, attributeMapping.getKeyDescriptor(), jdbcParameters, session diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java index ab4d6a5d80..acf108bfde 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java @@ -17,11 +17,9 @@ import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.query.spi.QueryOptions; -import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.sql.FromClauseIndex; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.SqlAliasBaseManager; import org.hibernate.sql.ast.spi.SqlExpressionResolver; @@ -165,7 +163,6 @@ Object[] loadDatabaseSnapshot(Object id, SharedSessionContractImplementor sessio int offset = jdbcParameterBindings.registerParametersForEachJdbcValue( id, - Clause.WHERE, entityDescriptor.getIdentifierMapping(), jdbcParameters, session diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java index e68ea70195..061f231a94 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdLoaderStandard.java @@ -23,7 +23,6 @@ import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.engine.spi.Status; import org.hibernate.engine.spi.SubselectFetch; import org.hibernate.event.spi.EventSource; import org.hibernate.event.spi.LoadEvent; @@ -35,7 +34,6 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.spi.QueryOptions; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; @@ -264,7 +262,6 @@ private List loadEntitiesById( offset += jdbcParameterBindings.registerParametersForEachJdbcValue( id, - Clause.WHERE, offset, entityDescriptor.getIdentifierMapping(), jdbcParameters, diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java index 3c9f22b5b5..09454424d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java @@ -21,7 +21,6 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.spi.QueryOptions; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; @@ -102,7 +101,6 @@ public List multiLoad(Object[] naturalIdValues, MultiNaturalIdLoadOptions if ( bindValue != null ) { offset += jdbcParamBindings.registerParametersForEachJdbcValue( bindValue, - Clause.IRRELEVANT, offset, entityDescriptor.getNaturalIdMapping(), jdbcParameters, @@ -124,7 +122,6 @@ public List multiLoad(Object[] naturalIdValues, MultiNaturalIdLoadOptions // pad the remaining parameters with null offset += jdbcParamBindings.registerParametersForEachJdbcValue( null, - Clause.IRRELEVANT, offset, entityDescriptor.getNaturalIdMapping(), jdbcParameters, diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderDynamicBatch.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderDynamicBatch.java index 3b687dc141..43485c5bfd 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderDynamicBatch.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderDynamicBatch.java @@ -21,8 +21,6 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryOptionsAdapter; -import org.hibernate.query.spi.QueryParameterBindings; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; @@ -120,7 +118,6 @@ public T load( for ( int i = 0; i < numberOfIds; i++ ) { offset += jdbcParameterBindings.registerParametersForEachJdbcValue( idsToLoad[i], - Clause.WHERE, offset, getLoadable().getIdentifierMapping(), jdbcParameters, diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java index b0333987aa..a5c0edadfb 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java @@ -18,8 +18,6 @@ import org.hibernate.query.internal.SimpleQueryOptions; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryOptionsAdapter; -import org.hibernate.query.spi.QueryParameterBindings; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; @@ -134,7 +132,6 @@ public T load( while ( offset < jdbcParameters.size() ) { offset += jdbcParameterBindings.registerParametersForEachJdbcValue( restrictedValue, - Clause.WHERE, offset, restrictivePart, jdbcParameters, diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java index ae7f0e9d9a..2a03441e2b 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java @@ -23,7 +23,6 @@ import org.hibernate.metamodel.mapping.SingularAttributeMapping; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.query.spi.QueryOptions; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslatorFactory; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; @@ -88,7 +87,6 @@ public T load( final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl( jdbcParameters.size() ); int offset = jdbcParameterBindings.registerParametersForEachJdbcValue( ukValue, - Clause.WHERE, uniqueKeyAttribute, jdbcParameters, session @@ -145,7 +143,6 @@ public Object resolveId(Object ukValue, SharedSessionContractImplementor session final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl( jdbcParameters.size() ); int offset = jdbcParameterBindings.registerParametersForEachJdbcValue( ukValue, - Clause.WHERE, uniqueKeyAttribute, jdbcParameters, session diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java index b3d0e7305e..15f0c156b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java @@ -22,7 +22,6 @@ import org.hibernate.metamodel.mapping.AttributeMapping; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.query.spi.QueryOptions; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; @@ -124,7 +123,6 @@ private JdbcParameterBindings getJdbcParameterBindings(Object id, SharedSessionC final JdbcParameterBindings jdbcParamBindings = new JdbcParameterBindingsImpl( jdbcParameters.size() ); int offset = jdbcParamBindings.registerParametersForEachJdbcValue( id, - Clause.WHERE, entityDescriptor.getIdentifierMapping(), jdbcParameters, session diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java index 0570ad1afa..c1dbdeb031 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java @@ -48,7 +48,6 @@ import org.hibernate.query.sqm.tree.expression.SqmParameter; import org.hibernate.query.sqm.tree.jpa.ParameterCollector; import org.hibernate.query.sqm.tree.select.SqmSelectStatement; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlTreeCreationException; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.from.TableGroup; @@ -389,7 +388,6 @@ else if ( parameterType instanceof EntityAssociationMapping ) { int offset = jdbcParameterBindings.registerParametersForEachJdbcValue( bindValue, - Clause.IRRELEVANT, parameterType, jdbcParams, session diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java index 2a4a6c4f6f..deabfafacc 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java @@ -12,7 +12,6 @@ import java.util.function.BiConsumer; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.mapping.BasicValuedMapping; @@ -25,7 +24,6 @@ import org.hibernate.query.spi.QueryParameterImplementor; import org.hibernate.query.sql.internal.NativeQueryImpl; import org.hibernate.query.sql.spi.ParameterOccurrence; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl; import org.hibernate.sql.exec.internal.JdbcParameterImpl; @@ -75,16 +73,14 @@ public void visitBindings(BiConsumer action default int registerParametersForEachJdbcValue( Object value, - Clause clause, Bindable bindable, List jdbcParameters, SharedSessionContractImplementor session) { - return registerParametersForEachJdbcValue( value, clause, 0, bindable, jdbcParameters, session ); + return registerParametersForEachJdbcValue( value, 0, bindable, jdbcParameters, session ); } default int registerParametersForEachJdbcValue( Object value, - Clause clause, int offset, Bindable bindable, List jdbcParameters,