HHH-19240 Fold IsDistinctFromPredicate into BinaryExpressionPredicate rule

Author: beikov

hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4

@@ -655,13 +655,13 @@ predicate
 	//highest to lowest precedence
 	: LEFT_PAREN predicate RIGHT_PAREN											# GroupedPredicate
 	| expression IS NOT? (NULL|EMPTY|TRUE|FALSE)								# UnaryIsPredicate
-	| expression IS NOT? DISTINCT FROM expression								# IsDistinctFromPredicate
 	| expression NOT? MEMBER OF? path											# MemberOfPredicate
 	| expression NOT? IN inList													# InPredicate
 	| expression NOT? BETWEEN expression AND expression							# BetweenPredicate
 	| expression NOT? (LIKE | ILIKE) REGEXP? expression likeEscape?				# LikePredicate
 	| expression
 	    ( NOT? (CONTAINS | INCLUDES | INTERSECTS)
+	    | IS NOT? DISTINCT FROM
 	    | EQUAL
         | NOT_EQUAL
         | GREATER

hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java

@@ -2464,7 +2464,8 @@ public SqmPredicate visitBinaryExpressionPredicate(HqlParser.BinaryExpressionPre
 			operationSymbol = ((TerminalNode) ctx.getChild( 2 )).getSymbol();
 		}
 		else {
-			negated = false;
+			negated = firstSymbol.getType() == HqlParser.IS
+					&& ((TerminalNode) ctx.getChild( 2 )).getSymbol().getType() == HqlParser.NOT;
 			operationSymbol = firstSymbol;
 		}
 		final var expressions = ctx.expression();
@@ -2547,20 +2548,16 @@ public SqmPredicate visitBinaryExpressionPredicate(HqlParser.BinaryExpressionPre
 					createComparisonPredicate( ComparisonOperator.GREATER_THAN, lhsCtx, rhsCtx );
 			case HqlParser.GREATER_EQUAL ->
 					createComparisonPredicate( ComparisonOperator.GREATER_THAN_OR_EQUAL, lhsCtx, rhsCtx );
+			case HqlParser.IS -> {
+				final ComparisonOperator comparisonOperator = !negated
+						? ComparisonOperator.DISTINCT_FROM
+						: ComparisonOperator.NOT_DISTINCT_FROM;
+				yield createComparisonPredicate( comparisonOperator, lhsCtx, rhsCtx );
+			}
 			default -> throw new AssertionError( "Unknown binary expression predicate: " + operationSymbol );
 		};
 	}
 
-	@Override
-	public SqmPredicate visitIsDistinctFromPredicate(HqlParser.IsDistinctFromPredicateContext ctx) {
-		final var leftExpressionContext = ctx.expression( 0 );
-		final var rightExpressionContext = ctx.expression( 1 );
-		final ComparisonOperator comparisonOperator = ctx.NOT() == null
-				? ComparisonOperator.DISTINCT_FROM
-				: ComparisonOperator.NOT_DISTINCT_FROM;
-		return createComparisonPredicate( comparisonOperator, leftExpressionContext, rightExpressionContext );
-	}
-
 	private SqmComparisonPredicate createComparisonPredicate(
 			ComparisonOperator comparisonOperator,
 			HqlParser.ExpressionContext leftExpressionContext,