Upgrade to simulacron 0.8.4

tolbertam · tolbertam · commit 96d6f34cd39f · 2018-08-09T18:13:50.000-05:00
Adds supports for peers_v2 table.  With existing configuration this
will just cause simulacron to return an INVALID error when querying
peers_v2, which matches pre C* 4 versions.

Updates SortingLoadBalancingPolicy to consider port when ordering
nodes.
diff --git a/pom.xml b/pom.xml
@@ -63,7 +63,7 @@
     <junit.version>4.12</junit.version>
     <logback.version>1.2.3</logback.version>
     <pax-exam.version>4.12.0</pax-exam.version>
-    <simulacron.version>0.8.3</simulacron.version>
+    <simulacron.version>0.8.4</simulacron.version>
   </properties>
 
   <dependencyManagement>
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/loadbalancing/SortingLoadBalancingPolicy.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/loadbalancing/SortingLoadBalancingPolicy.java
@@ -67,7 +67,9 @@ public SortingLoadBalancingPolicy(DriverContext context, String profileName) {
                 return b1 - b2;
               }
             }
-            return 0;
+            int port1 = node1.getBroadcastAddress().map(InetSocketAddress::getPort).orElse(0);
+            int port2 = node2.getBroadcastAddress().map(InetSocketAddress::getPort).orElse(0);
+            return port1 - port2;
           });
 
   public SortingLoadBalancingPolicy() {}
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/simulacron/SimulacronRule.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/simulacron/SimulacronRule.java
@@ -19,9 +19,9 @@
 import com.datastax.oss.driver.api.core.ProtocolVersion;
 import com.datastax.oss.driver.api.testinfra.CassandraResourceRule;
 import com.datastax.oss.simulacron.common.cluster.ClusterSpec;
-import com.datastax.oss.simulacron.server.AddressResolver;
 import com.datastax.oss.simulacron.server.BoundCluster;
 import com.datastax.oss.simulacron.server.BoundNode;
+import com.datastax.oss.simulacron.server.Inet4Resolver;
 import com.datastax.oss.simulacron.server.Server;
 import java.net.InetSocketAddress;
 import java.util.Set;
@@ -31,7 +31,7 @@
 public class SimulacronRule extends CassandraResourceRule {
   // TODO perhaps share server some other way
   public static final Server server =
-      Server.builder().withAddressResolver(new AddressResolver.Inet4Resolver(9043)).build();
+      Server.builder().withAddressResolver(new Inet4Resolver(9043)).build();
 
   private final ClusterSpec clusterSpec;
   private BoundCluster boundCluster;

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,9 @@ public SortingLoadBalancingPolicy(DriverContext context, String profileName) {`
`67`	`67`	`return b1 - b2;`
`68`	`68`	`}`
`69`	`69`	`}`
`70`		`- return 0;`
	`70`	`+ int port1 = node1.getBroadcastAddress().map(InetSocketAddress::getPort).orElse(0);`
	`71`	`+ int port2 = node2.getBroadcastAddress().map(InetSocketAddress::getPort).orElse(0);`
	`72`	`+ return port1 - port2;`
`71`	`73`	`});`
`72`	`74`
`73`	`75`	`public SortingLoadBalancingPolicy() {}`