Skip to content

Commit c095807

Browse files
committed
Explicitly specify consistency level in run_policy
The Datstax C++ driver has default ONE, the Scylla fork has LOCAL_ONE.
1 parent dda8bab commit c095807

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

tests/src/unit/tests/test_load_balancing.cpp

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,14 @@ void verify_sequence(QueryPlan* qp, const Vector<size_t>& sequence) {
9191

9292
typedef Map<Address, int> QueryCounts;
9393

94-
QueryCounts run_policy(LoadBalancingPolicy& policy, int count) {
94+
QueryCounts run_policy(LoadBalancingPolicy& policy, int count, CassConsistency consistency) {
9595
QueryCounts counts;
9696
for (int i = 0; i < count; ++i) {
97-
ScopedPtr<QueryPlan> qp(policy.new_query_plan("ks", NULL, NULL));
97+
QueryRequest::Ptr request(new QueryRequest("", 0));
98+
request->set_consistency(consistency);
99+
SharedRefPtr<RequestHandler> request_handler(
100+
new RequestHandler(request, ResponseFuture::Ptr()));
101+
ScopedPtr<QueryPlan> qp(policy.new_query_plan("ks", request_handler.get(), NULL));
98102
Host::Ptr host(qp->compute_next());
99103
if (host) {
100104
counts[host->address()] += 1;
@@ -309,31 +313,31 @@ TEST(RoundRobinLoadBalancingUnitTest, VerifyEqualDistribution) {
309313
policy.init(SharedRefPtr<Host>(), hosts, NULL, "");
310314

311315
{ // All nodes
312-
QueryCounts counts(run_policy(policy, 12));
316+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
313317
ASSERT_EQ(counts.size(), 3u);
314318
verify_query_counts(counts, 4);
315319
}
316320

317321
policy.on_host_down(hosts.begin()->first);
318322

319323
{ // One node down
320-
QueryCounts counts(run_policy(policy, 12));
324+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
321325
ASSERT_EQ(counts.size(), 2u);
322326
verify_query_counts(counts, 6);
323327
}
324328

325329
policy.on_host_up(hosts.begin()->second);
326330

327331
{ // All nodes again
328-
QueryCounts counts(run_policy(policy, 12));
332+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
329333
ASSERT_EQ(counts.size(), 3u);
330334
verify_query_counts(counts, 4);
331335
}
332336

333337
policy.on_host_removed(hosts.begin()->second);
334338

335339
{ // One node removed
336-
QueryCounts counts(run_policy(policy, 12));
340+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
337341
ASSERT_EQ(counts.size(), 2u);
338342
verify_query_counts(counts, 6);
339343
}
@@ -559,7 +563,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionLocalDc) {
559563
policy.init(hosts.begin()->second, hosts, NULL, "");
560564

561565
{ // All local nodes
562-
QueryCounts counts(run_policy(policy, 12));
566+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
563567
verify_dcs(counts, hosts, LOCAL_DC);
564568
ASSERT_EQ(counts.size(), 3u);
565569
verify_query_counts(counts, 4);
@@ -568,7 +572,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionLocalDc) {
568572
policy.on_host_down(hosts.begin()->first);
569573

570574
{ // One local node down
571-
QueryCounts counts(run_policy(policy, 12));
575+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
572576
verify_dcs(counts, hosts, LOCAL_DC);
573577
ASSERT_EQ(counts.size(), 2u);
574578
verify_query_counts(counts, 6);
@@ -577,7 +581,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionLocalDc) {
577581
policy.on_host_up(hosts.begin()->second);
578582

579583
{ // All local nodes again
580-
QueryCounts counts(run_policy(policy, 12));
584+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
581585
verify_dcs(counts, hosts, LOCAL_DC);
582586
ASSERT_EQ(counts.size(), 3u);
583587
verify_query_counts(counts, 4);
@@ -586,7 +590,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionLocalDc) {
586590
policy.on_host_removed(hosts.begin()->second);
587591

588592
{ // One local node removed
589-
QueryCounts counts(run_policy(policy, 12));
593+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
590594
verify_dcs(counts, hosts, LOCAL_DC);
591595
ASSERT_EQ(counts.size(), 2u);
592596
verify_query_counts(counts, 6);
@@ -612,7 +616,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionRemoteDc) {
612616
}
613617

614618
{ // All remote nodes
615-
QueryCounts counts(run_policy(policy, 12));
619+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
616620
verify_dcs(counts, hosts, REMOTE_DC);
617621
ASSERT_EQ(counts.size(), 3u);
618622
verify_query_counts(counts, 4);
@@ -621,7 +625,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionRemoteDc) {
621625
policy.on_host_down(remote_dc_node1->address());
622626

623627
{ // One remote node down
624-
QueryCounts counts(run_policy(policy, 12));
628+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
625629
verify_dcs(counts, hosts, REMOTE_DC);
626630
ASSERT_EQ(counts.size(), 2u);
627631
verify_query_counts(counts, 6);
@@ -630,7 +634,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionRemoteDc) {
630634
policy.on_host_up(remote_dc_node1);
631635

632636
{ // All remote nodes again
633-
QueryCounts counts(run_policy(policy, 12));
637+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
634638
verify_dcs(counts, hosts, REMOTE_DC);
635639
ASSERT_EQ(counts.size(), 3u);
636640
verify_query_counts(counts, 4);
@@ -639,7 +643,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionRemoteDc) {
639643
policy.on_host_removed(remote_dc_node1);
640644

641645
{ // One remote node removed
642-
QueryCounts counts(run_policy(policy, 12));
646+
QueryCounts counts(run_policy(policy, 12, CASS_CONSISTENCY_ONE));
643647
verify_dcs(counts, hosts, REMOTE_DC);
644648
ASSERT_EQ(counts.size(), 2u);
645649
verify_query_counts(counts, 6);

0 commit comments

Comments
 (0)