wip

Author: hmottestad

core/sail/memory/src/test/java/org/eclipse/rdf4j/sail/memory/benchmark/ThemeQueryBenchmark.java

@@ -11,6 +11,15 @@
 // Some portions generated by Codex
 package org.eclipse.rdf4j.sail.memory.benchmark;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+
 import org.eclipse.rdf4j.benchmark.common.ThemeQueryCatalog;
 import org.eclipse.rdf4j.benchmark.rio.util.ThemeDataSetGenerator;
 import org.eclipse.rdf4j.benchmark.rio.util.ThemeDataSetGenerator.Theme;
@@ -48,24 +57,16 @@
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.openjdk.jmh.runner.options.TimeValue;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 @State(Scope.Benchmark)
-@Warmup(iterations = 10, batchSize = 1, timeUnit = TimeUnit.SECONDS, time = 1)
-@BenchmarkMode({Mode.AverageTime})
-@Fork(value = 1, jvmArgs = {"-Xms32G", "-Xmx32G"})
-@Measurement(iterations = 5, batchSize = 1, timeUnit = TimeUnit.SECONDS, time = 1)
+@Warmup(iterations = 1, batchSize = 1, timeUnit = TimeUnit.SECONDS, time = 5)
+@BenchmarkMode({ Mode.AverageTime })
+@Fork(value = 1, jvmArgs = { "-Xms32G", "-Xmx32G" })
+@Measurement(iterations = 1, batchSize = 1, timeUnit = TimeUnit.SECONDS, time = 1)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public class ThemeQueryBenchmark {
 
-	//	@Param({ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13" })
-	@Param({"11", "12", "13"})
+	@Param({ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13" })
+//	@Param({"11", "12", "13"})
 	public int x_queryIndex;
 
 	@Param({
@@ -80,7 +81,7 @@ public class ThemeQueryBenchmark {
 	})
 	public String themeName;
 
-	@Param({"true", "false"})
+	@Param({ "true", "false" })
 	public boolean z_useSparqlUo;
 
 	private SailRepository repository;
@@ -91,12 +92,12 @@ public class ThemeQueryBenchmark {
 	public static void main(String[] args) throws RunnerException {
 		// combinations with >30 % and >0.02 ms difference
 		List<String[]> significant = new ArrayList<>();
-		significant.add(new String[]{"MEDICAL_RECORDS", "8"});
-		significant.add(new String[]{"SOCIAL_MEDIA", "2"});
-		significant.add(new String[]{"SOCIAL_MEDIA", "6"});
-		significant.add(new String[]{"ELECTRICAL_GRID", "1"});
-		significant.add(new String[]{"PHARMA", "4"});
-		significant.add(new String[]{"TRAIN", "9"});
+		significant.add(new String[] { "MEDICAL_RECORDS", "8" });
+		significant.add(new String[] { "SOCIAL_MEDIA", "2" });
+		significant.add(new String[] { "SOCIAL_MEDIA", "6" });
+		significant.add(new String[] { "ELECTRICAL_GRID", "1" });
+		significant.add(new String[] { "PHARMA", "4" });
+		significant.add(new String[] { "TRAIN", "9" });
 
 		if (args != null && args.length >= 2) {
 			String themeName = args[0];
@@ -205,21 +206,36 @@ public long[] runQueryForTest(boolean logResults) {
 						}
 					})
 					.sorted((b1, b2) -> {
-						String string = b1.toString();
-						String string2 = b2.toString();
-						return string.compareTo(string2);
+						Stream<String> sorted = b1.getBindingNames().stream().sorted();
+						for (String name : (Iterable<String>) sorted::iterator) {
+							String v1 = b1.getValue(name).toString();
+							String v2 = b2.getValue(name).toString();
+							int cmp = v1.compareTo(v2);
+							if (cmp != 0) {
+								return cmp;
+							}
+						}
+						return 0;
 					})
 					.toList();
 
 			Long reduce = list.stream()
-					.map(Objects::toString)
+					.map(a -> {
+						StringBuilder sb = new StringBuilder();
+						Stream<String> sorted = a.getBindingNames().stream().sorted();
+						for (String name : (Iterable<String>) sorted::iterator) {
+							sb.append(name).append("=");
+							sb.append(a.getValue(name).toString()).append(";");
+						}
+						return sb.toString();
+					})
 					.map(Objects::hashCode)
 					.map(l -> (long) l)
 					.reduce(-1L, Long::sum);
 
 			long count = list.size();
 
-			return new long[]{count, reduce};
+			return new long[] { count, reduce };
 		}
 	}
 
@@ -250,7 +266,6 @@ public void testQueryCounts() throws IOException {
 						System.out.println("For theme " + themeName + " and query index " + x_queryIndex
 								+ ", expected count is " + expected + " and actual count is " + actual);
 
-
 						assertEquals(expected, actual,
 								"Unexpected count for theme " + themeName + " and query index " + x_queryIndex);
 
@@ -289,7 +304,6 @@ public void testQueryCounts() throws IOException {
 							System.out.println("For theme " + themeName + " and query index " + x_queryIndex
 									+ ", expected count is " + expected + " and actual count is " + actual);
 
-
 							assertEquals(expected, actual,
 									"Unexpected count for theme " + themeName + " and query index " + x_queryIndex);
 
@@ -352,7 +366,7 @@ private static EvaluationStrategyFactory createStandardPipelineFactory(MemorySto
 				store.getFederatedServiceResolver()) {
 			@Override
 			public EvaluationStrategy createEvaluationStrategy(Dataset dataset, TripleSource tripleSource,
-															   EvaluationStatistics evaluationStatistics) {
+					EvaluationStatistics evaluationStatistics) {
 				EvaluationStrategy strategy = super.createEvaluationStrategy(dataset, tripleSource,
 						evaluationStatistics);
 				strategy.setOptimizerPipeline(
@@ -367,13 +381,13 @@ public EvaluationStrategy createEvaluationStrategy(Dataset dataset, TripleSource
 
 	private static String[] parseUseSparqlUo(String value) {
 		if (value == null || value.isBlank() || "both".equalsIgnoreCase(value)) {
-			return new String[]{"true", "false"};
+			return new String[] { "true", "false" };
 		}
 		if ("true".equalsIgnoreCase(value)) {
-			return new String[]{"true"};
+			return new String[] { "true" };
 		}
 		if ("false".equalsIgnoreCase(value)) {
-			return new String[]{"false"};
+			return new String[] { "false" };
 		}
 		throw new IllegalArgumentException("Unexpected z_useSparqlUo value: " + value);
 	}

testsuites/benchmark-common/src/main/java/org/eclipse/rdf4j/benchmark/common/ThemeQueryCatalog.java

@@ -467,8 +467,8 @@ public final class ThemeQueryCatalog {
 								"  FILTER(?optTagName = \"tag0\")",
 								"  OPTIONAL { ?post social:content ?content . BIND(LCASE(?content) AS ?lc) }",
 								"  FILTER(CONTAINS(?lc, \"alpha\"))",
-								"}"),
-						1818433L),
+								"} LIMIT 181843"),
+						181843L),
 				query("Social: user1* with mutual follower who liked their tag1 post (join-order trap)",
 						socialPrefix + String.join("\n",
 								"SELECT ?u ?v ?post WHERE {",