mostly functional

Author: hmottestad

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

@@ -92,9 +92,11 @@ void init(IsolationLevel level) throws SailException {
 		this.level = level;
 		initialized = true;
 		snapshotWriteMode = IsolationLevels.SNAPSHOT.equals(level);
-		snapshotReadMode = IsolationLevels.SNAPSHOT_READ.equals(level) || snapshotWriteMode
+		snapshotReadMode = IsolationLevels.SNAPSHOT_READ.equals(level)
 				|| IsolationLevels.SERIALIZABLE.equals(level);
-		if (snapshotReadMode) {
+		if (snapshotWriteMode) {
+			ensureWriteTxnInitialized();
+		} else if (snapshotReadMode) {
 			ensurePinnedReadSnapshot();
 			deferWrites = true;
 			overlayChanges = true;
@@ -116,6 +118,10 @@ boolean hasStatementChanges() {
 
 	void markManagedTransaction() {
 		managedTransaction = true;
+		if (!snapshotWriteMode) {
+			deferWrites = true;
+			overlayChanges = true;
+		}
 	}
 
 	boolean isManagedTransaction() {
@@ -222,7 +228,8 @@ private void ensureWriteTxnInitialized() throws SailException {
 			int i = 0;
 			while (!b) {
 				i++;
-				System.err.println(Thread.currentThread() + " - LMDB writeTxnLock wait took more than " + i * 10 + " seconds");
+				System.err.println(
+						Thread.currentThread() + " - LMDB writeTxnLock wait took more than " + i * 10 + " seconds");
 				// print lock diagnostics
 				printWriteTxnLockDiagnostics(i * 10, i == 1 || i % 6 == 0);
 
@@ -310,7 +317,7 @@ private void checkSerializableConflicts() throws SailException {
 			return;
 		}
 		try (Txn snapshotTxn = acquirePinnedReadTxn();
-			 Txn currentTxn = store.getTripleStore().getTxnManager().createReadTxn()) {
+				Txn currentTxn = store.getTripleStore().getTxnManager().createReadTxn()) {
 			store.ensureObservedPatternsUnchanged(snapshotTxn, currentTxn, observedExplicit, true);
 			store.ensureObservedPatternsUnchanged(snapshotTxn, currentTxn, observedInferred, false);
 		} catch (IOException e) {
@@ -363,7 +370,7 @@ void beginUpdate() throws SailException {
 		}
 		deferWrites = true;
 		overlayChanges = true;
-		if (!(snapshotReadMode || snapshotWriteMode) && level != null) {
+		if (!(snapshotReadMode || snapshotWriteMode) && level != null && !shouldDeferWriteFlush()) {
 			ensureWriteTxn(level);
 		}
 		pendingUpdates.push(new PendingChanges());
@@ -381,7 +388,7 @@ void endUpdate() throws SailException {
 		}
 		if (deferWrites) {
 			mergeIntoMain(completed);
-			if (snapshotReadMode) {
+			if (shouldDeferWriteFlush()) {
 				return;
 			}
 			try {
@@ -406,7 +413,7 @@ void abortUpdate() {
 			pendingUpdates.pop();
 		}
 		if (pendingUpdates.isEmpty() && deferWrites) {
-			if (snapshotReadMode) {
+			if (shouldDeferWriteFlush()) {
 				return;
 			}
 			clearStatementChanges();
@@ -415,6 +422,10 @@ void abortUpdate() {
 		}
 	}
 
+	private boolean shouldDeferWriteFlush() {
+		return managedTransaction && !snapshotWriteMode;
+	}
+
 	void recordAdd(Resource subj, IRI pred, Value obj, Resource ctx, boolean explicit) {
 		if (!deferWrites) {
 			return;
@@ -643,7 +654,7 @@ private void applyPendingTo(Set<Quad> added, Set<Quad> removed, boolean explicit
 		if (pendingUpdates.isEmpty()) {
 			return;
 		}
-		for (var iterator = pendingUpdates.descendingIterator(); iterator.hasNext(); ) {
+		for (var iterator = pendingUpdates.descendingIterator(); iterator.hasNext();) {
 			PendingChanges pending = iterator.next();
 			pending.applyTo(added, removed, explicit);
 		}
@@ -653,7 +664,7 @@ private void applyPendingDeprecatedTo(Set<Quad> deprecated, boolean explicit) {
 		if (pendingUpdates.isEmpty()) {
 			return;
 		}
-		for (var iterator = pendingUpdates.descendingIterator(); iterator.hasNext(); ) {
+		for (var iterator = pendingUpdates.descendingIterator(); iterator.hasNext();) {
 			PendingChanges pending = iterator.next();
 			pending.applyDeprecatedTo(deprecated, explicit);
 		}
@@ -908,7 +919,6 @@ void apply(NamespaceStore base) {
 		}
 	}
 
-
 	private void printWriteTxnLockDiagnostics(int waitedSeconds, boolean includeThreadDump) {
 		try {
 			System.err.println("LMDB writeTxnLock diagnostics after waiting " + waitedSeconds + " seconds");