fixes

Author: hmottestad

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

@@ -939,6 +939,7 @@ private void approveAllBulk(Set<Statement> approved, Set<Resource> approvedConte
 				}
 			} catch (IOException | RuntimeException e) {
 				rollback();
+				clearEstimatorUpdates();
 				if (multiThreadingActive) {
 					logger.error("Encountered an unexpected problem while trying to add a statement.", e);
 				} else {

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/config/LmdbStoreConfig.java

@@ -436,9 +436,9 @@ public Resource export(Model m) {
 			m.add(implNode, LmdbStoreSchema.SKETCH_ESTIMATOR_CONTEXT_BUCKET_COUNT,
 					vf.createLiteral(sketchEstimatorContextBucketCount));
 		}
-		if (!sketchEstimatorContextPairSketchesEnabled) {
+		if (sketchEstimatorContextPairSketchesEnabled) {
 			m.add(implNode, LmdbStoreSchema.SKETCH_ESTIMATOR_CONTEXT_PAIR_SKETCHES_ENABLED,
-					vf.createLiteral(false));
+					vf.createLiteral(true));
 		}
 		if (!optimizerSamplingEnabled) {
 			m.add(implNode, LmdbStoreSchema.OPTIMIZER_SAMPLING_ENABLED, vf.createLiteral(false));

core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbSailStoreTest.java

@@ -55,6 +55,7 @@
 import org.eclipse.rdf4j.sail.SailException;
 import org.eclipse.rdf4j.sail.base.SailDataset;
 import org.eclipse.rdf4j.sail.base.SailSink;
+import org.eclipse.rdf4j.sail.base.SketchBasedJoinEstimator;
 import org.eclipse.rdf4j.sail.lmdb.config.LmdbStoreConfig;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -412,6 +413,51 @@ void approveAllUsesConfiguredBulkOperationSize() throws Exception {
 		}
 	}
 
+	@Test
+	void approveAllBulkFailureDiscardsNonIsolatedEstimatorUpdates() throws Exception {
+		LmdbStoreConfig config = new LmdbStoreConfig("spoc,posc");
+		setBulkOperationSize(config, 2);
+		LmdbStore sail = new LmdbStore(new File(dataDir, "bulk-failure-estimator"), config);
+		sail.init();
+
+		try {
+			LmdbSailStore backingStore = sail.getBackingStore();
+			backingStore.enableMultiThreading = false;
+			SketchBasedJoinEstimator estimator = backingStore.getSketchBasedJoinEstimator();
+			try (SailSink seedSink = backingStore.getExplicitSailSource().sink(IsolationLevels.NONE)) {
+				seedSink.approveAll(sampleStatements(5), Set.of());
+				seedSink.flush();
+			}
+			estimator.rebuild();
+			assertTrue("Expected estimator to be ready before the failed bulk add", estimator.isReady());
+
+			Field tripleStoreField = LmdbSailStore.class.getDeclaredField("tripleStore");
+			tripleStoreField.setAccessible(true);
+			TripleStore originalTripleStore = (TripleStore) tripleStoreField.get(backingStore);
+			TripleStore tripleStoreSpy = spy(originalTripleStore);
+
+			doAnswer(invocation -> {
+				IntConsumer addedIndexConsumer = invocation.getArgument(6);
+				addedIndexConsumer.accept(0);
+				throw new IOException("expected aligned bulk failure after estimator update");
+			}).when(tripleStoreSpy)
+					.storeTriplesAligned(any(long[].class), any(long[].class), any(long[].class),
+							any(long[].class), anyInt(), anyBoolean(), any(IntConsumer.class));
+
+			tripleStoreField.set(backingStore, tripleStoreSpy);
+			try (SailSink sink = backingStore.getExplicitSailSource().sink(IsolationLevels.NONE)) {
+				assertThrows(SailException.class, () -> sink.approveAll(sampleStatements(2), Set.of()));
+
+				assertFalse("Expected rollback to discard estimator state after an eager non-isolated update",
+						estimator.isReady());
+			} finally {
+				tripleStoreField.set(backingStore, originalTripleStore);
+			}
+		} finally {
+			sail.shutDown();
+		}
+	}
+
 	private static void setBulkOperationSize(LmdbStoreConfig config, int bulkOperationSize) {
 		try {
 			Method setter = config.getClass().getMethod("setBulkOperationSize", int.class);

core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/config/LmdbStoreConfigTest.java

@@ -265,7 +265,7 @@ void testThatLmdbStoreConfigParseAndExportSketchEstimatorContextPairSketchesEnab
 				Values.literal(enabled),
 				"getSketchEstimatorContextPairSketchesEnabled",
 				enabled,
-				!enabled
+				enabled
 		);
 	}