minor cleanups in JdbcSelectExecutorStandardImpl

Author: gavinking

hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java

@@ -12,10 +12,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.query.spi.QueryOptions;
 import org.hibernate.sql.exec.SqlExecLogger;
@@ -28,6 +28,7 @@
 import org.hibernate.sql.results.internal.RowProcessingStateStandardImpl;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
 import org.hibernate.sql.results.internal.RowTransformerTupleTransformerAdapter;
+import org.hibernate.sql.results.jdbc.internal.AbstractJdbcValues;
 import org.hibernate.sql.results.jdbc.internal.CachedJdbcValuesMetadata;
 import org.hibernate.sql.results.jdbc.internal.DeferredResultSetAccess;
 import org.hibernate.sql.results.jdbc.internal.JdbcValuesCacheHit;
@@ -48,6 +49,7 @@
 import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.internal.util.NullnessHelper.coalesceSuppliedValues;
+import static org.hibernate.internal.util.collections.ArrayHelper.indexOf;
 
 /**
  * Standard JdbcSelectExecutor implementation used by Hibernate,
@@ -145,22 +147,7 @@ private <T, R> T doExecuteQuery(
 		);
 
 		if ( rowTransformer == null ) {
-			@SuppressWarnings("unchecked")
-			final TupleTransformer<R> tupleTransformer = (TupleTransformer<R>) executionContext
-					.getQueryOptions()
-					.getTupleTransformer();
-
-			if ( tupleTransformer == null ) {
-				rowTransformer = RowTransformerStandardImpl.instance();
-			}
-			else {
-				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 );
-			}
+			rowTransformer = getRowTransformer( executionContext, jdbcValues );
 		}
 
 		final SharedSessionContractImplementor session = executionContext.getSession();
@@ -204,10 +191,8 @@ public boolean shouldReturnProxies() {
 			}
 		};
 
-		final JdbcValuesSourceProcessingStateStandardImpl valuesProcessingState = new JdbcValuesSourceProcessingStateStandardImpl(
-				executionContext,
-				processingOptions
-		);
+		final JdbcValuesSourceProcessingStateStandardImpl valuesProcessingState =
+				new JdbcValuesSourceProcessingStateStandardImpl( executionContext, processingOptions );
 
 		final RowReader<R> rowReader = ResultsHelper.createRowReader(
 				session.getFactory(),
@@ -234,7 +219,8 @@ public boolean shouldReturnProxies() {
 
 		if ( stats ) {
 			final long endTime = System.nanoTime();
-			final long milliseconds = TimeUnit.MILLISECONDS.convert( endTime - startTime, TimeUnit.NANOSECONDS );
+			final long milliseconds =
+					TimeUnit.MILLISECONDS.convert( endTime - startTime, TimeUnit.NANOSECONDS );
 			statistics.queryExecuted(
 					executionContext.getQueryIdentifier( jdbcSelect.getSqlString() ),
 					getResultSize( result ),
@@ -245,11 +231,25 @@ public boolean shouldReturnProxies() {
 		return result;
 	}
 
-	private <T> int getResultSize(T result) {
-		if ( result instanceof List ) {
-			return ( (List<?>) result ).size();
+	private static <R> RowTransformer<R> getRowTransformer(ExecutionContext executionContext, JdbcValues jdbcValues) {
+		@SuppressWarnings("unchecked")
+		final TupleTransformer<R> tupleTransformer =
+				(TupleTransformer<R>) executionContext.getQueryOptions().getTupleTransformer();
+		if ( tupleTransformer == null ) {
+			return RowTransformerStandardImpl.instance();
+		}
+		else {
+			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();
+			}
+			return new RowTransformerTupleTransformerAdapter<>( aliases, tupleTransformer );
 		}
-		return -1;
+	}
+
+	private <T> int getResultSize(T result) {
+		return result instanceof List<?> list ? list.size() : -1;
 	}
 
 	private JdbcValues resolveJdbcValuesSource(
@@ -334,20 +334,41 @@ private JdbcValues resolveJdbcValuesSource(
 			}
 		}
 
+		return resolveJdbcValues(
+				queryIdentifier,
+				executionContext,
+				resultSetAccess,
+				cachedResults,
+				queryResultsCacheKey,
+				mappingProducer,
+				session,
+				factory
+		);
+	}
+
+	private static AbstractJdbcValues resolveJdbcValues(
+			String queryIdentifier,
+			ExecutionContext executionContext,
+			DeferredResultSetAccess resultSetAccess,
+			List<?> cachedResults,
+			QueryKey queryResultsCacheKey,
+			JdbcValuesMappingProducer mappingProducer,
+			SharedSessionContractImplementor session,
+			SessionFactoryImplementor factory) {
+		final LoadQueryInfluencers loadQueryInfluencers = session.getLoadQueryInfluencers();
 		if ( cachedResults == null ) {
 			final CachedJdbcValuesMetadata metadataForCache;
 			final JdbcValuesMapping jdbcValuesMapping;
 			if ( queryResultsCacheKey == null ) {
-				jdbcValuesMapping = mappingProducer.resolve( resultSetAccess, session.getLoadQueryInfluencers(), factory );
+				jdbcValuesMapping = mappingProducer.resolve( resultSetAccess, loadQueryInfluencers, factory );
 				metadataForCache = null;
 			}
 			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 );
-				jdbcValuesMapping = mappingProducer.resolve( capturingMetadata, session.getLoadQueryInfluencers(), factory );
+				jdbcValuesMapping = mappingProducer.resolve( capturingMetadata, loadQueryInfluencers, factory );
 				metadataForCache = capturingMetadata.resolveMetadataForCache();
 			}
-
 			return new JdbcValuesResultSetImpl(
 					resultSetAccess,
 					queryResultsCacheKey,
@@ -360,14 +381,13 @@ private JdbcValues resolveJdbcValuesSource(
 			);
 		}
 		else {
-			final JdbcValuesMapping jdbcValuesMapping;
-			if ( cachedResults.isEmpty() || !( cachedResults.get( 0 ) instanceof JdbcValuesMetadata ) ) {
-				jdbcValuesMapping = mappingProducer.resolve( resultSetAccess, session.getLoadQueryInfluencers(), factory );
-			}
-			else {
-				jdbcValuesMapping = mappingProducer.resolve( (JdbcValuesMetadata) cachedResults.get( 0 ), session.getLoadQueryInfluencers(), factory );
-			}
-			return new JdbcValuesCacheHit( cachedResults, jdbcValuesMapping );
+			final JdbcValuesMetadata valuesMetadata =
+					!cachedResults.isEmpty()
+						&& cachedResults.get( 0 ) instanceof JdbcValuesMetadata jdbcValuesMetadata
+							? jdbcValuesMetadata
+							: resultSetAccess;
+			return new JdbcValuesCacheHit( cachedResults,
+					mappingProducer.resolve( valuesMetadata, loadQueryInfluencers, factory ) );
 		}
 	}
 
@@ -414,7 +434,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;
 			}
@@ -446,16 +466,14 @@ public <J> BasicType<J> resolveType(
 			if ( columnNames == null ) {
 				initializeArrays();
 			}
-			final BasicType<J> basicType = resultSetAccess.resolveType( position, explicitJavaType, typeConfiguration );
+			final BasicType<J> basicType =
+					resultSetAccess.resolveType( position, explicitJavaType, typeConfiguration );
 			types[position - 1] = basicType;
 			return basicType;
 		}
 
 		public CachedJdbcValuesMetadata resolveMetadataForCache() {
-			if ( columnNames == null ) {
-				return null;
-			}
-			return new CachedJdbcValuesMetadata( columnNames, types );
+			return columnNames == null ? null : new CachedJdbcValuesMetadata( columnNames, types );
 		}
 	}