Merge pull request #2604 from alecgrieser/unique-keyspace-for-test

Resolves #2601: Tests should run in unique key space paths

Author: ScottDugas

.idea/compiler.xml

@@ -35,6 +35,8 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
     testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}" // binding
     testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}" // library
+    testCompileOnly "com.google.auto.service:auto-service:undefined"
+    testAnnotationProcessor "com.google.auto.service:auto-service:undefined"
 }
 
 publishing {

fdb-extensions/fdb-extensions.gradle

@@ -20,11 +20,11 @@
 
 package com.apple.foundationdb.async;
 
+import com.apple.foundationdb.test.TestExecutors;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,8 +35,7 @@
  * Tests for {@link MoreAsyncUtil}.
  */
 public class MoreAsyncUtilTest {
-
-    static final Executor EXECUTOR = ForkJoinPool.commonPool();
+    static final Executor EXECUTOR = TestExecutors.defaultThreadPool();
 
     int count;
 

fdb-extensions/src/test/java/com/apple/foundationdb/FDBTestBase.java

@@ -21,20 +21,21 @@
 package com.apple.foundationdb.async;
 
 import com.apple.foundationdb.Database;
-import com.apple.foundationdb.FDB;
-import com.apple.foundationdb.FDBTestBase;
 import com.apple.foundationdb.KeyValue;
 import com.apple.foundationdb.Range;
 import com.apple.foundationdb.Transaction;
-import com.apple.foundationdb.directory.DirectoryLayer;
-import com.apple.foundationdb.directory.PathUtil;
 import com.apple.foundationdb.subspace.Subspace;
 import com.apple.foundationdb.test.MultipleTransactions;
+import com.apple.foundationdb.test.TestDatabaseExtension;
+import com.apple.foundationdb.test.TestSubspaceExtension;
 import com.apple.foundationdb.tuple.ByteArrayUtil;
 import com.apple.test.Tags;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
@@ -59,7 +60,12 @@
  * Tests for {@link RangeSet}.
  */
 @Tag(Tags.RequiresFDB)
-public class RangeSetTest extends FDBTestBase {
+@Execution(ExecutionMode.CONCURRENT)
+public class RangeSetTest {
+    @RegisterExtension
+    static final TestDatabaseExtension dbExtension = new TestDatabaseExtension();
+    @RegisterExtension
+    TestSubspaceExtension rsSubspaceExtension = new TestSubspaceExtension(dbExtension);
     private Database db;
     private Subspace rsSubspace;
     private RangeSet rs;
@@ -113,9 +119,9 @@ private void checkIncreasing() {
     }
 
     @BeforeEach
-    void setUp() throws Exception {
-        db = FDB.instance().open();
-        rsSubspace = DirectoryLayer.getDefault().createOrOpen(db, PathUtil.from(getClass().getSimpleName())).get();
+    void setUp() {
+        db = dbExtension.getDatabase();
+        rsSubspace = rsSubspaceExtension.getSubspace();
         rs = new RangeSet(rsSubspace);
         rs.clear(db).join();
     }

fdb-extensions/src/test/java/com/apple/foundationdb/async/MoreAsyncUtilTest.java

@@ -22,25 +22,27 @@
 
 import com.apple.foundationdb.Database;
 import com.apple.foundationdb.FDB;
-import com.apple.foundationdb.FDBTestBase;
 import com.apple.foundationdb.NetworkOptions;
 import com.apple.foundationdb.Transaction;
 import com.apple.foundationdb.TransactionContext;
-import com.apple.foundationdb.directory.DirectoryLayer;
-import com.apple.foundationdb.directory.PathUtil;
 import com.apple.foundationdb.subspace.Subspace;
+import com.apple.foundationdb.test.TestDatabaseExtension;
+import com.apple.foundationdb.test.TestExecutors;
+import com.apple.foundationdb.test.TestSubspaceExtension;
 import com.apple.foundationdb.tuple.ByteArrayUtil;
 import com.apple.foundationdb.tuple.Tuple;
 import com.apple.test.Tags;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletionException;
-import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -54,7 +56,12 @@
  * Tests for {@link RankedSet}.
  */
 @Tag(Tags.RequiresFDB)
-public class RankedSetTest extends FDBTestBase {
+@Execution(ExecutionMode.CONCURRENT)
+public class RankedSetTest {
+    @RegisterExtension
+    static final TestDatabaseExtension dbExtension = new TestDatabaseExtension();
+    @RegisterExtension
+    TestSubspaceExtension rsSubspaceExtension = new TestSubspaceExtension(dbExtension);
     private Database db;
     private Subspace rsSubspace;
 
@@ -69,12 +76,8 @@ public void setUp() throws Exception {
             options.setTraceEnable("/tmp");
             options.setTraceLogGroup("RankedSetTest");
         }
-        this.db = fdb.open();
-        this.rsSubspace = DirectoryLayer.getDefault().createOrOpen(db, PathUtil.from(getClass().getSimpleName())).get();
-        db.run(tr -> {
-            tr.clear(rsSubspace.range());
-            return null;
-        });
+        this.db = dbExtension.getDatabase();
+        this.rsSubspace = rsSubspaceExtension.getSubspace();
     }
 
     @Test
@@ -288,7 +291,7 @@ public void rankAsThoughPresent() {
     //
 
     private RankedSet newRankedSet() {
-        RankedSet result = new RankedSet(rsSubspace, ForkJoinPool.commonPool(), config);
+        RankedSet result = new RankedSet(rsSubspace, TestExecutors.defaultThreadPool(), config);
         result.init(db).join();
         return result;
     }

fdb-extensions/src/test/java/com/apple/foundationdb/async/RangeSetTest.java

@@ -21,24 +21,23 @@
 package com.apple.foundationdb.async.rtree;
 
 import com.apple.foundationdb.Database;
-import com.apple.foundationdb.FDB;
-import com.apple.foundationdb.FDBTestBase;
 import com.apple.foundationdb.KeyValue;
-import com.apple.foundationdb.NetworkOptions;
 import com.apple.foundationdb.Range;
 import com.apple.foundationdb.async.AsyncUtil;
-import com.apple.foundationdb.directory.DirectoryLayer;
-import com.apple.foundationdb.directory.DirectorySubspace;
-import com.apple.foundationdb.directory.PathUtil;
 import com.apple.foundationdb.subspace.Subspace;
+import com.apple.foundationdb.test.TestDatabaseExtension;
+import com.apple.foundationdb.test.TestExecutors;
+import com.apple.foundationdb.test.TestSubspaceExtension;
 import com.apple.foundationdb.tuple.Tuple;
 import com.apple.test.Tags;
 import com.google.common.collect.ImmutableList;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -49,7 +48,6 @@
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Stream;
 
@@ -58,42 +56,24 @@
  */
 @Tag(Tags.RequiresFDB)
 @Tag(Tags.Slow)
-public class RTreeModificationTest extends FDBTestBase {
+@Execution(ExecutionMode.CONCURRENT)
+public class RTreeModificationTest {
     private static final Logger logger = LoggerFactory.getLogger(RTreeModificationTest.class);
-
     private static final int NUM_TEST_RUNS = 5;
     private static final int NUM_SAMPLES = 10_000;
 
-    private Database db;
-    private DirectorySubspace rtSubspace;
-    private DirectorySubspace rtSecondarySubspace;
+    @RegisterExtension
+    static final TestDatabaseExtension dbExtension = new TestDatabaseExtension();
+    @RegisterExtension
+    TestSubspaceExtension rtSubspace = new TestSubspaceExtension(dbExtension);
+    @RegisterExtension
+    TestSubspaceExtension rtSecondarySubspace = new TestSubspaceExtension(dbExtension);
 
-    private static final boolean TRACE = false;
+    private Database db;
 
     @BeforeEach
-    public void setUpDb() throws Exception {
-        FDB fdb = FDB.instance();
-        if (TRACE) {
-            NetworkOptions options = fdb.options();
-            options.setTraceEnable("/tmp");
-            options.setTraceLogGroup("RTreeTest");
-        }
-        db = fdb.open();
-        rtSubspace = DirectoryLayer.getDefault().createOrOpen(db, PathUtil.from(RTree.class.getSimpleName())).get();
-        db.run(tr -> {
-            tr.clear(Range.startsWith(rtSubspace.getKey()));
-            return null;
-        });
-        rtSecondarySubspace = DirectoryLayer.getDefault().createOrOpen(db, PathUtil.from(RTree.class.getSimpleName(), "secondary")).get();
-        db.run(tr -> {
-            tr.clear(Range.startsWith(rtSecondarySubspace.getKey()));
-            return null;
-        });
-    }
-
-    @AfterEach
-    public void closeDb() {
-        db.close();
+    public void setUpDb() {
+        db = dbExtension.getDatabase();
     }
 
     @ParameterizedTest
@@ -102,7 +82,7 @@ public void testAllDeleted(final RTree.Config config, final long seed, final int
         final RTreeScanTest.OnWriteCounters onWriteCounters = new RTreeScanTest.OnWriteCounters();
         final RTreeScanTest.OnReadCounters onReadCounters = new RTreeScanTest.OnReadCounters();
 
-        final RTree rTree = new RTree(rtSubspace, rtSecondarySubspace, ForkJoinPool.commonPool(), config,
+        final RTree rTree = new RTree(rtSubspace.getSubspace(), rtSecondarySubspace.getSubspace(), TestExecutors.defaultThreadPool(), config,
                 RTreeHilbertCurveHelpers::hilbertValue, NodeHelpers::newSequentialNodeId, onWriteCounters,
                 onReadCounters);
         final long startTs = System.nanoTime();
@@ -160,7 +140,7 @@ public void testAllDeleted(final RTree.Config config, final long seed, final int
     @MethodSource("numSamplesAndNumDeletes")
     public void testRandomDeletes(@Nonnull final RTree.Config config, final long seed, final int numSamples, final int numDeletes) {
         final RTreeScanTest.OnReadCounters onReadCounters = new RTreeScanTest.OnReadCounters();
-        final RTree rTree = new RTree(rtSubspace, rtSecondarySubspace, ForkJoinPool.commonPool(), config,
+        final RTree rTree = new RTree(rtSubspace.getSubspace(), rtSecondarySubspace.getSubspace(), TestExecutors.defaultThreadPool(), config,
                 RTreeHilbertCurveHelpers::hilbertValue, NodeHelpers::newSequentialNodeId, OnWriteListener.NOOP,
                 onReadCounters);
         final Item[] items = randomInserts(db, rTree, seed, numSamples);
@@ -222,7 +202,7 @@ public <T extends Node> CompletableFuture<T> onAsyncRead(@Nonnull final Completa
             }
         };
 
-        final RTree rTree = new RTree(rtSubspace, rtSecondarySubspace, ForkJoinPool.commonPool(),
+        final RTree rTree = new RTree(rtSubspace.getSubspace(), rtSecondarySubspace.getSubspace(), TestExecutors.defaultThreadPool(),
                 new RTree.ConfigBuilder().build(),
                 RTreeHilbertCurveHelpers::hilbertValue, NodeHelpers::newSequentialNodeId, OnWriteListener.NOOP,
                 onReadListener);