Skip to content

Commit ea89817

Browse files
Clint Ascencioolim7t
authored andcommitted
Add capability to retrieve preparations in ScassandraCluster.
Also primes a query for retrieving peer by peer ip.
1 parent e446694 commit ea89817

2 files changed

Lines changed: 17 additions & 7 deletions

File tree

driver-core/src/test/java/com/datastax/driver/core/SCassandraCluster.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ public List<PreparedStatementExecution> retrievePreparedStatementExecutions(int
9898
return activityClients.get(node - 1).retrievePreparedStatementExecutions();
9999
}
100100

101+
public List<PreparedStatementPreparation> retrievePreparedStatementPreparations(int node) {
102+
return activityClients.get(node - 1).retrievePreparedStatementPreparations();
103+
}
104+
101105
public void clearAllPrimes() {
102106
for (PrimingClient primingClient : primingClients)
103107
primingClient.clearAllPrimes();
@@ -121,14 +125,24 @@ private void primePeers(PrimingClient primingClient, Scassandra toIgnore) {
121125
if (scassandras.get(i).equals(toIgnore))
122126
continue;
123127
InetAddress address = addresses.get(i);
124-
rows.add(ImmutableMap.<String, Object>builder()
128+
Map<String, ?> row = ImmutableMap.<String, Object>builder()
125129
.put("peer", address)
126130
.put("rpc_address", address)
127131
.put("data_center", "datacenter1")
128132
.put("rack", "rack1")
129133
.put("release_version", "2.0.1")
130134
.put("tokens", ImmutableSet.of(Long.toString(Long.MIN_VALUE + i)))
131-
.build());
135+
.build();
136+
137+
rows.add(row);
138+
139+
String query = "SELECT * FROM system.peers WHERE peer='" + address.toString().substring(1) + "'";
140+
primingClient.prime(
141+
PrimingRequest.queryBuilder()
142+
.withQuery(query)
143+
.withColumnTypes(SELECT_PEERS_COLUMN_TYPES)
144+
.withRows(row)
145+
.build());
132146
}
133147
primingClient.prime(
134148
PrimingRequest.queryBuilder()

pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@
6060
<testng.version>6.8.8</testng.version>
6161
<assertj.version>1.7.0</assertj.version>
6262
<mockito.version>1.10.8</mockito.version>
63-
<!--
64-
There are more recent versions of Scassandra but they require JDK 7,
65-
our build is still using JDK 6.
66-
-->
67-
<scassandra.version>0.4.1</scassandra.version>
63+
<scassandra.version>0.9.1</scassandra.version>
6864
<main.basedir>${project.basedir}</main.basedir>
6965
</properties>
7066

0 commit comments

Comments
 (0)