Skip to content

Commit 499ce9d

Browse files
tolbertamolim7t
authored andcommitted
Include schema_version in primed peers and local queries.
1 parent 4426f54 commit 499ce9d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public class ScassandraCluster {
5252

5353
private final List<Map<String, ?>> keyspaceRows;
5454

55+
private static final java.util.UUID schemaVersion = UUIDs.random();
56+
5557

5658
private final Map<Integer, Map<Integer, Map<String, Object>>> forcedPeerInfos;
5759

@@ -297,6 +299,7 @@ private void primeMetadata(Scassandra node) {
297299
addPeerInfo(row, dc, n + 1, "rack", getPeerInfo(dc, n + 1, "rack", "rack1"));
298300
addPeerInfo(row, dc, n + 1, "release_version", getPeerInfo(dc, n + 1, "release_version", "2.1.8"));
299301
addPeerInfo(row, dc, n + 1, "tokens", ImmutableSet.of(tokens.get(n)));
302+
addPeerInfo(row, dc, n + 1, "schema_version", schemaVersion);
300303
} else { // prime system.peers.
301304
query = "SELECT * FROM system.peers WHERE peer='" + address + "'";
302305
metadata = SELECT_PEERS;
@@ -308,6 +311,7 @@ private void primeMetadata(Scassandra node) {
308311
addPeerInfo(row, dc, n + 1, "release_version", getPeerInfo(dc, n + 1, "release_version", "2.1.8"));
309312
addPeerInfo(row, dc, n + 1, "tokens", ImmutableSet.of(Long.toString(tokens.get(n))));
310313
addPeerInfo(row, dc, n + 1, "host_id", UUIDs.random());
314+
addPeerInfo(row, dc, n + 1, "schema_version", schemaVersion);
311315
rows.add(row);
312316
}
313317
client.prime(PrimingRequest.queryBuilder()
@@ -379,7 +383,8 @@ private Object getPeerInfo(int dc, int node, String property, Object defaultValu
379383
column("rack", TEXT),
380384
column("release_version", TEXT),
381385
column("tokens", set(TEXT)),
382-
column("host_id", UUID)
386+
column("host_id", UUID),
387+
column("schema_version", UUID)
383388
};
384389

385390
public static final org.scassandra.http.client.types.ColumnMetadata[] SELECT_LOCAL = {
@@ -394,6 +399,7 @@ private Object getPeerInfo(int dc, int node, String property, Object defaultValu
394399
column("rack", TEXT),
395400
column("release_version", TEXT),
396401
column("tokens", set(TEXT)),
402+
column("schema_version", UUID)
397403
};
398404

399405
static final org.scassandra.http.client.types.ColumnMetadata[] SELECT_CLUSTER_NAME = {

0 commit comments

Comments
 (0)