From fbd51b77a047f2a04a94c4b474881c2be9bf1171 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Fri, 10 Jan 2014 13:50:35 -0600 Subject: [PATCH 1/2] fix tests --- .../cassandra/service/LeaveAndBootstrapTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java index a9d8057e07..4c1421a8b2 100644 --- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java +++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java @@ -24,7 +24,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.*; -import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.db.SystemTable; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.config.Schema; import org.junit.Test; @@ -661,14 +661,14 @@ public class LeaveAndBootstrapTest VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(partitioner); // create a ring of 2 nodes - ArrayList endpointTokens = new ArrayList<>(); - List hosts = new ArrayList<>(); + ArrayList endpointTokens = new ArrayList(); + List hosts = new ArrayList(); Util.createInitialRing(ss, partitioner, endpointTokens, new ArrayList(), hosts, new ArrayList(), 2); InetAddress toRemove = hosts.get(1); - SystemKeyspace.updatePeerInfo(toRemove, "data_center", "'dc42'"); - SystemKeyspace.updatePeerInfo(toRemove, "rack", "'rack42'"); - assertEquals("rack42", SystemKeyspace.loadDcRackInfo().get(toRemove).get("rack")); + SystemTable.updatePeerInfo(toRemove, "data_center", "'dc42'"); + SystemTable.updatePeerInfo(toRemove, "rack", "'rack42'"); + assertEquals("rack42", SystemTable.loadDcRackInfo().get(toRemove).get("rack")); // mark the node as removed Gossiper.instance.injectApplicationState(toRemove, ApplicationState.STATUS, @@ -678,7 +678,7 @@ public class LeaveAndBootstrapTest // state changes made after the endpoint has left should be ignored ss.onChange(hosts.get(1), ApplicationState.RACK, valueFactory.rack("rack9999")); - assertEquals("rack42", SystemKeyspace.loadDcRackInfo().get(toRemove).get("rack")); + assertEquals("rack42", SystemTable.loadDcRackInfo().get(toRemove).get("rack")); } private static Collection makeAddrs(String... hosts) throws UnknownHostException From 2bfaf8f8d991588de43fe3d194a447fe4279cb44 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Fri, 10 Jan 2014 13:53:32 -0600 Subject: [PATCH 2/2] Revert "fix tests" This reverts commit fbd51b77a047f2a04a94c4b474881c2be9bf1171. --- .../cassandra/service/LeaveAndBootstrapTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java index 4c1421a8b2..a9d8057e07 100644 --- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java +++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java @@ -24,7 +24,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.*; -import org.apache.cassandra.db.SystemTable; +import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.config.Schema; import org.junit.Test; @@ -661,14 +661,14 @@ public class LeaveAndBootstrapTest VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(partitioner); // create a ring of 2 nodes - ArrayList endpointTokens = new ArrayList(); - List hosts = new ArrayList(); + ArrayList endpointTokens = new ArrayList<>(); + List hosts = new ArrayList<>(); Util.createInitialRing(ss, partitioner, endpointTokens, new ArrayList(), hosts, new ArrayList(), 2); InetAddress toRemove = hosts.get(1); - SystemTable.updatePeerInfo(toRemove, "data_center", "'dc42'"); - SystemTable.updatePeerInfo(toRemove, "rack", "'rack42'"); - assertEquals("rack42", SystemTable.loadDcRackInfo().get(toRemove).get("rack")); + SystemKeyspace.updatePeerInfo(toRemove, "data_center", "'dc42'"); + SystemKeyspace.updatePeerInfo(toRemove, "rack", "'rack42'"); + assertEquals("rack42", SystemKeyspace.loadDcRackInfo().get(toRemove).get("rack")); // mark the node as removed Gossiper.instance.injectApplicationState(toRemove, ApplicationState.STATUS, @@ -678,7 +678,7 @@ public class LeaveAndBootstrapTest // state changes made after the endpoint has left should be ignored ss.onChange(hosts.get(1), ApplicationState.RACK, valueFactory.rack("rack9999")); - assertEquals("rack42", SystemTable.loadDcRackInfo().get(toRemove).get("rack")); + assertEquals("rack42", SystemKeyspace.loadDcRackInfo().get(toRemove).get("rack")); } private static Collection makeAddrs(String... hosts) throws UnknownHostException