@@ -91,10 +91,14 @@ void verify_sequence(QueryPlan* qp, const Vector<size_t>& sequence) {
91
91
92
92
typedef Map<Address, int > QueryCounts;
93
93
94
- QueryCounts run_policy (LoadBalancingPolicy& policy, int count) {
94
+ QueryCounts run_policy (LoadBalancingPolicy& policy, int count, CassConsistency consistency ) {
95
95
QueryCounts counts;
96
96
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 ));
98
102
Host::Ptr host (qp->compute_next ());
99
103
if (host) {
100
104
counts[host->address ()] += 1 ;
@@ -309,31 +313,31 @@ TEST(RoundRobinLoadBalancingUnitTest, VerifyEqualDistribution) {
309
313
policy.init (SharedRefPtr<Host>(), hosts, NULL , " " );
310
314
311
315
{ // All nodes
312
- QueryCounts counts (run_policy (policy, 12 ));
316
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
313
317
ASSERT_EQ (counts.size (), 3u );
314
318
verify_query_counts (counts, 4 );
315
319
}
316
320
317
321
policy.on_host_down (hosts.begin ()->first );
318
322
319
323
{ // One node down
320
- QueryCounts counts (run_policy (policy, 12 ));
324
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
321
325
ASSERT_EQ (counts.size (), 2u );
322
326
verify_query_counts (counts, 6 );
323
327
}
324
328
325
329
policy.on_host_up (hosts.begin ()->second );
326
330
327
331
{ // All nodes again
328
- QueryCounts counts (run_policy (policy, 12 ));
332
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
329
333
ASSERT_EQ (counts.size (), 3u );
330
334
verify_query_counts (counts, 4 );
331
335
}
332
336
333
337
policy.on_host_removed (hosts.begin ()->second );
334
338
335
339
{ // One node removed
336
- QueryCounts counts (run_policy (policy, 12 ));
340
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
337
341
ASSERT_EQ (counts.size (), 2u );
338
342
verify_query_counts (counts, 6 );
339
343
}
@@ -559,7 +563,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionLocalDc) {
559
563
policy.init (hosts.begin ()->second , hosts, NULL , " " );
560
564
561
565
{ // All local nodes
562
- QueryCounts counts (run_policy (policy, 12 ));
566
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
563
567
verify_dcs (counts, hosts, LOCAL_DC);
564
568
ASSERT_EQ (counts.size (), 3u );
565
569
verify_query_counts (counts, 4 );
@@ -568,7 +572,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionLocalDc) {
568
572
policy.on_host_down (hosts.begin ()->first );
569
573
570
574
{ // One local node down
571
- QueryCounts counts (run_policy (policy, 12 ));
575
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
572
576
verify_dcs (counts, hosts, LOCAL_DC);
573
577
ASSERT_EQ (counts.size (), 2u );
574
578
verify_query_counts (counts, 6 );
@@ -577,7 +581,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionLocalDc) {
577
581
policy.on_host_up (hosts.begin ()->second );
578
582
579
583
{ // All local nodes again
580
- QueryCounts counts (run_policy (policy, 12 ));
584
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
581
585
verify_dcs (counts, hosts, LOCAL_DC);
582
586
ASSERT_EQ (counts.size (), 3u );
583
587
verify_query_counts (counts, 4 );
@@ -586,7 +590,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionLocalDc) {
586
590
policy.on_host_removed (hosts.begin ()->second );
587
591
588
592
{ // One local node removed
589
- QueryCounts counts (run_policy (policy, 12 ));
593
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
590
594
verify_dcs (counts, hosts, LOCAL_DC);
591
595
ASSERT_EQ (counts.size (), 2u );
592
596
verify_query_counts (counts, 6 );
@@ -612,7 +616,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionRemoteDc) {
612
616
}
613
617
614
618
{ // All remote nodes
615
- QueryCounts counts (run_policy (policy, 12 ));
619
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
616
620
verify_dcs (counts, hosts, REMOTE_DC);
617
621
ASSERT_EQ (counts.size (), 3u );
618
622
verify_query_counts (counts, 4 );
@@ -621,7 +625,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionRemoteDc) {
621
625
policy.on_host_down (remote_dc_node1->address ());
622
626
623
627
{ // One remote node down
624
- QueryCounts counts (run_policy (policy, 12 ));
628
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
625
629
verify_dcs (counts, hosts, REMOTE_DC);
626
630
ASSERT_EQ (counts.size (), 2u );
627
631
verify_query_counts (counts, 6 );
@@ -630,7 +634,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionRemoteDc) {
630
634
policy.on_host_up (remote_dc_node1);
631
635
632
636
{ // All remote nodes again
633
- QueryCounts counts (run_policy (policy, 12 ));
637
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
634
638
verify_dcs (counts, hosts, REMOTE_DC);
635
639
ASSERT_EQ (counts.size (), 3u );
636
640
verify_query_counts (counts, 4 );
@@ -639,7 +643,7 @@ TEST(DatacenterAwareLoadBalancingUnitTest, VerifyEqualDistributionRemoteDc) {
639
643
policy.on_host_removed (remote_dc_node1);
640
644
641
645
{ // One remote node removed
642
- QueryCounts counts (run_policy (policy, 12 ));
646
+ QueryCounts counts (run_policy (policy, 12 , CASS_CONSISTENCY_ONE ));
643
647
verify_dcs (counts, hosts, REMOTE_DC);
644
648
ASSERT_EQ (counts.size (), 2u );
645
649
verify_query_counts (counts, 6 );
0 commit comments