Skip to content

HHH-20283 Fix key based pagination issue after HHH-20274 #12066

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.

Sign up for GitHub

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

Merged
beikov merged 1 commit into from
Mar 25, 2026
Merged

HHH-20283 Fix key based pagination issue after HHH-20274 #12066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyBasedPagination.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.hibernate.query.sqm.NodeBuilder;
import org.hibernate.query.sqm.tree.domain.SqmPath;
import org.hibernate.query.sqm.tree.from.SqmFrom;
import org.hibernate.query.sqm.tree.from.SqmRoot;
import org.hibernate.query.sqm.tree.predicate.SqmPredicate;
import org.hibernate.query.sqm.tree.select.SqmQuerySpec;
import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
Expand All @@ -37,25 +38,33 @@ static <R> SqmSelectStatement<KeyedResult<R>> paginate(
SqmSelectStatement<KeyedResult<R>> statement, NodeBuilder builder) {
final SqmQuerySpec<?> querySpec = statement.getQuerySpec();
final List<? extends JpaSelection<?>> items = querySpec.getSelectClause().getSelectionItems();
if ( items.size() == 1 ) {
final JpaSelection<?> selected = items.get(0);
if ( selected instanceof SqmFrom<?, ?> root ) {
statement.orderBy( keyDefinition.stream().map( order -> sortSpecification( statement, order ) )
.collect( toList() ) );
statement.select( keySelection( keyDefinition, root, selected, builder ) );
if ( keyValues != null ) {
final SqmPredicate restriction = keyRestriction( keyDefinition, keyValues, root, builder );
final SqmPredicate queryWhere = querySpec.getRestriction();
statement.where( queryWhere == null ? restriction : builder.and( queryWhere, restriction ) );
final JpaSelection<?> selected = switch ( items.size() ) {
case 0 -> {
final List<SqmRoot<?>> sqmRoots = querySpec.getRootList();
if ( sqmRoots == null || sqmRoots.isEmpty() ) {
throw new IllegalArgumentException( "Query did not define any query roots" );
}
return statement;
if ( sqmRoots.size() != 1 ) {
throw new IllegalArgumentException( "Query has multiple query roots" );
}
yield sqmRoots.get( 0 );
}
else {
throw new IllegalQueryOperationException("Select item was not an entity type");
case 1 -> items.get( 0 );
default -> throw new IllegalQueryOperationException("Query has multiple items in the select list");
};
if ( selected instanceof SqmFrom<?, ?> root ) {
statement.orderBy( keyDefinition.stream().map( order -> sortSpecification( statement, order ) )
.collect( toList() ) );
statement.select( keySelection( keyDefinition, root, selected, builder ) );
if ( keyValues != null ) {
final SqmPredicate restriction = keyRestriction( keyDefinition, keyValues, root, builder );
final SqmPredicate queryWhere = querySpec.getRestriction();
statement.where( queryWhere == null ? restriction : builder.and( queryWhere, restriction ) );
}
return statement;
}
else {
throw new IllegalQueryOperationException("Query has multiple items in the select list");
throw new IllegalQueryOperationException("Select item was not an entity type");
}
}

Expand Down
15 changes: 15 additions & 0 deletions hibernate-core/src/test/java/org/hibernate/orm/test/paging/keybased/KeyBasedPagingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
import org.hibernate.query.Page;
import org.hibernate.query.SelectionQuery;

import org.hibernate.query.criteria.HibernateCriteriaBuilder;
import org.hibernate.query.criteria.JpaCriteriaQuery;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.Jira;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -153,6 +156,18 @@ public class KeyBasedPagingTest {
});
}

@Test
@Jira("https://hibernate.atlassian.net/browse/HHH-20283")
void testCriteria(SessionFactoryScope scope) {
scope.inSession(session -> {
HibernateCriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
JpaCriteriaQuery<Person> query = criteriaBuilder.createQuery( Person.class );
query.from( Person.class );
session.createSelectionQuery( query )
.getKeyedResultList( Page.first( 5 ).keyedBy( Order.asc( Person.class, "ssn" ) ) );
});
}

@Entity(name = "Person")
static class Person {
@Id
Expand Down
Loading