fix NPE when ordered set agg function missing 'within group'

- also refactor a bit that code in SQB to be more typesafe - and get rid of some warnings
hibernate · May 28, 2023 · 36bdd9d · 36bdd9d
1 parent a6f036d
commit 36bdd9d
Show file tree

Hide file tree

Showing 8 changed files with 221 additions and 288 deletions.
diff --git a/hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4 b/hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4
@@ -1154,7 +1154,7 @@ listaggFunction
  * A 'on overflow' clause: what to do when the text data type used for 'listagg' overflows
  */
 onOverflowClause
-	: ON OVERFLOW (ERROR | (TRUNCATE expression? (WITH|WITHOUT) COUNT))
+	: ON OVERFLOW (ERROR | TRUNCATE expression? (WITH|WITHOUT) COUNT)
 	;
 
 /**

diff --git a/...ate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java b/...ate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java
@@ -14,7 +14,6 @@
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression;
 import org.hibernate.query.sqm.function.SelfRenderingOrderedSetAggregateFunctionSqlAstExpression;
-import org.hibernate.query.sqm.function.SelfRenderingSqmAggregateFunction;
 import org.hibernate.query.sqm.function.SelfRenderingSqmOrderedSetAggregateFunction;
 import org.hibernate.query.sqm.produce.function.ArgumentsValidator;
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java
@@ -10,9 +10,10 @@
 import java.util.List;
 
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
+import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
-import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.query.ReturnableType;
+import org.hibernate.query.SemanticException;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
 import org.hibernate.query.sqm.function.FunctionKind;
@@ -129,13 +130,12 @@ public void render(
 
 	protected class SelfRenderingInverseDistributionFunction<T> extends SelfRenderingSqmOrderedSetAggregateFunction<T> {
 
-		private final SqmOrderByClause withinGroupClause;
-
 		public SelfRenderingInverseDistributionFunction(
 				List<? extends SqmTypedNode<?>> arguments,
 				SqmPredicate filter,
 				SqmOrderByClause withinGroupClause,
-				ReturnableType<T> impliedResultType, QueryEngine queryEngine) {
+				ReturnableType<T> impliedResultType,
+				QueryEngine queryEngine) {
 			super(
 					InverseDistributionFunction.this,
 					InverseDistributionFunction.this,
@@ -148,13 +148,18 @@ public SelfRenderingInverseDistributionFunction(
 					queryEngine.getCriteriaBuilder(),
 					InverseDistributionFunction.this.getName()
 			);
-			this.withinGroupClause = withinGroupClause;
+			if ( withinGroupClause == null ) {
+				throw new SemanticException("Inverse distribution function '" + getFunctionName()
+						+ "' must specify WITHIN GROUP");
+			}
 		}
 
 		@Override
 		protected ReturnableType<?> resolveResultType(TypeConfiguration typeConfiguration) {
-			return (ReturnableType<?>) withinGroupClause.getSortSpecifications().get( 0 ).getSortExpression()
-						.getExpressible();
+			return (ReturnableType<?>)
+					getWithinGroup().getSortSpecifications().get( 0 )
+							.getSortExpression()
+							.getExpressible();
 		}
 
 		@Override
@@ -171,21 +176,23 @@ protected MappingModelExpressible<?> getMappingModelExpressible(
 				// here we have something that is not a BasicType,
 				// and we have no way to get a BasicValuedMapping
 				// from it directly
-				final Expression expression = (Expression) withinGroupClause.getSortSpecifications().get( 0 )
-						.getSortExpression()
-						.accept( walker );
-				if ( expression.getExpressionType() instanceof BasicValuedMapping ) {
-					return (BasicValuedMapping) expression.getExpressionType();
+				final Expression expression = (Expression)
+						getWithinGroup().getSortSpecifications().get( 0 )
+								.getSortExpression()
+								.accept( walker );
+				final JdbcMappingContainer expressionType = expression.getExpressionType();
+				if ( expressionType instanceof BasicValuedMapping ) {
+					return (BasicValuedMapping) expressionType;
 				}
 				try {
-					final MappingMetamodelImplementor domainModel = walker.getCreationContext()
+					return walker.getCreationContext()
 							.getSessionFactory()
 							.getRuntimeMetamodels()
-							.getMappingMetamodel();
-					return domainModel.resolveMappingExpressible(
-							getNodeType(),
-							walker.getFromClauseAccess()::getTableGroup
-					);
+							.getMappingMetamodel()
+							.resolveMappingExpressible(
+									getNodeType(),
+									walker.getFromClauseAccess()::getTableGroup
+							);
 				}
 				catch (Exception e) {
 					return null; // this works at least approximately

diff --git a/...core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java b/...core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java
@@ -14,7 +14,6 @@
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression;
 import org.hibernate.query.sqm.function.SelfRenderingOrderedSetAggregateFunctionSqlAstExpression;
-import org.hibernate.query.sqm.function.SelfRenderingSqmAggregateFunction;
 import org.hibernate.query.sqm.function.SelfRenderingSqmOrderedSetAggregateFunction;
 import org.hibernate.query.sqm.produce.function.ArgumentsValidator;
 import org.hibernate.query.sqm.produce.function.FunctionParameterType;