Skip to content

code cleanups to StandardReactiveSelectExecutor #2165

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
merged 1 commit into from
Mar 26, 2025
Merged

code cleanups to StandardReactiveSelectExecutor #2165

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
112 changes: 50 additions & 62 deletions ...rc/main/java/org/hibernate/reactive/sql/exec/internal/StandardReactiveSelectExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
import org.hibernate.SharedSessionContract;
import org.hibernate.cache.spi.QueryKey;
import org.hibernate.cache.spi.QueryResultsCache;
import org.hibernate.engine.spi.LoadQueryInfluencers;
import org.hibernate.engine.spi.PersistenceContext;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.query.TupleTransformer;
import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
import org.hibernate.query.spi.QueryOptions;
Expand All @@ -43,6 +43,7 @@
import org.hibernate.sql.results.internal.RowTransformerTupleTransformerAdapter;
import org.hibernate.sql.results.jdbc.internal.CachedJdbcValuesMetadata;
import org.hibernate.sql.results.jdbc.internal.JdbcValuesSourceProcessingStateStandardImpl;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
import org.hibernate.sql.results.spi.RowTransformer;
Expand All @@ -52,6 +53,7 @@
import org.hibernate.type.spi.TypeConfiguration;

import static org.hibernate.internal.util.NullnessHelper.coalesceSuppliedValues;
import static org.hibernate.internal.util.collections.ArrayHelper.indexOf;

/**
* @see org.hibernate.sql.exec.internal.JdbcSelectExecutorStandardImpl
Expand Down Expand Up @@ -148,8 +150,8 @@ public <T, R> CompletionStage<T> executeQuery(
ReactiveResultsConsumer<T, R> resultsConsumer) {

final PersistenceContext persistenceContext = executionContext.getSession().getPersistenceContext();
boolean defaultReadOnlyOrig = persistenceContext.isDefaultReadOnly();
Boolean readOnly = executionContext.getQueryOptions().isReadOnly();
final boolean defaultReadOnlyOrig = persistenceContext.isDefaultReadOnly();
final Boolean readOnly = executionContext.getQueryOptions().isReadOnly();
if ( readOnly != null ) {
// The read-only/modifiable mode for the query was explicitly set.
// Temporarily set the default read-only/modifiable setting to the query's setting.
Expand Down Expand Up @@ -179,7 +181,8 @@ private <T, R> CompletionStage<T> doExecuteQuery(
JdbcSelectExecutor.StatementCreator statementCreator,
ReactiveResultsConsumer<T, R> resultsConsumer) {

final ReactiveDeferredResultSetAccess deferredResultSetAccess = new ReactiveDeferredResultSetAccess( jdbcSelect, jdbcParameterBindings, executionContext, statementCreator, resultCountEstimate );
final ReactiveDeferredResultSetAccess deferredResultSetAccess =
new ReactiveDeferredResultSetAccess( jdbcSelect, jdbcParameterBindings, executionContext, statementCreator, resultCountEstimate );

return resolveJdbcValuesSource(
executionContext.getQueryIdentifier( deferredResultSetAccess.getFinalSql() ),
Expand Down Expand Up @@ -216,10 +219,8 @@ public boolean shouldReturnProxies() {
}
};

final JdbcValuesSourceProcessingStateStandardImpl valuesProcessingState = new JdbcValuesSourceProcessingStateStandardImpl(
executionContext,
processingOptions
);
final JdbcValuesSourceProcessingStateStandardImpl valuesProcessingState =
new JdbcValuesSourceProcessingStateStandardImpl( executionContext, processingOptions );

final ReactiveRowReader<R> rowReader = ReactiveResultsHelper.createRowReader(
executionContext.getSession().getSessionFactory(),
Expand Down Expand Up @@ -257,26 +258,25 @@ private static <R> RowTransformer<R> rowTransformer(
ExecutionContext executionContext,
RowTransformer<R> transformer,
ReactiveValuesResultSet jdbcValues) {
RowTransformer<R> rowTransformer = transformer;
if ( rowTransformer == null ) {
@SuppressWarnings("unchecked") final TupleTransformer<R> tupleTransformer = (TupleTransformer<R>) executionContext
.getQueryOptions()
.getTupleTransformer();

if ( transformer == null ) {
@SuppressWarnings("unchecked")
final TupleTransformer<R> tupleTransformer =
(TupleTransformer<R>) executionContext.getQueryOptions().getTupleTransformer();
if ( tupleTransformer == null ) {
rowTransformer = RowTransformerStandardImpl.instance();
return RowTransformerStandardImpl.instance();
}
else {
final List<DomainResult<?>> domainResults = jdbcValues.getValuesMapping()
.getDomainResults();
final List<DomainResult<?>> domainResults = jdbcValues.getValuesMapping().getDomainResults();
final String[] aliases = new String[domainResults.size()];
for ( int i = 0; i < domainResults.size(); i++ ) {
aliases[i] = domainResults.get( i ).getResultVariable();
}
rowTransformer = new RowTransformerTupleTransformerAdapter<>( aliases, tupleTransformer );
return new RowTransformerTupleTransformerAdapter<>( aliases, tupleTransformer );
}
}
return rowTransformer;
else {
return transformer;
}
}

public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
Expand All @@ -290,9 +290,10 @@ public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
final boolean queryCacheEnabled = factory.getSessionFactoryOptions().isQueryCacheEnabled();

final CacheMode cacheMode = resolveCacheMode( executionContext );
final QueryOptions queryOptions = executionContext.getQueryOptions();
final boolean cacheable = queryCacheEnabled
&& canBeCached
&& executionContext.getQueryOptions().isResultCachingEnabled() == Boolean.TRUE;
&& queryOptions.isResultCachingEnabled() == Boolean.TRUE;

final QueryKey queryResultsCacheKey;
final List<?> cachedResults;
Expand All @@ -307,10 +308,10 @@ public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
}

final QueryResultsCache queryCache = factory.getCache()
.getQueryResultsCache( executionContext.getQueryOptions().getResultCacheRegionName() );
.getQueryResultsCache( queryOptions.getResultCacheRegionName() );

queryResultsCacheKey = QueryKey
.from( jdbcSelect.getSqlString(), executionContext.getQueryOptions().getLimit(), executionContext.getQueryParameterBindings(), session );
.from( jdbcSelect.getSqlString(), queryOptions.getLimit(), executionContext.getQueryParameterBindings(), session );

cachedResults = queryCache.get(
// todo (6.0) : QueryCache#get takes the `queryResultsCacheKey` see tat discussion above
Expand Down Expand Up @@ -345,7 +346,7 @@ public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
if ( cacheable && cacheMode.isPutEnabled() ) {
queryResultsCacheKey = QueryKey.from(
jdbcSelect.getSqlString(),
executionContext.getQueryOptions().getLimit(),
queryOptions.getLimit(),
executionContext.getQueryParameterBindings(),
session
);
Expand All @@ -355,16 +356,18 @@ public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
}
}

ReactiveValuesMappingProducer mappingProducer = (ReactiveValuesMappingProducer) jdbcSelect.getJdbcValuesMappingProducer();
final LoadQueryInfluencers loadQueryInfluencers = session.getLoadQueryInfluencers();

final ReactiveValuesMappingProducer mappingProducer =
(ReactiveValuesMappingProducer) jdbcSelect.getJdbcValuesMappingProducer();
if ( cachedResults == null ) {
if ( queryResultsCacheKey == null ) {
return mappingProducer
.reactiveResolve( resultSetAccess, session.getLoadQueryInfluencers(), factory )
return mappingProducer.reactiveResolve( resultSetAccess, loadQueryInfluencers, factory )
.thenApply( jdbcValuesMapping -> new ReactiveValuesResultSet(
resultSetAccess,
null,
queryIdentifier,
executionContext.getQueryOptions(),
queryOptions,
resultSetAccess.usesFollowOnLocking(),
jdbcValuesMapping,
null,
Expand All @@ -374,13 +377,12 @@ public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
else {
// If we need to put the values into the cache, we need to be able to capture the JdbcValuesMetadata
final CapturingJdbcValuesMetadata capturingMetadata = new CapturingJdbcValuesMetadata( resultSetAccess );
return mappingProducer
.reactiveResolve( resultSetAccess, session.getLoadQueryInfluencers(), factory )
return mappingProducer.reactiveResolve( resultSetAccess, loadQueryInfluencers, factory )
.thenApply( jdbcValuesMapping -> new ReactiveValuesResultSet(
resultSetAccess,
queryResultsCacheKey,
queryIdentifier,
executionContext.getQueryOptions(),
queryOptions,
resultSetAccess.usesFollowOnLocking(),
jdbcValuesMapping,
capturingMetadata.resolveMetadataForCache(),
Expand All @@ -392,34 +394,22 @@ public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
// TODO: Implements JdbcValuesCacheHit for reactive, see JdbcSelectExecutorStandardImpl#resolveJdbcValuesSource
// If we need to put the values into the cache, we need to be able to capture the JdbcValuesMetadata
final CapturingJdbcValuesMetadata capturingMetadata = new CapturingJdbcValuesMetadata( resultSetAccess );
if ( cachedResults.isEmpty() || !( cachedResults.get( 0 ) instanceof JdbcValuesMetadata ) ) {
return mappingProducer.reactiveResolve( resultSetAccess, session.getLoadQueryInfluencers(), factory )
.thenApply( jdbcValuesMapping -> new ReactiveValuesResultSet(
resultSetAccess,
queryResultsCacheKey,
queryIdentifier,
executionContext.getQueryOptions(),
resultSetAccess.usesFollowOnLocking(),
jdbcValuesMapping,
capturingMetadata.resolveMetadataForCache(),
executionContext
) );
}
else {
return mappingProducer
.reactiveResolve( (JdbcValuesMetadata) cachedResults.get( 0 ), session.getLoadQueryInfluencers(), factory )
.thenApply( jdbcValuesMapping -> new ReactiveValuesResultSet(
resultSetAccess,
queryResultsCacheKey,
queryIdentifier,
executionContext.getQueryOptions(),
resultSetAccess.usesFollowOnLocking(),
jdbcValuesMapping,
capturingMetadata.resolveMetadataForCache(),
executionContext
) );
}
}
final CompletionStage<JdbcValuesMapping> stage =
!cachedResults.isEmpty()
&& cachedResults.get(0) instanceof JdbcValuesMetadata jdbcValuesMetadata
? mappingProducer.reactiveResolve( jdbcValuesMetadata, loadQueryInfluencers, factory )
: mappingProducer.reactiveResolve( resultSetAccess, loadQueryInfluencers, factory );
return stage.thenApply( jdbcValuesMapping -> new ReactiveValuesResultSet(
resultSetAccess,
queryResultsCacheKey,
queryIdentifier,
queryOptions,
resultSetAccess.usesFollowOnLocking(),
jdbcValuesMapping,
capturingMetadata.resolveMetadataForCache(),
executionContext
) );
}
}

private static CacheMode resolveCacheMode(ExecutionContext executionContext) {
Expand Down Expand Up @@ -468,7 +458,7 @@ public int resolveColumnPosition(String columnName) {
position = resultSetAccess.resolveColumnPosition( columnName );
columnNames[position - 1] = columnName;
}
else if ( ( position = ArrayHelper.indexOf( columnNames, columnName ) + 1 ) == 0 ) {
else if ( ( position = indexOf( columnNames, columnName ) + 1 ) == 0 ) {
position = resultSetAccess.resolveColumnPosition( columnName );
columnNames[position - 1] = columnName;
}
Expand Down Expand Up @@ -556,9 +546,7 @@ public <T> void end(JdbcOperationQuerySelect jdbcSelect, T result) {
}

private <T> int getResultSize(T result) {
return result instanceof Collection
? ( (Collection<?>) result ).size()
: -1;
return result instanceof Collection<?> collection ? collection.size() : -1;
}
}
}
Loading