Replace recursion in QueryRenderer.isSubquery(…) with loop.

Signed-off-by: KNU-K <[email protected]>
Closes #4025

Author: polyglot-k

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/EqlQueryRenderer.java

@@ -32,6 +32,7 @@
 /**
  * An ANTLR {@link org.antlr.v4.runtime.tree.ParseTreeVisitor} that renders an EQL query without making any changes.
  *
+ * @author TaeHyun Kang(polyglot-k)
  * @author Greg Turnquist
  * @author Christoph Strobl
  * @author Mark Paluch
@@ -47,15 +48,16 @@ class EqlQueryRenderer extends EqlBaseVisitor<QueryTokenStream> {
 	 */
 	static boolean isSubquery(ParserRuleContext ctx) {
 
-		if (ctx instanceof EqlParser.SubqueryContext) {
-			return true;
-		} else if (ctx instanceof EqlParser.Update_statementContext) {
-			return false;
-		} else if (ctx instanceof EqlParser.Delete_statementContext) {
-			return false;
-		} else {
-			return ctx.getParent() != null && isSubquery(ctx.getParent());
+		while (ctx != null) {
+			if (ctx instanceof EqlParser.SubqueryContext) {
+				return true;
+			}
+			if (ctx instanceof EqlParser.Update_statementContext || ctx instanceof EqlParser.Delete_statementContext) {
+				return false;
+			}
+			ctx = ctx.getParent();
 		}
+		return false;
 	}
 
 	/**
@@ -65,11 +67,13 @@ static boolean isSubquery(ParserRuleContext ctx) {
 	 */
 	static boolean isSetQuery(ParserRuleContext ctx) {
 
-		if (ctx instanceof EqlParser.Set_fuctionContext) {
-			return true;
+		while (ctx != null) {
+			if (ctx instanceof EqlParser.Set_fuctionContext) {
+				return true;
+			}
+			ctx = ctx.getParent();
 		}
-
-		return ctx.getParent() != null && isSetQuery(ctx.getParent());
+		return false;
 	}
 
 	@Override

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java

@@ -32,6 +32,7 @@
 /**
  * An ANTLR {@link org.antlr.v4.runtime.tree.ParseTreeVisitor} that renders an HQL query without making any changes.
  *
+ * @author TaeHyun Kang(polyglot-k)
  * @author Greg Turnquist
  * @author Christoph Strobl
  * @author Oscar Fanchin
@@ -48,19 +49,20 @@ class HqlQueryRenderer extends HqlBaseVisitor<QueryTokenStream> {
 	 */
 	static boolean isSubquery(ParserRuleContext ctx) {
 
-		if (ctx instanceof HqlParser.SubqueryContext || ctx instanceof HqlParser.CteContext) {
-			return true;
-		} else if (ctx instanceof HqlParser.SelectStatementContext) {
-			return false;
-		} else if (ctx instanceof HqlParser.InsertStatementContext) {
-			return false;
-		} else if (ctx instanceof HqlParser.DeleteStatementContext) {
-			return false;
-		} else if (ctx instanceof HqlParser.UpdateStatementContext) {
-			return false;
-		} else {
-			return ctx.getParent() != null && isSubquery(ctx.getParent());
+		while (ctx != null) {
+			if (ctx instanceof HqlParser.SubqueryContext || ctx instanceof HqlParser.CteContext) {
+				return true;
+			}
+			if (ctx instanceof HqlParser.SelectStatementContext ||
+					ctx instanceof HqlParser.InsertStatementContext ||
+					ctx instanceof HqlParser.DeleteStatementContext ||
+					ctx instanceof HqlParser.UpdateStatementContext
+			) {
+				return false;
+			}
+			ctx = ctx.getParent();
 		}
+		return false;
 	}
 
 	/**
@@ -70,14 +72,16 @@ static boolean isSubquery(ParserRuleContext ctx) {
 	 */
 	static boolean isSetQuery(ParserRuleContext ctx) {
 
-		if (ctx instanceof HqlParser.OrderedQueryContext
-				&& ctx.getParent() instanceof HqlParser.QueryExpressionContext qec) {
-			if (qec.orderedQuery().indexOf(ctx) != 0) {
-				return true;
+		while (ctx != null) {
+			ParserRuleContext parent = ctx.getParent();
+			if (ctx instanceof HqlParser.OrderedQueryContext && parent instanceof HqlParser.QueryExpressionContext qec) {
+				if (qec.orderedQuery().indexOf(ctx) != 0) {
+					return true;
+				}
 			}
+			ctx = parent;
 		}
-
-		return ctx.getParent() != null && isSetQuery(ctx.getParent());
+		return false;
 	}
 
 	@Override

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpqlQueryRenderer.java

@@ -32,6 +32,7 @@
 /**
  * An ANTLR {@link org.antlr.v4.runtime.tree.ParseTreeVisitor} that renders a JPQL query without making any changes.
  *
+ * @author TaeHyun Kang(polyglot-k)
  * @author Greg Turnquist
  * @author Christoph Strobl
  * @author Mark Paluch
@@ -47,15 +48,16 @@ class JpqlQueryRenderer extends JpqlBaseVisitor<QueryTokenStream> {
 	 */
 	static boolean isSubquery(ParserRuleContext ctx) {
 
-		if (ctx instanceof JpqlParser.SubqueryContext) {
-			return true;
-		} else if (ctx instanceof JpqlParser.Update_statementContext) {
-			return false;
-		} else if (ctx instanceof JpqlParser.Delete_statementContext) {
-			return false;
-		} else {
-			return ctx.getParent() != null && isSubquery(ctx.getParent());
+		while (ctx != null) {
+			if (ctx instanceof JpqlParser.SubqueryContext) {
+				return true;
+			}
+			if (ctx instanceof JpqlParser.Update_statementContext || ctx instanceof JpqlParser.Delete_statementContext) {
+				return false;
+			}
+			ctx = ctx.getParent();
 		}
+		return false;
 	}
 
 	/**
@@ -65,11 +67,13 @@ static boolean isSubquery(ParserRuleContext ctx) {
 	 */
 	static boolean isSetQuery(ParserRuleContext ctx) {
 
-		if (ctx instanceof JpqlParser.Set_fuctionContext) {
-			return true;
+		while (ctx != null) {
+			if (ctx instanceof JpqlParser.Set_fuctionContext) {
+				return true;
+			}
+			ctx = ctx.getParent();
 		}
-
-		return ctx.getParent() != null && isSetQuery(ctx.getParent());
+		return false;
 	}
 
 	@Override