2424import java .util .ArrayList ;
2525import java .util .List ;
2626import java .util .Random ;
27+ import java .util .concurrent .ExecutionException ;
28+ import java .util .concurrent .ExecutorService ;
29+ import java .util .concurrent .Executors ;
30+ import java .util .concurrent .Future ;
2731import java .util .concurrent .atomic .AtomicBoolean ;
2832
2933/**
3438 * - Each TestDBResource starts a group of threads (16 in total) for concurrent testing,
3539 * with the following responsibilities:
3640 * <p>
37- * - 5 threads perform concurrent write operations. Each thread randomly selects a table and executes
38- * 1 million updateOneRandomTable operations on that table. Acquiring the intent write lock on the db and
39- * then the write lock on the table is required before updating the table.
41+ * - 5 threads perform concurrent write operations. Each thread randomly selects a table and executes
42+ * 1 million updateOneRandomTable operations on that table. Acquiring the intent write lock on the db and
43+ * then the write lock on the table is required before updating the table.
4044 * <p>
41- * - 5 threads perform concurrent write operations. Each thread executes 1 million updateAllTables
42- * operations on the db. Acquiring the write lock on the db is required before executing this action.
45+ * - 5 threads perform concurrent write operations. Each thread executes 1 million updateAllTables
46+ * operations on the db. Acquiring the write lock on the db is required before executing this action.
4347 * <p>
44- * - 3 threads perform concurrent read operations. Each thread acquires a read lock on the db,
45- * then randomly selects a table and verifies whether the two counters of that table are equal.
46- * If not, Assert.assertEquals() fails.
48+ * - 3 threads perform concurrent read operations. Each thread acquires a read lock on the db,
49+ * then randomly selects a table and verifies whether the two counters of that table are equal.
50+ * If not, Assert.assertEquals() fails.
4751 * <p>
48- * - 3 threads perform concurrent read operations. Each thread acquires an intent read lock on the db and
49- * a read lock on the table. It then verifies whether the two counters of that table are equal.
50- * If not, Assert.assertEquals() fails.
52+ * - 3 threads perform concurrent read operations. Each thread acquires an intent read lock on the db and
53+ * a read lock on the table. It then verifies whether the two counters of that table are equal.
54+ * If not, Assert.assertEquals() fails.
5155 * <p>
5256 * - Finally, verify that the sum of counter1 for all tables under each db is 2 million.
5357 * If not, Assert.assertEquals() fails.
@@ -62,7 +66,6 @@ public class LockManagerAllLockModesRandomTest {
6266 private static final long TABLE_ID_START = 10000 ;
6367 private static final long DB_ID_START = 20000 ;
6468
65-
6669 /**
6770 * We will acquire intensive lock or non-intensive lock on DB resource.
6871 * When acquiring intensive lock, we will also acquire specific non-intensive lock on the table to update it.
@@ -127,6 +130,7 @@ public void incrTwoCounters() {
127130 /**
128131 * We always increase the two counters together, so we will assert whether the two counters are equal to test
129132 * the correctness of the lock manager.
133+ *
130134 * @return the two counters in a pair
131135 */
132136 public Pair <Long , Long > getTwoCounters () {
@@ -197,7 +201,7 @@ public void testAllLockModesConcurrent() throws InterruptedException {
197201 locker = new Locker ();
198202 locker .lock (db .getId (), LockType .INTENTION_SHARED );
199203 locker .lock (db .getTableByIndex (tableIndex ).getId (), LockType .READ );
200- Pair <Long , Long > result = db .getOneRandomTable ( ).getTwoCounters ();
204+ Pair <Long , Long > result = db .getTableByIndex ( tableIndex ).getTwoCounters ();
201205 Assert .assertEquals (result .first , result .second );
202206 } catch (LockException e ) {
203207 Assert .fail ();
@@ -279,24 +283,41 @@ public void testAllLockModesConcurrent() throws InterruptedException {
279283 } // end for single db
280284 } // enf for all dbs
281285
282- // Start all threads.
283- for (Thread t : allThreadList ) {
284- t .start ();
286+ ExecutorService executor = Executors .newFixedThreadPool (100 );
287+
288+ List <Future <?>> wf = new ArrayList <>();
289+ for (Thread thread : writeThreadList ) {
290+ Future <?> f = executor .submit (thread );
291+ wf .add (f );
292+ }
293+
294+ List <Future <?>> rf = new ArrayList <>();
295+ for (Thread thread : readThreadList ) {
296+ Future <?> f = executor .submit (thread );
297+ rf .add (f );
285298 }
286299
287300 // Wait for write threads end.
288- for (Thread t : writeThreadList ) {
289- t .join ();
301+ for (Future <?> f : wf ) {
302+ try {
303+ f .get ();
304+ } catch (ExecutionException e ) {
305+ Assert .fail (e .getMessage ());
306+ }
290307 }
291308 System .out .println ("All write threads end." );
292309
293310 readerStop .set (true );
294311 // Wait for read threads end.
295- for (Thread t : readThreadList ) {
296- t .join ();
312+ for (Future <?> f : rf ) {
313+ try {
314+ f .get ();
315+ } catch (ExecutionException e ) {
316+ Assert .fail (e .getMessage ());
317+ }
297318 }
298- System .out .println ("All read threads end." );
299319
320+ System .out .println ("All read threads end." );
300321
301322 // Verify the correctness of the lock manager.
302323 for (TestDBResource db : dbs ) {
@@ -311,6 +332,5 @@ public void testAllLockModesConcurrent() throws InterruptedException {
311332 Assert .assertEquals (30 * NUM_TEST_OPERATIONS , counter1Sum );
312333 Assert .assertEquals (30 * NUM_TEST_OPERATIONS , counter2Sum );
313334 }
314-
315335 }
316336}
0 commit comments