fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db69dcee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db69dcee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db69dcee Branch: refs/heads/trunk Commit: db69dceeb3aa92e23d22668ea3bfa953d33ada83 Parents: 71a5127 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jan 13 08:22:51 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jan 13 08:22:51 2014 -0600 ---------------------------------------------------------------------- .../cassandra/service/LeaveAndBootstrapTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db69dcee/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java index 4c1421a..a9d8057 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<Token> endpointTokens = new ArrayList<Token>(); - List<InetAddress> hosts = new ArrayList<InetAddress>(); + ArrayList<Token> endpointTokens = new ArrayList<>(); + List<InetAddress> hosts = new ArrayList<>(); Util.createInitialRing(ss, partitioner, endpointTokens, new ArrayList<Token>(), hosts, new ArrayList<UUID>(), 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<InetAddress> makeAddrs(String... hosts) throws UnknownHostException
