Skip to content

Commit 2780d76

Browse files
beikovbeikov
committed
Introduce QueryTransformer for functions
1 parent c2ee076 commit 2780d76

16 files changed

+180
-44
lines changed

‎hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import org.hibernate.query.sqm.tree.predicate.SqmPredicate;
2222
import org.hibernate.query.sqm.tree.select.SqmSelectableNode;
2323
import org.hibernate.sql.ast.tree.SqlAstNode;
24+
import org.hibernate.sql.ast.tree.expression.Expression;
25+
import org.hibernate.sql.ast.tree.predicate.Predicate;
2426

2527
/**
2628
* @author Christian Beikov
@@ -73,7 +75,7 @@ public SelfRenderingSqmAggregateFunction<T> copy(SqmCopyContext context) {
7375
}
7476

7577
@Override
76-
public SelfRenderingFunctionSqlAstExpression convertToSqlAst(SqmToSqlAstConverter walker) {
78+
public Expression convertToSqlAst(SqmToSqlAstConverter walker) {
7779
final ReturnableType<?> resultType = resolveResultType(
7880
walker.getCreationContext().getMappingMetamodel().getTypeConfiguration()
7981
);

‎hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.hibernate.query.sqm.tree.SqmVisitableNode;
2424
import org.hibernate.query.sqm.tree.expression.SqmFunction;
2525
import org.hibernate.sql.ast.tree.SqlAstNode;
26+
import org.hibernate.sql.ast.tree.expression.Expression;
2627
import org.hibernate.type.spi.TypeConfiguration;
2728

2829
import static java.util.Collections.emptyList;
@@ -109,7 +110,7 @@ protected static List<SqlAstNode> resolveSqlAstArguments(List<? extends SqmTyped
109110
}
110111

111112
@Override
112-
public SelfRenderingFunctionSqlAstExpression convertToSqlAst(SqmToSqlAstConverter walker) {
113+
public Expression convertToSqlAst(SqmToSqlAstConverter walker) {
113114
final ReturnableType<?> resultType = resolveResultType(
114115
walker.getCreationContext().getMappingMetamodel().getTypeConfiguration()
115116
);

‎hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.hibernate.query.sqm.tree.select.SqmSortSpecification;
2626
import org.hibernate.sql.ast.Clause;
2727
import org.hibernate.sql.ast.tree.SqlAstNode;
28+
import org.hibernate.sql.ast.tree.expression.Expression;
2829
import org.hibernate.sql.ast.tree.predicate.Predicate;
2930
import org.hibernate.sql.ast.tree.select.SortSpecification;
3031

@@ -91,7 +92,7 @@ public SelfRenderingSqmOrderedSetAggregateFunction<T> copy(SqmCopyContext contex
9192
}
9293

9394
@Override
94-
public SelfRenderingFunctionSqlAstExpression convertToSqlAst(SqmToSqlAstConverter walker) {
95+
public Expression convertToSqlAst(SqmToSqlAstConverter walker) {
9596
final ReturnableType<?> resultType = resolveResultType(
9697
walker.getCreationContext().getMappingMetamodel().getTypeConfiguration()
9798
);

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

Lines changed: 79 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -95,28 +95,28 @@
9595
import org.hibernate.persister.entity.EntityPersister;
9696
import org.hibernate.persister.entity.Joinable;
9797
import org.hibernate.persister.entity.SingleTableEntityPersister;
98-
import org.hibernate.query.sqm.BinaryArithmeticOperator;
9998
import org.hibernate.query.BindableType;
100-
import org.hibernate.query.sqm.CastType;
101-
import org.hibernate.query.sqm.ComparisonOperator;
102-
import org.hibernate.query.sqm.DynamicInstantiationNature;
103-
import org.hibernate.query.sqm.FetchClauseType;
104-
import org.hibernate.query.spi.NavigablePath;
10599
import org.hibernate.query.QueryLogging;
106100
import org.hibernate.query.ReturnableType;
107101
import org.hibernate.query.SemanticException;
108-
import org.hibernate.query.sqm.SortOrder;
109-
import org.hibernate.query.sqm.TemporalUnit;
110-
import org.hibernate.query.sqm.UnaryArithmeticOperator;
111102
import org.hibernate.query.criteria.JpaPath;
103+
import org.hibernate.query.spi.NavigablePath;
112104
import org.hibernate.query.spi.QueryOptions;
113105
import org.hibernate.query.spi.QueryParameterBinding;
114106
import org.hibernate.query.spi.QueryParameterBindings;
115107
import org.hibernate.query.spi.QueryParameterImplementor;
108+
import org.hibernate.query.sqm.BinaryArithmeticOperator;
109+
import org.hibernate.query.sqm.CastType;
110+
import org.hibernate.query.sqm.ComparisonOperator;
111+
import org.hibernate.query.sqm.DynamicInstantiationNature;
112+
import org.hibernate.query.sqm.FetchClauseType;
116113
import org.hibernate.query.sqm.InterpretationException;
114+
import org.hibernate.query.sqm.SortOrder;
117115
import org.hibernate.query.sqm.SqmExpressible;
118116
import org.hibernate.query.sqm.SqmPathSource;
119117
import org.hibernate.query.sqm.SqmQuerySource;
118+
import org.hibernate.query.sqm.TemporalUnit;
119+
import org.hibernate.query.sqm.UnaryArithmeticOperator;
120120
import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
121121
import org.hibernate.query.sqm.function.SelfRenderingAggregateFunctionSqlAstExpression;
122122
import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression;
@@ -262,6 +262,7 @@
262262
import org.hibernate.sql.ast.tree.SqlAstNode;
263263
import org.hibernate.sql.ast.tree.Statement;
264264
import org.hibernate.sql.ast.tree.cte.CteColumn;
265+
import org.hibernate.sql.ast.tree.cte.CteContainer;
265266
import org.hibernate.sql.ast.tree.cte.CteStatement;
266267
import org.hibernate.sql.ast.tree.cte.CteTable;
267268
import org.hibernate.sql.ast.tree.cte.SearchClauseSpecification;
@@ -288,6 +289,7 @@
288289
import org.hibernate.sql.ast.tree.expression.Over;
289290
import org.hibernate.sql.ast.tree.expression.Overflow;
290291
import org.hibernate.sql.ast.tree.expression.QueryLiteral;
292+
import org.hibernate.sql.ast.tree.expression.QueryTransformer;
291293
import org.hibernate.sql.ast.tree.expression.SelfRenderingExpression;
292294
import org.hibernate.sql.ast.tree.expression.SelfRenderingSqlFragmentExpression;
293295
import org.hibernate.sql.ast.tree.expression.SqlSelectionExpression;
@@ -385,6 +387,7 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
385387
private final SqlAstCreationContext creationContext;
386388
private final boolean jpaQueryComplianceEnabled;
387389
private final SqmStatement<?> statement;
390+
private final CteContainer cteContainer = new GlobalCteContainer();
388391

389392
private final QueryOptions queryOptions;
390393
private final LoadQueryInfluencers loadQueryInfluencers;
@@ -430,6 +433,7 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
430433
private final Stack<Supplier<MappingModelExpressible<?>>> inferrableTypeAccessStack = new StandardStack<>(
431434
() -> null
432435
);
436+
private final Stack<List<QueryTransformer>> queryTransformers = new StandardStack<>();
433437
private boolean inTypeInference;
434438

435439
private SqmByUnit appliedByUnit;
@@ -659,7 +663,7 @@ public Statement visitStatement(SqmStatement<?> sqmStatement) {
659663

660664
@Override
661665
public UpdateStatement visitUpdateStatement(SqmUpdateStatement<?> sqmStatement) {
662-
Map<String, CteStatement> cteStatements = this.visitCteContainer( sqmStatement );
666+
final CteContainer cteContainer = this.visitCteContainer( sqmStatement );
663667

664668
final SqmRoot<?> sqmTarget = sqmStatement.getTarget();
665669
final String entityName = sqmTarget.getEntityName();
@@ -719,7 +723,7 @@ public UpdateStatement visitUpdateStatement(SqmUpdateStatement<?> sqmStatement)
719723
}
720724

721725
return new UpdateStatement(
722-
sqmStatement.isWithRecursive(), cteStatements,
726+
cteContainer,
723727
(NamedTableReference) rootTableGroup.getPrimaryTableReference(),
724728
assignments,
725729
SqlAstTreeHelper.combinePredicates( suppliedPredicate, additionalRestrictions ),
@@ -897,7 +901,7 @@ public Expression resolveSqlExpression(
897901

898902
@Override
899903
public DeleteStatement visitDeleteStatement(SqmDeleteStatement<?> statement) {
900-
Map<String, CteStatement> cteStatements = this.visitCteContainer( statement );
904+
final CteContainer cteContainer = this.visitCteContainer( statement );
901905

902906
final String entityName = statement.getTarget().getEntityName();
903907
final EntityPersister entityDescriptor = creationContext.getSessionFactory()
@@ -947,8 +951,7 @@ public DeleteStatement visitDeleteStatement(SqmDeleteStatement<?> statement) {
947951
}
948952

949953
return new DeleteStatement(
950-
statement.isWithRecursive(),
951-
cteStatements,
954+
cteContainer,
952955
(NamedTableReference) rootTableGroup.getPrimaryTableReference(),
953956
SqlAstTreeHelper.combinePredicates( suppliedPredicate, additionalRestrictions ),
954957
Collections.emptyList()
@@ -964,7 +967,7 @@ public DeleteStatement visitDeleteStatement(SqmDeleteStatement<?> statement) {
964967

965968
@Override
966969
public InsertStatement visitInsertSelectStatement(SqmInsertSelectStatement<?> sqmStatement) {
967-
Map<String, CteStatement> cteStatements = this.visitCteContainer( sqmStatement );
970+
final CteContainer cteContainer = this.visitCteContainer( sqmStatement );
968971

969972
final String entityName = sqmStatement.getTarget().getEntityName();
970973
final EntityPersister entityDescriptor = creationContext.getSessionFactory()
@@ -1005,8 +1008,7 @@ public InsertStatement visitInsertSelectStatement(SqmInsertSelectStatement<?> sq
10051008
getFromClauseAccess().registerTableGroup( rootPath, rootTableGroup );
10061009

10071010
insertStatement = new InsertStatement(
1008-
sqmStatement.isWithRecursive(),
1009-
cteStatements,
1011+
cteContainer,
10101012
(NamedTableReference) rootTableGroup.getPrimaryTableReference(),
10111013
Collections.emptyList()
10121014
);
@@ -1051,7 +1053,7 @@ public InsertStatement visitInsertSelectStatement(SqmInsertSelectStatement<?> sq
10511053

10521054
@Override
10531055
public InsertStatement visitInsertValuesStatement(SqmInsertValuesStatement<?> sqmStatement) {
1054-
Map<String, CteStatement> cteStatements = this.visitCteContainer( sqmStatement );
1056+
final CteContainer cteContainer = this.visitCteContainer( sqmStatement );
10551057
final String entityName = sqmStatement.getTarget().getEntityName();
10561058
final EntityPersister entityDescriptor = creationContext.getSessionFactory()
10571059
.getRuntimeMetamodels()
@@ -1087,8 +1089,7 @@ public InsertStatement visitInsertValuesStatement(SqmInsertValuesStatement<?> sq
10871089
getFromClauseAccess().registerTableGroup( rootPath, rootTableGroup );
10881090

10891091
final InsertStatement insertStatement = new InsertStatement(
1090-
sqmStatement.isWithRecursive(),
1091-
cteStatements,
1092+
cteContainer,
10921093
(NamedTableReference) rootTableGroup.getPrimaryTableReference(),
10931094
Collections.emptyList()
10941095
);
@@ -1371,10 +1372,10 @@ public Values visitValues(SqmValues sqmValues) {
13711372

13721373
@Override
13731374
public SelectStatement visitSelectStatement(SqmSelectStatement<?> statement) {
1374-
Map<String, CteStatement> cteStatements = this.visitCteContainer( statement );
1375+
final CteContainer cteContainer = this.visitCteContainer( statement );
13751376
final QueryPart queryPart = visitQueryPart( statement.getQueryPart() );
13761377
final List<DomainResult<?>> domainResults = queryPart.isRoot() ? this.domainResults : Collections.emptyList();
1377-
return new SelectStatement( statement.isWithRecursive(), cteStatements, queryPart, domainResults );
1378+
return new SelectStatement( cteContainer, queryPart, domainResults );
13781379
}
13791380

13801381
@Override
@@ -1560,14 +1561,15 @@ public static CteTable createCteTable(
15601561
}
15611562

15621563
@Override
1563-
public Map<String, CteStatement> visitCteContainer(SqmCteContainer consumer) {
1564+
public CteContainer visitCteContainer(SqmCteContainer consumer) {
15641565
final Collection<SqmCteStatement<?>> sqmCteStatements = consumer.getCteStatements();
1565-
final Map<String, CteStatement> cteStatements = new LinkedHashMap<>( sqmCteStatements.size() );
1566+
if ( consumer.isWithRecursive() ) {
1567+
cteContainer.setWithRecursive( true );
1568+
}
15661569
for ( SqmCteStatement<?> sqmCteStatement : sqmCteStatements ) {
1567-
final CteStatement cteStatement = visitCteStatement( sqmCteStatement );
1568-
cteStatements.put( cteStatement.getCteTable().getTableExpression(), cteStatement );
1570+
cteContainer.addCteStatement( visitCteStatement( sqmCteStatement ) );
15691571
}
1570-
return cteStatements;
1572+
return cteContainer;
15711573
}
15721574

15731575
private boolean trackSelectionsForGroup;
@@ -1688,6 +1690,7 @@ else if ( sqmQuerySpec.hasPositionalGroupItem() ) {
16881690
// In sub-queries, we can never deduplicate the selection items as that might change semantics
16891691
deduplicateSelectionItems = false;
16901692
pushProcessingState( processingState );
1693+
queryTransformers.push( new ArrayList<>() );
16911694

16921695
try {
16931696
// we want to visit the from-clause first
@@ -1721,14 +1724,23 @@ else if ( sqmQuerySpec.hasPositionalGroupItem() ) {
17211724
applyCollectionFilterPredicates( sqlQuerySpec );
17221725
}
17231726

1724-
return sqlQuerySpec;
1727+
QuerySpec finalQuerySpec = sqlQuerySpec;
1728+
for ( QueryTransformer transformer : queryTransformers.getCurrent() ) {
1729+
finalQuerySpec = transformer.transform(
1730+
cteContainer,
1731+
finalQuerySpec,
1732+
this
1733+
);
1734+
}
1735+
return finalQuerySpec;
17251736
}
17261737
finally {
17271738
if ( additionalRestrictions != null ) {
17281739
sqlQuerySpec.applyPredicate( additionalRestrictions );
17291740
}
17301741
additionalRestrictions = originalAdditionalRestrictions;
17311742
popProcessingStateStack();
1743+
queryTransformers.pop();
17321744
currentSqmQueryPart = sqmQueryPart;
17331745
deduplicateSelectionItems = originalDeduplicateSelectionItems;
17341746
}
@@ -4738,6 +4750,11 @@ public Expression visitFunction(SqmFunction<?> sqmFunction) {
47384750
}
47394751
}
47404752

4753+
@Override
4754+
public void registerQueryTransformer(QueryTransformer transformer) {
4755+
queryTransformers.getCurrent().add( transformer );
4756+
}
4757+
47414758
@Override
47424759
public Star visitStar(SqmStar sqmStar) {
47434760
return new Star();
@@ -6564,4 +6581,38 @@ private static JdbcMappingContainer highestPrecedence(JdbcMappingContainer type1
65646581

65656582
return type1;
65666583
}
6584+
6585+
private class GlobalCteContainer implements CteContainer {
6586+
private final Map<String, CteStatement> cteStatements;
6587+
private boolean recursive;
6588+
6589+
public GlobalCteContainer() {
6590+
this.cteStatements = new LinkedHashMap<>();
6591+
}
6592+
6593+
@Override
6594+
public boolean isWithRecursive() {
6595+
return recursive;
6596+
}
6597+
6598+
@Override
6599+
public void setWithRecursive(boolean recursive) {
6600+
this.recursive = recursive;
6601+
}
6602+
6603+
@Override
6604+
public Map<String, CteStatement> getCteStatements() {
6605+
return cteStatements;
6606+
}
6607+
6608+
@Override
6609+
public CteStatement getCteStatement(String cteLabel) {
6610+
return cteStatements.get( cteLabel );
6611+
}
6612+
6613+
@Override
6614+
public void addCteStatement(CteStatement cteStatement) {
6615+
cteStatements.put( cteStatement.getCteTable().getTableExpression(), cteStatement );
6616+
}
6617+
}
65676618
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.hibernate.sql.ast.spi.SqlAstProcessingState;
2222
import org.hibernate.sql.ast.spi.SqlExpressionResolver;
2323
import org.hibernate.sql.ast.tree.expression.Expression;
24+
import org.hibernate.sql.ast.tree.expression.QueryTransformer;
2425
import org.hibernate.sql.ast.tree.predicate.Predicate;
2526

2627
/**
@@ -75,6 +76,10 @@ public Stack<Clause> getCurrentClauseStack() {
7576
return null;
7677
}
7778

79+
@Override
80+
public void registerQueryTransformer(QueryTransformer transformer) {
81+
}
82+
7883
@Override
7984
public List<Expression> expandSelfRenderingFunctionMultiValueParameter(SqmParameter<?> sqmParameter) {
8085
return null;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.hibernate.sql.ast.spi.SqlAstCreationState;
1616
import org.hibernate.sql.ast.Clause;
1717
import org.hibernate.sql.ast.tree.expression.Expression;
18+
import org.hibernate.sql.ast.tree.expression.QueryTransformer;
1819
import org.hibernate.sql.ast.tree.predicate.Predicate;
1920

2021
/**
@@ -25,6 +26,8 @@
2526
public interface SqmToSqlAstConverter extends SemanticQueryWalker<Object>, SqlAstCreationState {
2627
Stack<Clause> getCurrentClauseStack();
2728

29+
void registerQueryTransformer(QueryTransformer transformer);
30+
2831
List<Expression> expandSelfRenderingFunctionMultiValueParameter(SqmParameter<?> sqmParameter);
2932

3033
Predicate visitNestedTopLevelPredicate(SqmPredicate predicate);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ protected void visitReturningColumns(MutationStatement mutationStatement) {
13131313
}
13141314

13151315
public void visitCteContainer(CteContainer cteContainer) {
1316-
final Collection<CteStatement> cteStatements = cteContainer.getCteStatements();
1316+
final Collection<CteStatement> cteStatements = cteContainer.getCteStatements().values();
13171317
if ( cteStatements.isEmpty() ) {
13181318
return;
13191319
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,23 +250,23 @@ public void visitOver(Over over) {
250250

251251
@Override
252252
public void visitSelectStatement(SelectStatement statement) {
253-
for ( CteStatement cteStatement : statement.getCteStatements() ) {
253+
for ( CteStatement cteStatement : statement.getCteStatements().values() ) {
254254
cteStatement.getCteDefinition().accept( this );
255255
}
256256
statement.getQueryPart().accept( this );
257257
}
258258

259259
@Override
260260
public void visitDeleteStatement(DeleteStatement statement) {
261-
for ( CteStatement cteStatement : statement.getCteStatements() ) {
261+
for ( CteStatement cteStatement : statement.getCteStatements().values() ) {
262262
cteStatement.getCteDefinition().accept( this );
263263
}
264264
statement.getRestriction().accept( this );
265265
}
266266

267267
@Override
268268
public void visitUpdateStatement(UpdateStatement statement) {
269-
for ( CteStatement cteStatement : statement.getCteStatements() ) {
269+
for ( CteStatement cteStatement : statement.getCteStatements().values() ) {
270270
cteStatement.getCteDefinition().accept( this );
271271
}
272272
for ( Assignment assignment : statement.getAssignments() ) {
@@ -277,7 +277,7 @@ public void visitUpdateStatement(UpdateStatement statement) {
277277

278278
@Override
279279
public void visitInsertStatement(InsertStatement statement) {
280-
for ( CteStatement cteStatement : statement.getCteStatements() ) {
280+
for ( CteStatement cteStatement : statement.getCteStatements().values() ) {
281281
cteStatement.getCteDefinition().accept( this );
282282
}
283283
if ( statement.getSourceSelectStatement() != null ) {

0 commit comments

Comments
 (0)