HHH-19010 get rid of inheritance of SessionFactoryImplementor from query creation context stuff #9565

gavinking · 2025-01-05T12:11:43Z

Let's make the NodeBuilder the thing that is the SqmCreationContext, and introduce a new thing that performs a similar role for SqlAstCreationContext. The reason here is twofold:

it is part of my long struggle to decouple query parsing/typing from the SessionFactory, in order to make HibernateProcessor less of a hack and I guess more robust
SessionFactoryImplementor was already starting to be polluted with weird little operations that didn't belong there. That will only get worse with time.

[Please describe here what your change is about]

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

https://hibernate.atlassian.net/browse/HHH-19010

hibernate-github-bot · 2025-01-05T12:11:47Z

Thanks for your pull request!

This pull request does not follow the contribution rules. Could you have a look?

❌ All commit messages should start with a JIRA issue key matching pattern HHH-\d+
↳ Offending commits: [6eacabb, e1df901, 91785f4, f93d821]

› This message was automatically generated.

…ery creation context stuff Let's make the NodeBuilder the thing that is the SqmCreationContext, and introduce a new thing that performs a similar role for SqlAstCreationContext. The reason here is twofold: - it is part of my long struggle to decouple query parsing/typing from the SessionFactory, in order to make HibernateProcessor less of a hack and I guess more robust - SessionFactoryImplementor was already starting to be polluted with weird little operations that didn't belong there. That will only get worse with time.

...e/src/main/java/org/hibernate/dialect/function/AggregateWindowEmulationQueryTransformer.java

 				false,
 				true,
-				factory
+				converter.getCreationContext().getSessionFactory()


...te-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java

-					.buildSelectTranslator( converter.getCreationContext().getSessionFactory(), new SelectStatement( fakeQuery ) );
+			final SqlAstTranslator<JdbcOperationQuerySelect> translator =
+					creationContext.getDialect().getSqlAstTranslatorFactory()
+							.buildSelectTranslator( creationContext.getSessionFactory(), new SelectStatement( fakeQuery ) );


...te-core/src/main/java/org/hibernate/persister/entity/ExplicitSqlStringGenerationContext.java

-		final JdbcEnvironment jdbcEnvironment = factory.getJdbcServices().getJdbcEnvironment();
 		//noinspection deprecation
-		return jdbcEnvironment.getQualifiedObjectNameFormatter();
+		return getJdbcEnvironment().getQualifiedObjectNameFormatter();


...ore/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java

 				canUseInnerJoins,
-				getFunctionRenderer().rendersIdentifierVariable( arguments, walker.getCreationContext().getSessionFactory() ),
+				getFunctionRenderer()
+						.rendersIdentifierVariable( arguments, walker.getCreationContext().getSessionFactory() ),


hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentsValidator.java

 	 */
-	default void validate(List<? extends SqmTypedNode<?>> arguments, String functionName, TypeConfiguration typeConfiguration) {}
+	default void validate(List<? extends SqmTypedNode<?>> arguments, String functionName, BindingContext bindingContext) {
+		validate( arguments, functionName, bindingContext.getTypeConfiguration() );


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

-		final SessionFactoryImplementor sessionFactory = creationContext.getSessionFactory();
-		final QueryEngine queryEngine = sessionFactory.getQueryEngine();
-		return queryEngine.getSqmFunctionRegistry().findFunctionDescriptor( "coalesce" )
+		final QueryEngine queryEngine = creationContext.getSessionFactory().getQueryEngine();


hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationContext.java

+	}
+
+	default WrapperOptions getWrapperOptions() {
+		return getSessionFactory().getWrapperOptions();


hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationState.java

 	LoadQueryInfluencers getLoadQueryInfluencers();

+	default SqmCreationContext getSqmCreationContext() {
+		return getCreationContext().getSessionFactory().getQueryEngine().getCriteriaBuilder();


hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationContext.java

+	 * Obtain the {@link SqmFunctionRegistry}.
+	 */
+	default SqmFunctionRegistry getSqmFunctionRegistry() {
+		return getSessionFactory().getQueryEngine().getSqmFunctionRegistry();


hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationContext.java

+	 * Obtain the {@link Dialect}.
+	 */
+	default Dialect getDialect() {
+		return getSessionFactory().getQueryEngine().getDialect();


to show how it's used

gavinking changed the title ~~get rid of inheritance of SessionFactoryImplementor from query creation context stuff~~ HHH-19010 get rid of inheritance of SessionFactoryImplementor from query creation context stuff Jan 5, 2025

gavinking force-pushed the HHH-19008-2 branch from a86f5ce to aea3b18 Compare January 5, 2025 12:16

gavinking force-pushed the HHH-19008-2 branch from 1e81032 to 3491101 Compare January 5, 2025 14:41

github-advanced-security bot found potential problems Jan 5, 2025

View reviewed changes

move management of fetch profiles to the SqlTranslationEngine

6eacabb

gavinking force-pushed the HHH-19008-2 branch from d05d7a1 to abe70b5 Compare January 5, 2025 15:31

fix up the Javadoc for SessionFactoryImplementor

e1df901

gavinking force-pushed the HHH-19008-2 branch from abe70b5 to e1df901 Compare January 5, 2025 15:32

github-advanced-security bot found potential problems Jan 5, 2025

View reviewed changes

gavinking added 2 commits January 5, 2025 17:30

misc minor changes

91785f4

add some @sees to BindingContext

f93d821

to show how it's used

gavinking merged commit da8a13b into hibernate:main Jan 5, 2025
24 of 25 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

HHH-19010 get rid of inheritance of SessionFactoryImplementor from query creation context stuff #9565

HHH-19010 get rid of inheritance of SessionFactoryImplementor from query creation context stuff #9565

Uh oh!

gavinking commented Jan 5, 2025 •

edited by hibernate-github-bot bot

Loading

Uh oh!

hibernate-github-bot bot commented Jan 5, 2025 •

edited

Loading

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Uh oh!

Uh oh!

Check notice

Check notice

Check notice

Check notice

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

HHH-19010 get rid of inheritance of SessionFactoryImplementor from query creation context stuff #9565

HHH-19010 get rid of inheritance of SessionFactoryImplementor from query creation context stuff #9565

Uh oh!

Conversation

gavinking commented Jan 5, 2025 • edited by hibernate-github-bot bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hibernate-github-bot bot commented Jan 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Check notice

Uh oh!

Check notice

Uh oh!

Check notice

Uh oh!

Check notice

Uh oh!

Check notice

Uh oh!

Check notice

Uh oh!

Uh oh!

Uh oh!

Check notice

Uh oh!

Check notice

Uh oh!

Check notice

Uh oh!

Check notice

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

gavinking commented Jan 5, 2025 •

edited by hibernate-github-bot bot

Loading

hibernate-github-bot bot commented Jan 5, 2025 •

edited

Loading