HHH-16283 revert back LimitHandler related code changes

Author: nathan.xu

hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java

@@ -4,10 +4,7 @@
  */
 package org.hibernate.dialect.pagination;
 
-import java.util.function.Supplier;
-
 import org.hibernate.query.spi.Limit;
-import org.hibernate.query.spi.QueryOptions;
 
 /**
  * A {@link LimitHandler} for databases which support the
@@ -27,7 +24,7 @@ public OffsetFetchLimitHandler(boolean variableLimit) {
 	}
 
 	@Override
-	public String processSql(String sql, Limit limit, QueryOptions queryOptions) {
+	public String processSql(String sql, Limit limit) {
 
 		boolean hasFirstRow = hasFirstRow(limit);
 		boolean hasMaxRows = hasMaxRows(limit);
@@ -40,14 +37,10 @@ public String processSql(String sql, Limit limit, QueryOptions queryOptions) {
 
 		begin(sql, offsetFetch, hasFirstRow, hasMaxRows);
 
-		Supplier<String> parameterMarkerSupplier = ( queryOptions == null || queryOptions.getLimitHandlerParameterMarkerSupplier() == null )
-				? () -> "?"
-				: queryOptions.getLimitHandlerParameterMarkerSupplier();
-
 		if ( hasFirstRow ) {
 			offsetFetch.append( " offset " );
 			if ( supportsVariableLimit() ) {
-				offsetFetch.append( parameterMarkerSupplier.get() );
+				offsetFetch.append( "?" );
 			}
 			else {
 				offsetFetch.append( limit.getFirstRow() );
@@ -65,7 +58,7 @@ public String processSql(String sql, Limit limit, QueryOptions queryOptions) {
 				offsetFetch.append( " fetch first " );
 			}
 			if ( supportsVariableLimit() ) {
-				offsetFetch.append( parameterMarkerSupplier.get() );
+				offsetFetch.append( "?" );
 			}
 			else {
 				offsetFetch.append( getMaxOrLimit( limit ) );

hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java

@@ -9,7 +9,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Supplier;
 
 import jakarta.persistence.CacheRetrieveMode;
 import jakarta.persistence.CacheStoreMode;
@@ -53,17 +52,6 @@ public class QueryOptionsImpl implements MutableQueryOptions, AppliedGraph {
 	private Set<String> enabledFetchProfiles;
 	private Set<String> disabledFetchProfiles;
 
-	@Nullable
-	private final Supplier<String> limitHandlerParameterMarkerSupplier;
-
-	public QueryOptionsImpl() {
-		this( null );
-	}
-
-	public QueryOptionsImpl(Supplier<String> limitHandlerParameterMarkerSupplier) {
-		this.limitHandlerParameterMarkerSupplier = limitHandlerParameterMarkerSupplier;
-	}
-
 	@Override
 	public Integer getTimeout() {
 		return timeout;
@@ -267,9 +255,4 @@ public AppliedGraph getAppliedGraph() {
 	public @Nullable GraphSemantic getSemantic() {
 		return graphSemantic;
 	}
-
-	@Override
-	public @Nullable Supplier<String> getLimitHandlerParameterMarkerSupplier() {
-		return this.limitHandlerParameterMarkerSupplier;
-	}
 }

hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java

@@ -7,7 +7,6 @@
 import java.sql.Statement;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Supplier;
 
 import jakarta.persistence.CacheRetrieveMode;
 import jakarta.persistence.CacheStoreMode;
@@ -194,10 +193,6 @@ default ListResultsConsumer.UniqueSemantic getUniqueSemantic(){
 		return null;
 	}
 
-	default Supplier<String> getLimitHandlerParameterMarkerSupplier() {
-		return () -> "?";
-	}
-
 	/**
 	 * Provide singleton access for frequently needed options:
 	 */

hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeNonSelectQueryPlanImpl.java

@@ -14,8 +14,8 @@
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.spi.NonSelectQueryPlan;
 import org.hibernate.query.spi.QueryParameterBindings;
-import org.hibernate.query.sql.spi.NativeQueryPlan;
 import org.hibernate.query.sql.spi.ParameterOccurrence;
+import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutationNative;
@@ -25,7 +25,7 @@
 /**
  * @author Steve Ebersole
  */
-public class NativeNonSelectQueryPlanImpl implements NonSelectQueryPlan, NativeQueryPlan {
+public class NativeNonSelectQueryPlanImpl implements NonSelectQueryPlan {
 	private final String sql;
 	private final Set<String> affectedTableNames;
 
@@ -79,7 +79,7 @@ public int executeUpdate(DomainQueryExecutionContext executionContext) {
 						.getStatementPreparer()
 						.prepareStatement( sql ),
 				(integer, preparedStatement) -> {},
-				getSqmJdbcExecutionContext( executionContext, jdbcParameterBindings )
+				SqmJdbcExecutionContextAdapter.usingLockingAndPaging( executionContext )
 		);
 	}
 }

hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java

@@ -116,7 +116,6 @@
 
 /**
  * @author Steve Ebersole
- * @author Nathan Xu
  */
 public class NativeQueryImpl<R>
 		extends AbstractQuery<R>

hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java

@@ -20,6 +20,7 @@
 import org.hibernate.query.spi.ScrollableResultsImplementor;
 import org.hibernate.query.sql.spi.NativeSelectQueryPlan;
 import org.hibernate.query.sql.spi.ParameterOccurrence;
+import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBinder;
@@ -89,7 +90,7 @@ public <T> T executeQuery(DomainQueryExecutionContext executionContext, ResultsC
 		return executionContext.getSession().getJdbcServices().getJdbcSelectExecutor().executeQuery(
 				jdbcSelect,
 				jdbcParameterBindings,
-				getSqmJdbcExecutionContext( executionContext, jdbcParameterBindings ),
+				SqmJdbcExecutionContextAdapter.usingLockingAndPaging( executionContext ),
 				null,
 				null,
 				-1,
@@ -132,7 +133,7 @@ public List<R> performList(DomainQueryExecutionContext executionContext) {
 		return executionContext.getSession().getJdbcServices().getJdbcSelectExecutor().list(
 				jdbcSelect,
 				jdbcParameterBindings,
-				getSqmJdbcExecutionContext( executionContext, jdbcParameterBindings ),
+				SqmJdbcExecutionContextAdapter.usingLockingAndPaging( executionContext ),
 				null,
 				queryOptions.getUniqueSemantic() == null ?
 						ListResultsConsumer.UniqueSemantic.NEVER :
@@ -176,7 +177,7 @@ public ScrollableResultsImplementor<R> performScroll(ScrollMode scrollMode, Doma
 				jdbcSelect,
 				scrollMode,
 				jdbcParameterBindings,
-				getSqmJdbcExecutionContext( executionContext, jdbcParameterBindings ),
+				SqmJdbcExecutionContextAdapter.usingLockingAndPaging( executionContext ),
 				null,
 				-1
 		);

hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryPlan.java

@@ -4,19 +4,8 @@
  */
 package org.hibernate.query.sql.spi;
 
-import java.util.function.Supplier;
-
-import org.hibernate.internal.util.MutableInteger;
 import org.hibernate.query.NativeQuery;
-import org.hibernate.query.spi.DelegatingQueryOptions;
-import org.hibernate.query.spi.DomainQueryExecutionContext;
-import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.spi.QueryPlan;
-import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
-import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
-import org.hibernate.sql.exec.spi.ExecutionContext;
-import org.hibernate.sql.exec.spi.JdbcParameterBindings;
-import org.hibernate.type.descriptor.jdbc.IntegerJdbcType;
 
 /**
  * Specialization of {@link QueryPlan} for {@link NativeQuery}
@@ -25,25 +14,4 @@
  * @author Steve Ebersole
  */
 public interface NativeQueryPlan extends QueryPlan {
-
-	default ExecutionContext getSqmJdbcExecutionContext(DomainQueryExecutionContext executionContext, JdbcParameterBindings jdbcParameterBindings) {
-		final ParameterMarkerStrategy parameterMarkerStrategy = executionContext.getSession().getFactory().getServiceRegistry().getService(
-				ParameterMarkerStrategy.class );
-		final QueryOptions queryOptions;
-		if (parameterMarkerStrategy != null) {
-			final MutableInteger parameterPosition = new MutableInteger( jdbcParameterBindings.getBindings().size() );
-			queryOptions = new DelegatingQueryOptions( executionContext.getQueryOptions() ) {
-				@Override
-				public Supplier<String> getLimitHandlerParameterMarkerSupplier() {
-					return () -> parameterMarkerStrategy.createMarker(
-							parameterPosition.incrementAndGet(),
-							IntegerJdbcType.INSTANCE
-					);
-				}
-			};
-		} else {
-			queryOptions = executionContext.getQueryOptions();
-		}
-		return SqmJdbcExecutionContextAdapter.usingLockingAndPaging( executionContext, queryOptions );
-	}
 }

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java

@@ -31,10 +31,6 @@ public static SqmJdbcExecutionContextAdapter usingLockingAndPaging(DomainQueryEx
 		return new SqmJdbcExecutionContextAdapter( sqmExecutionContext, sqmExecutionContext.getQueryOptions() );
 	}
 
-	public static SqmJdbcExecutionContextAdapter usingLockingAndPaging(DomainQueryExecutionContext sqmExecutionContext, QueryOptions queryOptions) {
-		return new SqmJdbcExecutionContextAdapter( sqmExecutionContext, queryOptions );
-	}
-
 	private final DomainQueryExecutionContext sqmExecutionContext;
 	private final QueryOptions queryOptions;
 

hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java

@@ -402,7 +402,6 @@
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.Fetchable;
 import org.hibernate.sql.results.graph.FetchableContainer;
-import org.hibernate.sql.results.graph.collection.internal.EagerCollectionFetch;
 import org.hibernate.sql.results.graph.entity.EntityResultGraphNode;
 import org.hibernate.sql.results.graph.instantiation.internal.DynamicInstantiation;
 import org.hibernate.sql.results.graph.internal.ImmutableFetchList;

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java

@@ -26,7 +26,6 @@
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.resource.jdbc.spi.JdbcSessionContext;
 import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor;
-import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
 import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.exec.spi.JdbcLockStrategy;
 import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
@@ -52,7 +51,6 @@ public class DeferredResultSetAccess extends AbstractResultSetAccess {
 	private final LimitHandler limitHandler;
 	private final boolean usesFollowOnLocking;
 	private final int resultCountEstimate;
-	private final ParameterMarkerStrategy parameterMarkerStrategy;
 
 	private PreparedStatement preparedStatement;
 	private ResultSet resultSet;
@@ -70,7 +68,6 @@ public DeferredResultSetAccess(
 		this.statementCreator = statementCreator;
 		this.sqlStatementLogger = executionContext.getSession().getJdbcServices().getSqlStatementLogger();
 		this.resultCountEstimate = resultCountEstimate;
-		this.parameterMarkerStrategy = executionContext.getSession().getSessionFactory().getServiceRegistry().requireService( ParameterMarkerStrategy.class );
 
 		final QueryOptions queryOptions = executionContext.getQueryOptions();
 		if ( queryOptions == null ) {