Skip to content

minor code improvements #11476

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
gavinking merged 1 commit into from
Dec 18, 2025
Merged

minor code improvements #11476

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
4 changes: 1 addition & 3 deletions hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protected void applyOptions(NamedQueryMemento<?> memento) {

@Override
public List<R> list() {
final HashSet<String> fetchProfiles = beforeQueryHandlingFetchProfiles();
final var fetchProfiles = beforeQueryHandlingFetchProfiles();
boolean success = false;
try {
final List<R> result = doList();
Expand All @@ -174,10 +174,8 @@ protected HashSet<String> beforeQueryHandlingFetchProfiles() {

protected void beforeQuery() {
getQueryParameterBindings().validate();

final var session = getSession();
final var options = getQueryOptions();

session.prepareForQueryExecution( requiresTxn( options.getLockOptions().getLockMode() ) );
prepareForExecution();
prepareSessionFlushMode( session );
Expand Down
38 changes: 20 additions & 18 deletions hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,31 +207,33 @@ private Results<R> createResults(
boolean isEntityResultType,
JavaType<R> domainResultJavaType,
int initialCollectionSize) {
if ( isEntityResultType
&& ( uniqueSemantic == UniqueSemantic.ALLOW || uniqueSemantic == UniqueSemantic.FILTER ) ) {
return new EntityResult<>( domainResultJavaType, initialCollectionSize );
}
else {
return new Results<>( domainResultJavaType, initialCollectionSize );
}
return isEntityResultType && isAllowOrFilter()
? new EntityResult<>( domainResultJavaType, initialCollectionSize )
: new Results<>( domainResultJavaType, initialCollectionSize );
}

private boolean isAllowOrFilter() {
return uniqueSemantic == UniqueSemantic.ALLOW
|| uniqueSemantic == UniqueSemantic.FILTER;
}

private int readRows(
RowProcessingStateStandardImpl rowProcessingState,
RowReader<R> rowReader,
boolean isEntityResultType,
Results<R> results) {
if ( uniqueSemantic == UniqueSemantic.FILTER
|| uniqueSemantic == UniqueSemantic.ASSERT && rowReader.hasCollectionInitializers()
|| uniqueSemantic == UniqueSemantic.ALLOW && isEntityResultType ) {
return readUnique( rowProcessingState, rowReader, results );
}
else if ( uniqueSemantic == UniqueSemantic.ASSERT ) {
return readUniqueAssert( rowProcessingState, rowReader, results );
}
else {
return read( rowProcessingState, rowReader, results );
}
return switch ( uniqueSemantic ) {
case FILTER ->
readUnique( rowProcessingState, rowReader, results );
case ASSERT -> rowReader.hasCollectionInitializers()
? readUnique( rowProcessingState, rowReader, results )
: readUniqueAssert( rowProcessingState, rowReader, results );
case ALLOW -> isEntityResultType
? readUnique( rowProcessingState, rowReader, results )
: read( rowProcessingState, rowReader, results );
case NONE, NEVER ->
read( rowProcessingState, rowReader, results );
};
}

private static <R> int read(
Expand Down