mostly functional

Author: hmottestad

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

@@ -92,11 +92,9 @@ void init(IsolationLevel level) throws SailException {
 		this.level = level;
 		initialized = true;
 		snapshotWriteMode = IsolationLevels.SNAPSHOT.equals(level);
-		snapshotReadMode = IsolationLevels.SNAPSHOT_READ.equals(level)
+		snapshotReadMode = snapshotWriteMode || IsolationLevels.SNAPSHOT_READ.equals(level)
 				|| IsolationLevels.SERIALIZABLE.equals(level);
-		if (snapshotWriteMode) {
-			ensureWriteTxnInitialized();
-		} else if (snapshotReadMode) {
+		if (snapshotReadMode) {
 			ensurePinnedReadSnapshot();
 			deferWrites = true;
 			overlayChanges = true;
@@ -118,10 +116,8 @@ boolean hasStatementChanges() {
 
 	void markManagedTransaction() {
 		managedTransaction = true;
-		if (!snapshotWriteMode) {
-			deferWrites = true;
-			overlayChanges = true;
-		}
+		deferWrites = true;
+		overlayChanges = true;
 	}
 
 	boolean isManagedTransaction() {
@@ -370,7 +366,7 @@ void beginUpdate() throws SailException {
 		}
 		deferWrites = true;
 		overlayChanges = true;
-		if (!(snapshotReadMode || snapshotWriteMode) && level != null && !shouldDeferWriteFlush()) {
+		if (!managedTransaction && !snapshotReadMode && level != null) {
 			ensureWriteTxn(level);
 		}
 		pendingUpdates.push(new PendingChanges());
@@ -388,7 +384,7 @@ void endUpdate() throws SailException {
 		}
 		if (deferWrites) {
 			mergeIntoMain(completed);
-			if (shouldDeferWriteFlush()) {
+			if (managedTransaction) {
 				return;
 			}
 			try {
@@ -413,7 +409,7 @@ void abortUpdate() {
 			pendingUpdates.pop();
 		}
 		if (pendingUpdates.isEmpty() && deferWrites) {
-			if (shouldDeferWriteFlush()) {
+			if (managedTransaction) {
 				return;
 			}
 			clearStatementChanges();
@@ -422,10 +418,6 @@ void abortUpdate() {
 		}
 	}
 
-	private boolean shouldDeferWriteFlush() {
-		return managedTransaction && !snapshotWriteMode;
-	}
-
 	void recordAdd(Resource subj, IRI pred, Value obj, Resource ctx, boolean explicit) {
 		if (!deferWrites) {
 			return;