continue

Author: hmottestad

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbDeferredFilterPlacer.java

@@ -155,16 +155,16 @@ private boolean hasPendingSplitExistsFilter(List<DeferredFilter> deferredFilters
 	private boolean groupDeferredFilterOnSmallestWindow(List<SegmentFactor> factors, DeferredFilter filter,
 			Set<String> boundBeforeSegment) {
 		int[] window = null;
+		if (!LmdbJoinPlanSupport.containsExists(filter.condition)
+				&& groupDeferredFilterOnBindingAssignments(factors, filter, boundBeforeSegment)) {
+			return true;
+		}
 		if (filter.conditionCost == JoinOrderPlanner.FILTER_COST_CHEAP) {
 			window = smallestSinglePatternBindingCoveringWindow(factors, filter.requiredVars, boundBeforeSegment);
 			if (window != null) {
 				return groupDeferredFilterOnWindow(factors, filter, window);
 			}
 		}
-		if (!LmdbJoinPlanSupport.containsExists(filter.condition)
-				&& groupDeferredFilterOnBindingAssignments(factors, filter, boundBeforeSegment)) {
-			return true;
-		}
 		if (filter.conditionCost == JoinOrderPlanner.FILTER_COST_CHEAP) {
 			window = smallestBindingCoveringWindow(factors, filter.requiredVars, boundBeforeSegment);
 		}

core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/benchmark/LmdbFlaggedThemeOptimizedQueryRegressionTest.java

@@ -294,6 +294,11 @@ private static List<String> invariantMismatches(Expectation expectation, Optimiz
 			mismatches.add(key + " should keep clique/pair inequality filters on binding windows, not a "
 					+ "binding-prefix ladder\n" + snapshot.plan);
 		}
+		if (expectation.theme == Theme.SOCIAL_MEDIA && expectation.queryIndex == 10
+				&& !snapshot.renderedQuery.contains("VALUES (?a ?b)")) {
+			mismatches.add(key + " should bind the first follows edge as a value pair before expanding the cycle\n"
+					+ snapshot.renderedQuery);
+		}
 		if (expectation.theme == Theme.LIBRARY && expectation.queryIndex == 7
 				&& scansUnboundLocatedAt(snapshot.plan)) {
 			mismatches.add(key + " should not evaluate the branch exclusion as a broad unbound locatedAt scan\n"