wip

core/sail/memory/src/main/java/org/eclipse/rdf4j/sail/memory/model/MemStatementList.java

@@ -77,6 +77,8 @@ public void add(MemStatement st) throws InterruptedException {
 			MemStatement[] statements = getStatements();
 			int length = statements.length;
 
+			boolean shouldGrowArray = true;
+
 			if (length > (int) SIZE.getAcquire(this)) {
 
 				int previouslyInsertedIndex = (int) PREVIOUSLY_INSERTED_INDEX.getOpaque(this);
@@ -91,10 +93,11 @@ public void add(MemStatement st) throws InterruptedException {
 					if (statements[i] == null) {
 
 						boolean success = STATEMENTS_ARRAY.compareAndSet(statements, i, null, st);
+
 						if (success) {
+							shouldGrowArray = false;
 
-							// check if the statements array has been swapped out (because it was grown) while we
-							// were
+							// check if the statements array has been swapped out (because it has grown) while we were
 							// inserting into it
 							MemStatement[] statementsAfterInsert = getStatements();
 							if (statementsAfterInsert != statements
@@ -111,24 +114,23 @@ public void add(MemStatement st) throws InterruptedException {
 							return;
 						}
 					}
-
 				}
-
 			}
 
-			// statements array is probably full
-
-			if (STATEMENTS.compareAndSet(this, statements, null)) {// Grow array
+			if (shouldGrowArray && STATEMENTS.compareAndSet(this, statements, null)) {
+				// Grow array
 				MemStatement[] newArray = new MemStatement[Math.max(4, length * 2)];
 				if (statements != EMPTY_ARRAY) {
 					System.arraycopy(statements, 0, newArray, 0, length);
 				}
 
 				STATEMENTS.setRelease(this, newArray);
 			}
+
 			if (Thread.interrupted()) {
 				throw new InterruptedException();
 			}
+
 		} while (true);
 
 	}

core/sail/memory/src/test/java/org/eclipse/rdf4j/sail/memory/model/MemStatementListTestIT.java

@@ -37,9 +37,9 @@
 import org.eclipse.rdf4j.rio.Rio;
 import org.eclipse.rdf4j.sail.NotifyingSailConnection;
 import org.eclipse.rdf4j.sail.memory.MemoryStore;
-import org.junit.Ignore;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
@@ -50,7 +50,7 @@
 public class MemStatementListTestIT {
 
 	private static List<MemStatement> statements;
-	public static final int CHUNKS = 10_000;
+	public static final int CHUNKS = 1_000;
 
 	@BeforeAll
 	public static void beforeAll() throws IOException {
@@ -136,7 +136,7 @@ public void addMultipleThreads() throws ExecutionException, InterruptedException
 
 	@Test
 	@Timeout(120)
-	@Ignore
+	@Disabled
 	public void addRemoveMultipleThreads() throws ExecutionException, InterruptedException {
 
 		List<List<MemStatement>> partition = Lists.partition(statements, CHUNKS);
@@ -191,7 +191,7 @@ public void addRemoveMultipleThreads() throws ExecutionException, InterruptedExc
 
 	@Test
 	@Timeout(120)
-	@Ignore
+	@Disabled
 	public void addRemoveConsistentMultipleThreads() throws ExecutionException, InterruptedException {
 
 		List<List<MemStatement>> partition = Lists.partition(statements, CHUNKS);
@@ -253,7 +253,7 @@ public void addRemoveConsistentMultipleThreads() throws ExecutionException, Inte
 
 	@Test
 	@Timeout(120)
-	@Ignore
+	@Disabled
 	public void addCleanSnapshotConsistentMultipleThreads() throws ExecutionException, InterruptedException {
 
 		List<List<MemStatement>> partition = Lists.partition(statements, CHUNKS);