GH-5691 CLI for running and storing query explanations

Author: hmottestad

core/queryrender/src/main/java/org/eclipse/rdf4j/queryrender/sparql/TupleExprToIrConverter.java

@@ -923,7 +923,8 @@ private static Normalized normalize(final TupleExpr root, final boolean peelScop
 			// Keep BIND chains inside WHERE: stop peeling when we hit the first nested Extension, otherwise peel and
 			// remember bindings for reinsertion later.
 			if (cur instanceof Extension) {
-				if (((Extension) cur).getArg() instanceof Extension) {
+				if (((Extension) cur).getArg() instanceof Extension
+						&& !extensionChainLeadsToHavingFilter((Extension) cur)) {
 					break;
 				}
 				final Extension ext = (Extension) cur;
@@ -1460,6 +1461,22 @@ private static boolean isAnonHavingName(String name) {
 		return name != null && name.startsWith("_anon_having_");
 	}
 
+	private static boolean extensionChainLeadsToHavingFilter(Extension ext) {
+		TupleExpr cur = ext;
+		while (cur instanceof Extension) {
+			cur = ((Extension) cur).getArg();
+		}
+		if (!(cur instanceof Filter)) {
+			return false;
+		}
+		for (String name : freeVars(((Filter) cur).getCondition())) {
+			if (isAnonHavingName(name)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	// Render expressions for HAVING with substitution of _anon_having_* variables
 	private String renderExprForHaving(final ValueExpr e, final Normalized n) {
 		return renderExprWithSubstitution(e, n == null ? null : n.selectAssignments);

core/queryrender/src/test/java/org/eclipse/rdf4j/queryrender/TupleExprIRRendererTest.java

@@ -27,12 +27,18 @@
 
 import org.eclipse.rdf4j.query.MalformedQueryException;
 import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.algebra.Extension;
+import org.eclipse.rdf4j.query.algebra.ExtensionElem;
+import org.eclipse.rdf4j.query.algebra.Filter;
+import org.eclipse.rdf4j.query.algebra.Projection;
+import org.eclipse.rdf4j.query.algebra.QueryRoot;
 import org.eclipse.rdf4j.query.algebra.TupleExpr;
 import org.eclipse.rdf4j.query.parser.ParsedQuery;
 import org.eclipse.rdf4j.query.parser.QueryParserUtil;
 import org.eclipse.rdf4j.queryrender.sparql.TupleExprIRRenderer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -687,6 +693,21 @@ void aggregates_min_max_avg_sample_having() {
 		assertSameSparqlQuery(q, cfg(), false);
 	}
 
+	@Test
+	void having_detected_when_optimized_extension_wraps_filter() {
+		String q = "SELECT ?s (COUNT(?o) AS ?c) WHERE {\n" +
+				"  ?s ?p ?o .\n" +
+				"}\n" +
+				"GROUP BY ?s\n" +
+				"HAVING (COUNT(?o) >= 2)";
+
+		TupleExpr optimizedShape = liftInnerExtensionAboveHavingFilter(parseAlgebra(SPARQL_PREFIX + q));
+		String rendered = new TupleExprIRRenderer(cfg()).render(optimizedShape, null).trim();
+
+		assertThat(rendered).contains("HAVING");
+		assertThat(rendered).doesNotContain("_anon_having_");
+	}
+
 	// --- Subquery with aggregate and scope ---
 
 	@RepeatedTest(10)
@@ -703,6 +724,31 @@ void subquery_with_aggregate_and_having() {
 		assertSameSparqlQuery(q, cfg(), false);
 	}
 
+	private TupleExpr liftInnerExtensionAboveHavingFilter(TupleExpr tupleExpr) {
+		TupleExpr copy = tupleExpr.clone();
+		TupleExpr cur = copy;
+		if (cur instanceof QueryRoot) {
+			cur = ((QueryRoot) cur).getArg();
+		}
+
+		assertThat(cur).isInstanceOf(Projection.class);
+		Projection projection = (Projection) cur;
+		assertThat(projection.getArg()).isInstanceOf(Extension.class);
+		Extension outer = (Extension) projection.getArg();
+		assertThat(outer.getArg()).isInstanceOf(Filter.class);
+		Filter filter = (Filter) outer.getArg();
+		assertThat(filter.getArg()).isInstanceOf(Extension.class);
+		Extension inner = (Extension) filter.getArg();
+
+		filter.setArg(inner.getArg());
+		Extension lifted = new Extension(filter);
+		for (ExtensionElem elem : inner.getElements()) {
+			lifted.addElement(elem.clone());
+		}
+		outer.setArg(lifted);
+		return copy;
+	}
+
 	// --- GRAPH with IRI and variable ---
 
 	@RepeatedTest(10)