cleanup

Author: hmottestad

core/queryalgebra/evaluation/src/test/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/QueryJoinOptimizerTest.java

@@ -312,109 +312,6 @@ public void testValues() throws RDF4JException {
 		testOptimizer(expectedQuery, query);
 	}
 
-//	@Test
-//	public void testOptionalWithSubSelect() throws RDF4JException {
-//		String query = String.join("\n", "",
-//				"prefix ex: <ex:> ",
-//				"select * where {",
-//				"optional { ?b ex:z ?q . }",
-//				"{",
-//				"	select ?b ?a ?x where {",
-//				"	   ex:b ?a ?x. ",
-//				"      ex:b ex:a ?x. ",
-//				"}",
-//				"}",
-//				"}"
-//		);
-//
-//		// we expect the subselect to be optimized too.
-//		// ex:b ex:a ?x.
-//		// ex:b ?a ?x.
-//
-//		SPARQLParser parser = new SPARQLParser();
-//		ParsedQuery q = parser.parseQuery(query, null);
-//		QueryJoinOptimizer opt = new QueryJoinOptimizer(new EvaluationStatistics(), new EmptyTripleSource());
-//		QueryRoot optRoot = new QueryRoot(q.getTupleExpr());
-//		opt.optimize(optRoot, null, null);
-//
-//		StatementFinder stmtFinder = new StatementFinder();
-//		optRoot.visit(stmtFinder);
-//		List<StatementPattern> stmts = stmtFinder.getStatements();
-//
-//		assertEquals(stmts.size(), 3);
-//		assertEquals(stmts.get(0).getSubjectVar().getValue().stringValue(), "ex:b");
-//		assertEquals(stmts.get(0).getPredicateVar().getValue().stringValue(), "ex:a");
-//		assertEquals(stmts.get(0).getObjectVar().getValue(), null);
-//		assertEquals(stmts.get(1).getSubjectVar().getValue().stringValue(), "ex:b");
-//		assertEquals(stmts.get(1).getPredicateVar().getValue(), null);
-//		assertEquals(stmts.get(1).getObjectVar().getValue(), null);
-//
-//	}
-
-//	@Test
-//	public void reorderJoinArgsUsesEstimatorForFirstPattern() throws Exception {
-//		ValueFactory vf = SimpleValueFactory.getInstance();
-//
-//		StatementPattern expensive = new StatementPattern(new Var("s1"),
-//				new Var("p1", vf.createIRI("ex:pExpensive")), new Var("o1"));
-//		StatementPattern medium = new StatementPattern(new Var("s2"),
-//				new Var("p2", vf.createIRI("ex:pMedium")), new Var("o2"));
-//		StatementPattern cheap = new StatementPattern(new Var("s3"),
-//				new Var("p3", vf.createIRI("ex:pCheap")), new Var("o3"));
-//
-//		Deque<TupleExpr> ordered = new ArrayDeque<>();
-//		ordered.add(expensive);
-//		ordered.add(medium);
-//		ordered.add(cheap);
-//
-//		QueryJoinOptimizer optimizer = new QueryJoinOptimizer(new JoinEstimatingStatistics(), new EmptyTripleSource());
-//		Object joinVisitor = buildJoinVisitor(optimizer);
-//		Method reorderJoinArgs = joinVisitor.getClass().getDeclaredMethod("reorderJoinArgs", Deque.class);
-//		reorderJoinArgs.setAccessible(true);
-//
-//		@SuppressWarnings("unchecked")
-//		Deque<TupleExpr> reordered = (Deque<TupleExpr>) reorderJoinArgs.invoke(joinVisitor, ordered);
-//
-//		List<String> predicateOrder = reordered.stream()
-//				.map(QueryJoinOptimizerTest::getPredicateValue)
-//				.collect(Collectors.toList());
-//		assertThat(predicateOrder).containsExactlyInAnyOrder("ex:pCheap", "ex:pMedium", "ex:pExpensive");
-//		assertThat(predicateOrder.subList(0, 2)).containsExactlyInAnyOrder("ex:pCheap", "ex:pMedium");
-//		assertThat(predicateOrder.get(2)).isEqualTo("ex:pExpensive");
-//	}
-
-//	@Test
-//	public void reorderJoinArgsChoosesCheapestInitialJoinCombination() throws Exception {
-//		ValueFactory vf = SimpleValueFactory.getInstance();
-//
-//		StatementPattern a = new StatementPattern(new Var("sa"), new Var("pa", vf.createIRI("ex:pA")),
-//				new Var("oa"));
-//		StatementPattern b = new StatementPattern(new Var("sb"), new Var("pb", vf.createIRI("ex:pB")),
-//				new Var("ob"));
-//		StatementPattern c = new StatementPattern(new Var("sc"), new Var("pc", vf.createIRI("ex:pC")),
-//				new Var("oc"));
-//
-//		Deque<TupleExpr> ordered = new ArrayDeque<>();
-//		ordered.add(a);
-//		ordered.add(b);
-//		ordered.add(c);
-//
-//		QueryJoinOptimizer optimizer = new QueryJoinOptimizer(new PairwiseJoinStatistics(), new EmptyTripleSource());
-//		Object joinVisitor = buildJoinVisitor(optimizer);
-//		Method reorderJoinArgs = joinVisitor.getClass().getDeclaredMethod("reorderJoinArgs", Deque.class);
-//		reorderJoinArgs.setAccessible(true);
-//
-//		@SuppressWarnings("unchecked")
-//		Deque<TupleExpr> reordered = (Deque<TupleExpr>) reorderJoinArgs.invoke(joinVisitor, ordered);
-//
-//		List<String> predicateOrder = reordered.stream()
-//				.map(QueryJoinOptimizerTest::getPredicateValue)
-//				.collect(Collectors.toList());
-//		assertThat(predicateOrder).containsExactlyInAnyOrder("ex:pA", "ex:pB", "ex:pC");
-//		assertThat(predicateOrder.subList(0, 2)).containsExactlyInAnyOrder("ex:pB", "ex:pC");
-//		assertThat(predicateOrder.get(2)).isEqualTo("ex:pA");
-//	}
-
 	@Test
 	public void optimizeSetsResultSizeEstimateOnGeneratedJoinNodes() throws Exception {
 		String query = "SELECT * WHERE { ?s <ex:pA> ?o1 . ?s <ex:pB> ?o2 . ?s <ex:pC> ?o3 . }";