[6.6] HHH-19240 Reduce allocation rate of HQL parser

ci/quarkus.Jenkinsfile

@@ -46,7 +46,7 @@ pipeline {
 						}
 					}
 					dir('quarkus') {
-						sh "git clone -b 3.15 --single-branch https://github.com/quarkusio/quarkus.git . || git reset --hard && git clean -fx && git pull"
+						sh "git clone -b remove-dead-code-3.20 --single-branch https://github.com/yrodiere/quarkus.git . || git reset --hard && git clean -fx && git pull"
         				script {
 							def sedStatus = sh (script: "sed -i 's@<hibernate-orm.version>.*</hibernate-orm.version>@<hibernate-orm.version>${env.HIBERNATE_VERSION}</hibernate-orm.version>@' pom.xml", returnStatus: true)
 							if ( sedStatus != 0 ) {

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

@@ -159,8 +159,7 @@ cycleClause
  * A toplevel query of subquery, which may be a union or intersection of subqueries
  */
 queryExpression
-	: withClause? orderedQuery								# SimpleQueryGroup
-	| withClause? orderedQuery (setOperator orderedQuery)+	# SetQueryGroup
+	: withClause? orderedQuery (setOperator orderedQuery)*
 	;
 
 /**
@@ -430,19 +429,13 @@ pathContinuation
  *		* VALUE( path )
  * 		* KEY( path )
  * 		* path[ selector ]
- * 		* ARRAY_GET( embeddableArrayPath, index ).path
- * 		* COALESCE( array1, array2 )[ selector ].path
  */
 syntacticDomainPath
 	: treatedNavigablePath
 	| collectionValueNavigablePath
 	| mapKeyNavigablePath
 	| simplePath indexedPathAccessFragment
 	| simplePath slicedPathAccessFragment
-	| toOneFkReference
-	| function pathContinuation
-	| function indexedPathAccessFragment pathContinuation?
-	| function slicedPathAccessFragment
 	;
 
 /**
@@ -664,19 +657,21 @@ whereClause
 predicate
 	//highest to lowest precedence
 	: LEFT_PAREN predicate RIGHT_PAREN											# GroupedPredicate
-	| expression IS NOT? NULL													# IsNullPredicate
-	| expression IS NOT? EMPTY													# IsEmptyPredicate
-	| expression IS NOT? TRUE													# IsTruePredicate
-	| expression IS NOT? FALSE													# IsFalsePredicate
-	| expression IS NOT? DISTINCT FROM expression								# IsDistinctFromPredicate
+	| expression IS NOT? (NULL|EMPTY|TRUE|FALSE)								# UnaryIsPredicate
 	| expression NOT? MEMBER OF? path											# MemberOfPredicate
 	| expression NOT? IN inList													# InPredicate
 	| expression NOT? BETWEEN expression AND expression							# BetweenPredicate
 	| expression NOT? (LIKE | ILIKE) expression likeEscape?						# LikePredicate
-	| expression NOT? CONTAINS expression										# ContainsPredicate
-	| expression NOT? INCLUDES expression										# IncludesPredicate
-	| expression NOT? INTERSECTS expression										# IntersectsPredicate
-	| expression comparisonOperator expression									# ComparisonPredicate
+	| expression
+	    ( NOT? (CONTAINS | INCLUDES | INTERSECTS)
+	    | IS NOT? DISTINCT FROM
+	    | EQUAL
+        | NOT_EQUAL
+        | GREATER
+        | GREATER_EQUAL
+        | LESS
+        | LESS_EQUAL
+	    ) expression  			                                                # BinaryExpressionPredicate
 	| EXISTS collectionQuantifier LEFT_PAREN simplePath RIGHT_PAREN				# ExistsCollectionPartPredicate
 	| EXISTS expression															# ExistsPredicate
 	| NOT predicate																# NegatedPredicate
@@ -685,18 +680,6 @@ predicate
 	| expression																# BooleanExpressionPredicate
 	;
 
-/**
- * An operator which compares values for equality or order
- */
-comparisonOperator
-	: EQUAL
-	| NOT_EQUAL
-	| GREATER
-	| GREATER_EQUAL
-	| LESS
-	| LESS_EQUAL
-	;
-
 /**
  * Any right operand of the 'in' operator
  *
@@ -751,7 +734,14 @@ primaryExpression
 	| entityVersionReference							# EntityVersionExpression
 	| entityNaturalIdReference							# EntityNaturalIdExpression
 	| syntacticDomainPath pathContinuation?				# SyntacticPathExpression
-	| function											# FunctionExpression
+ // ARRAY_GET( embeddableArrayPath, index ).path
+ // COALESCE( array1, array2 )[ selector ].path
+ // COALESCE( array1, array2 )[ start : end ]
+	| function (
+          pathContinuation
+        | slicedPathAccessFragment
+        | indexedPathAccessFragment pathContinuation?
+        )?											    # FunctionExpression
 	| generalPathFragment								# GeneralPathExpression
 	;
 
@@ -1109,6 +1099,7 @@ function
 	| collectionFunctionMisuse
 	| jpaNonstandardFunction
 	| columnFunction
+	| toOneFkReference
 	| genericFunction
 	;
 

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java

@@ -75,8 +75,13 @@ private static OrderingParser.OrderByFragmentContext buildParseTree(TranslationC
 			return parser.orderByFragment();
 		}
 		catch (ParseCancellationException e) {
+			// When resetting the parser, its CommonTokenStream will seek(0) i.e. restart emitting buffered tokens.
+			// This is enough when reusing the lexer and parser, and it would be wrong to also reset the lexer.
+			// Resetting the lexer causes it to hand out tokens again from the start, which will then append to the
+			// CommonTokenStream and cause a wrong parse
+			// lexer.reset();
+
 			// reset the input token stream and parser state
-			lexer.reset();
 			parser.reset();
 
 			// fall back to LL(k)-based parsing