From 618b63253109a373909aa46452e16811302a24e7 Mon Sep 17 00:00:00 2001 From: "Tschaen, Brendan" Date: Wed, 3 Jul 2019 12:54:25 -0400 Subject: Merge if necessary after ownership Cleaned up merge if necessary code Change List to Set, which caused cascading changes.... Issue-ID: MUSIC-404 Signed-off-by: Tschaen, Brendan Change-Id: Ie7aaeb3ff43073eb3947515523e73037089e763d --- .../java/org/onap/music/mdbc/StateManagerTest.java | 6 +- .../org/onap/music/mdbc/mixins/MusicMixinTest.java | 14 +-- .../onap/music/mdbc/mixins/PostgresMixinTest.java | 3 +- .../org/onap/music/mdbc/ownership/DagTest.java | 118 ++++++++++----------- .../mdbc/ownership/OwnershipAndCheckpointTest.java | 8 +- 5 files changed, 75 insertions(+), 74 deletions(-) (limited to 'mdbc-server/src/test/java') diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/StateManagerTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/StateManagerTest.java index 899fff2..280c733 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/StateManagerTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/StateManagerTest.java @@ -53,7 +53,7 @@ public class StateManagerTest { @Test public void testGetEventualRanges() throws NoSuchFieldException, SecurityException { - List evList = new ArrayList<>(); + Set evList = new HashSet<>(); evList.add(new Range("eventualRange")); FieldSetter.setField(stateManager, stateManager.getClass().getDeclaredField("eventualRanges"), evList); assertEquals(evList, stateManager.getEventualRanges()); @@ -61,7 +61,7 @@ public class StateManagerTest { @Test public void testSetEventualRanges() { - List evList = new ArrayList<>(); + Set evList = new HashSet<>(); evList.add(new Range("eventualRange")); stateManager.setEventualRanges(evList); assertEquals(evList, stateManager.getEventualRanges()); @@ -116,7 +116,7 @@ public class StateManagerTest { allRanges.add(new Range("eventualRange")); Mockito.when(dbiMock.getSQLRangeSet()).thenReturn(allRanges); - List eventualRanges = new ArrayList(); + Set eventualRanges = new HashSet(); eventualRanges.add(new Range("eventualRange")); stateManager.setEventualRanges(eventualRanges); diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java index f2bbdcd..ef26cb6 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java @@ -115,7 +115,7 @@ public class MusicMixinTest { @Test public void own() { Range range = new Range("TEST.TABLE1"); - List ranges = new ArrayList<>(); + Set ranges = new HashSet<>(); ranges.add(range); DatabasePartition partition=null; try { @@ -139,7 +139,7 @@ public class MusicMixinTest { } } - private DatabasePartition addRow(List ranges,boolean isLatest){ + private DatabasePartition addRow(Set ranges,boolean isLatest){ final UUID uuid = MDBCUtils.generateTimebasedUniqueKey(); DatabasePartition dbPartition = new DatabasePartition(ranges,uuid,null); MusicRangeInformationRow newRow = new MusicRangeInformationRow(dbPartition, new ArrayList<>(), isLatest); @@ -161,19 +161,19 @@ public class MusicMixinTest { @Ignore // TODO: Move ownership tests to OwnershipAndCheckpointTest @Test(timeout=1000) public void own2() throws InterruptedException, MDBCServiceException { - List range12 = new ArrayList<>( Arrays.asList( + Set range12 = new HashSet<>( Arrays.asList( new Range("TEST.RANGE1"), new Range("TEST.RANGE2") )); - List range34 = new ArrayList<>( Arrays.asList( + Set range34 = new HashSet<>( Arrays.asList( new Range("TEST.RANGE3"), new Range("TEST.RANGE4") )); - List range24 = new ArrayList<>( Arrays.asList( + Set range24 = new HashSet<>( Arrays.asList( new Range("TEST.RANGE2"), new Range("TEST.RANGE4") )); - List range123 = new ArrayList<>( Arrays.asList( + Set range123 = new HashSet<>( Arrays.asList( new Range("TEST.RANGE1"), new Range("TEST.RANGE2"), new Range("TEST.RANGE3") @@ -225,7 +225,7 @@ public class MusicMixinTest { MusicRangeInformationRow row = mixin.getMusicRangeInformation(own.getRangeId()); assertTrue(row.getIsLatest()); DatabasePartition dbPartition = row.getDBPartition(); - List snapshot = dbPartition.getSnapshot(); + Set snapshot = dbPartition.getSnapshot(); assertEquals(3,snapshot.size()); MusicRangeInformationRow node5row = mixin.getMusicRangeInformation(node5.getId()); assertFalse(node5row.getIsLatest()); diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/PostgresMixinTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/PostgresMixinTest.java index 2134a79..a1cf2b1 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/PostgresMixinTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/PostgresMixinTest.java @@ -24,6 +24,7 @@ import static org.junit.Assert.*; import java.sql.*; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Properties; import java.util.Set; @@ -207,7 +208,7 @@ public class PostgresMixinTest { assertFalse(st.isEmpty()); cleanTestTable(); checkEmptyTestTable(); - List ranges = new ArrayList<>(); + Set ranges = new HashSet<>(); ranges.add(new Range("public.testtable")); try { mixin.applyTxDigest(st,ranges); diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/DagTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/DagTest.java index fa5583c..ee50dca 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/DagTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/DagTest.java @@ -43,12 +43,12 @@ import static org.junit.Assert.*; public class DagTest { - private MusicRangeInformationRow createNewRow(List ranges, String lockid, boolean isLatest){ + private MusicRangeInformationRow createNewRow(Set ranges, String lockid, boolean isLatest){ List redoLog = new ArrayList<>(); return createNewRow(ranges,lockid,isLatest,redoLog); } - private MusicRangeInformationRow createNewRow(List ranges, String lockid, boolean isLatest, + private MusicRangeInformationRow createNewRow(Set ranges, String lockid, boolean isLatest, List redoLog) { UUID id = MDBCUtils.generateTimebasedUniqueKey(); DatabasePartition dbPartition = new DatabasePartition(ranges, id, lockid); @@ -58,14 +58,14 @@ public class DagTest { @Test public void getDag() throws InterruptedException, MDBCServiceException { List rows = new ArrayList<>(); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range1") )); - rows.add(createNewRow(new ArrayList<>(ranges),"",false)); + rows.add(createNewRow(new HashSet<>(ranges),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",false)); + rows.add(createNewRow(new HashSet<>(ranges),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",true)); + rows.add(createNewRow(new HashSet<>(ranges),"",true)); Dag dag = Dag.getDag(rows, ranges); DagNode node1 = dag.getNode(rows.get(0).getPartitionIndex()); DagNode node2 = dag.getNode(rows.get(1).getPartitionIndex()); @@ -92,15 +92,15 @@ public class DagTest { List range2 = new ArrayList<>( Arrays.asList( new Range("schema.range2") )); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range2"), new Range("schema.range1") )); - rows.add(createNewRow(new ArrayList<>(range1),"",false)); + rows.add(createNewRow(new HashSet<>(range1),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",false)); + rows.add(createNewRow(new HashSet<>(range2),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",true)); + rows.add(createNewRow(new HashSet<>(ranges),"",true)); Dag dag = Dag.getDag(rows, ranges); DagNode node1 = dag.getNode(rows.get(0).getPartitionIndex()); DagNode node2 = dag.getNode(rows.get(1).getPartitionIndex()); @@ -122,14 +122,14 @@ public class DagTest { @Test public void nextToOwn() throws InterruptedException, MDBCServiceException { List rows = new ArrayList<>(); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range1") )); - rows.add(createNewRow(new ArrayList<>(ranges),"",false)); + rows.add(createNewRow(new HashSet<>(ranges),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",false)); + rows.add(createNewRow(new HashSet<>(ranges),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",true)); + rows.add(createNewRow(new HashSet<>(ranges),"",true)); Dag dag = Dag.getDag(rows, ranges); int counter = 0; while(dag.hasNextToOwn()){ @@ -148,23 +148,23 @@ public class DagTest { @Test public void nextToApply() throws InterruptedException { List rows = new ArrayList<>(); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range1") )); List redo1 = new ArrayList<>(Arrays.asList( new MusicTxDigestId(null,MDBCUtils.generateUniqueKey(),0) )); - rows.add(createNewRow(new ArrayList<>(ranges),"",false,redo1)); + rows.add(createNewRow(new HashSet<>(ranges),"",false,redo1)); MILLISECONDS.sleep(10); List redo2 = new ArrayList<>(Arrays.asList( new MusicTxDigestId(null,MDBCUtils.generateUniqueKey(),0) )); - rows.add(createNewRow(new ArrayList<>(ranges),"",false,redo2)); + rows.add(createNewRow(new HashSet<>(ranges),"",false,redo2)); MILLISECONDS.sleep(10); List redo3 = new ArrayList<>(Arrays.asList( new MusicTxDigestId(null,MDBCUtils.generateUniqueKey(),0) )); - rows.add(createNewRow(new ArrayList<>(ranges),"",true,redo3)); + rows.add(createNewRow(new HashSet<>(ranges),"",true,redo3)); Dag dag = Dag.getDag(rows, ranges); int nodeCounter = 0; HashSet rangesSet = new HashSet<>(ranges); @@ -194,26 +194,26 @@ public class DagTest { public void nextToApply2() throws InterruptedException, MDBCServiceException { Map> alreadyApplied = new HashMap<>(); List rows = new ArrayList<>(); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range1") )); List redo1 = new ArrayList<>(Arrays.asList( new MusicTxDigestId(null,MDBCUtils.generateUniqueKey(),0) )); - rows.add(createNewRow(new ArrayList<>(ranges),"",false,redo1)); + rows.add(createNewRow(new HashSet<>(ranges),"",false,redo1)); MILLISECONDS.sleep(10); List redo2 = new ArrayList<>(Arrays.asList( new MusicTxDigestId(null,MDBCUtils.generateUniqueKey(),0), new MusicTxDigestId(null,MDBCUtils.generateUniqueKey(),1) )); - MusicRangeInformationRow newRow = createNewRow(new ArrayList<>(ranges), "", false, redo2); + MusicRangeInformationRow newRow = createNewRow(new HashSet<>(ranges), "", false, redo2); alreadyApplied.put(new Range("schema.range1"),Pair.of(new MriReference(newRow.getPartitionIndex()), 0)); rows.add(newRow); MILLISECONDS.sleep(10); List redo3 = new ArrayList<>(Arrays.asList( new MusicTxDigestId(null,MDBCUtils.generateUniqueKey(),0) )); - rows.add(createNewRow(new ArrayList<>(ranges),"",true,redo3)); + rows.add(createNewRow(new HashSet<>(ranges),"",true,redo3)); Dag dag = Dag.getDag(rows, ranges); HashSet rangesSet = new HashSet<>(ranges); dag.setAlreadyApplied(alreadyApplied, rangesSet); @@ -249,22 +249,22 @@ public class DagTest { List range2 = new ArrayList<>( Arrays.asList( new Range("schema.range2") )); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range2"), new Range("schema.range1") )); - rows.add(createNewRow(new ArrayList<>(range1),"",false)); + rows.add(createNewRow(new HashSet<>(range1),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",false)); + rows.add(createNewRow(new HashSet<>(range2),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",true)); + rows.add(createNewRow(new HashSet<>(ranges),"",true)); List rows2 = new ArrayList<>(rows); List rows3 = new ArrayList<>(rows); MILLISECONDS.sleep(10); - rows3.add(createNewRow(new ArrayList<>(ranges),"",true)); + rows3.add(createNewRow(new HashSet<>(ranges),"",true)); Dag dag = Dag.getDag(rows, ranges); - Dag dag2 = Dag.getDag(rows2, new ArrayList<>(ranges)); - Dag dag3 = Dag.getDag(rows3, new ArrayList<>(ranges)); + Dag dag2 = Dag.getDag(rows2, new HashSet<>(ranges)); + Dag dag3 = Dag.getDag(rows3, new HashSet<>(ranges)); assertFalse(dag.isDifferent(dag2)); assertFalse(dag2.isDifferent(dag)); assertTrue(dag.isDifferent(dag3)); @@ -282,19 +282,19 @@ public class DagTest { List range2 = new ArrayList<>( Arrays.asList( new Range("schema.range2") )); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range2"), new Range("schema.range1") )); - rows.add(createNewRow(new ArrayList<>(range1),"",false)); + rows.add(createNewRow(new HashSet<>(range1),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",false)); + rows.add(createNewRow(new HashSet<>(range2),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range1),"",true)); + rows.add(createNewRow(new HashSet<>(range1),"",true)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",true)); + rows.add(createNewRow(new HashSet<>(range2),"",true)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",true)); + rows.add(createNewRow(new HashSet<>(ranges),"",true)); Dag dag = Dag.getDag(rows, ranges); List oldestDoubles = dag.getOldestDoubles(); assertTrue(oldestDoubles.contains(dag.getNode(rows.get(2).getPartitionIndex()))); @@ -312,22 +312,22 @@ public class DagTest { new Range("schema.range2"), new Range("schema.range3") )); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range2"), new Range("schema.range1") )); - rows.add(createNewRow(new ArrayList<>(range1),"",false)); + rows.add(createNewRow(new HashSet<>(range1),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",false)); + rows.add(createNewRow(new HashSet<>(range2),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range1),"",true)); + rows.add(createNewRow(new HashSet<>(range1),"",true)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",true)); + rows.add(createNewRow(new HashSet<>(range2),"",true)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",true)); + rows.add(createNewRow(new HashSet<>(ranges),"",true)); Dag dag = Dag.getDag(rows, ranges); - Pair, Set> incompleteRangesAndDependents = dag.getIncompleteRangesAndDependents(); - List incomplete = incompleteRangesAndDependents.getKey(); + Pair, Set> incompleteRangesAndDependents = dag.getIncompleteRangesAndDependents(); + Set incomplete = incompleteRangesAndDependents.getKey(); Set dependents = incompleteRangesAndDependents.getValue(); assertEquals(1,incomplete.size()); assertTrue(incomplete.contains(new Range("schema.range3"))); @@ -346,22 +346,22 @@ public class DagTest { new Range("schema.range2"), new Range("schema.range3") )); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range2"), new Range("schema.range1") )); - rows.add(createNewRow(new ArrayList<>(range1),"",false)); + rows.add(createNewRow(new HashSet<>(range1),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",false)); + rows.add(createNewRow(new HashSet<>(range2),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range1),"",true)); + rows.add(createNewRow(new HashSet<>(range1),"",true)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",true)); + rows.add(createNewRow(new HashSet<>(range2),"",true)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",true)); + rows.add(createNewRow(new HashSet<>(ranges),"",true)); Dag dag = Dag.getDag(rows, ranges); - Pair, Set> incompleteRangesAndDependents = dag.getIncompleteRangesAndDependents(); - List incomplete = incompleteRangesAndDependents.getKey(); + Pair, Set> incompleteRangesAndDependents = dag.getIncompleteRangesAndDependents(); + Set incomplete = incompleteRangesAndDependents.getKey(); Set dependents = incompleteRangesAndDependents.getValue(); assertEquals(2,incomplete.size()); assertTrue(incomplete.contains(new Range("schema.range3"))); @@ -381,26 +381,26 @@ public class DagTest { new Range("schema.range2"), new Range("schema.range3") )); - List ranges = new ArrayList<>( Arrays.asList( + Set ranges = new HashSet<>( Arrays.asList( new Range("schema.range2"), new Range("schema.range1") )); - List allRanges = new ArrayList<>( Arrays.asList( + Set allRanges = new HashSet<>( Arrays.asList( new Range("schema.range2"), new Range("schema.range3"), new Range("schema.range1") )); - rows.add(createNewRow(new ArrayList<>(range1),"",false)); + rows.add(createNewRow(new HashSet<>(range1),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",false)); + rows.add(createNewRow(new HashSet<>(range2),"",false)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range1),"",true)); + rows.add(createNewRow(new HashSet<>(range1),"",true)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(range2),"",true)); + rows.add(createNewRow(new HashSet<>(range2),"",true)); MILLISECONDS.sleep(10); - rows.add(createNewRow(new ArrayList<>(ranges),"",true)); + rows.add(createNewRow(new HashSet<>(ranges),"",true)); Dag dag = Dag.getDag(rows, ranges); - MusicRangeInformationRow newRow = createNewRow(new ArrayList<>(allRanges), "", true); + MusicRangeInformationRow newRow = createNewRow(new HashSet<>(allRanges), "", true); dag.addNewNodeWithSearch(newRow,allRanges); DagNode newNode = dag.getNode(newRow.getPartitionIndex()); DagNode node = dag.getNode(rows.get(4).getPartitionIndex()); diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java index 59f001c..2443d1e 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java @@ -171,7 +171,7 @@ public class OwnershipAndCheckpointTest { } } - private OwnershipReturn cleanAndOwnPartition(List ranges, UUID ownOpId) throws SQLException { + private OwnershipReturn cleanAndOwnPartition(Set ranges, UUID ownOpId) throws SQLException { dropAndCreateTable(); cleanAlreadyApplied(ownAndCheck); DatabasePartition currentPartition = new DatabasePartition(MDBCUtils.generateTimebasedUniqueKey()); @@ -214,7 +214,7 @@ public class OwnershipAndCheckpointTest { initDatabase(range); - List ranges = new ArrayList<>(); + Set ranges = new HashSet<>(); ranges.add(range); UUID ownOpId = MDBCUtils.generateTimebasedUniqueKey(); OwnershipReturn own = cleanAndOwnPartition(ranges,ownOpId); @@ -238,7 +238,7 @@ public class OwnershipAndCheckpointTest { initDatabase(range); - List ranges = new ArrayList<>(); + Set ranges = new HashSet<>(); ranges.add(range); UUID ownOpId = MDBCUtils.generateTimebasedUniqueKey(); OwnershipReturn own = cleanAndOwnPartition(ranges,ownOpId); @@ -260,7 +260,7 @@ public class OwnershipAndCheckpointTest { public void readOwn() throws Exception { Range range = new Range("TABLE1"); MusicInterface mi = MdbcTestUtils.getMusicMixin(); - List ranges = new ArrayList<>(); + Set ranges = new HashSet<>(); ranges.add(range); final DatabasePartition partition = TestUtils.createBasicRow(range, mi, MdbcTestUtils.getServerName()); TestUtils.unlockRow(MdbcTestUtils.getKeyspace(), MdbcTestUtils.getMriTableName(), partition); -- cgit 1.2.3-korg