You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2014/09/08 03:07:15 UTC
[2/3] git commit: fix merge of 7519
fix merge of 7519
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a44d641e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a44d641e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a44d641e
Branch: refs/heads/trunk
Commit: a44d641e8ff877be7f758221d125c7b94d6fd1e4
Parents: 77d0c17
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Sep 8 08:06:36 2014 +0700
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Sep 8 08:06:36 2014 +0700
----------------------------------------------------------------------
.../operations/SampledOpDistributionFactory.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a44d641e/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
index efc90bc..9e1a5e8 100644
--- a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
+++ b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
@@ -24,6 +24,7 @@ package org.apache.cassandra.stress.operations;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import org.apache.commons.math3.distribution.EnumeratedDistribution;
import org.apache.commons.math3.util.Pair;
@@ -36,9 +37,9 @@ import org.apache.cassandra.stress.util.Timer;
public abstract class SampledOpDistributionFactory<T> implements OpDistributionFactory
{
- final List<Pair<T, Double>> ratios;
+ final Map<T, Double> ratios;
final DistributionFactory clustering;
- protected SampledOpDistributionFactory(List<Pair<T, Double>> ratios, DistributionFactory clustering)
+ protected SampledOpDistributionFactory(Map<T, Double> ratios, DistributionFactory clustering)
{
this.ratios = ratios;
this.clustering = clustering;
@@ -51,34 +52,34 @@ public abstract class SampledOpDistributionFactory<T> implements OpDistributionF
{
PartitionGenerator generator = newGenerator();
List<Pair<Operation, Double>> operations = new ArrayList<>();
- for (Pair<T, Double> ratio : ratios)
- operations.add(new Pair<>(get(timer, generator, ratio.getFirst()), ratio.getSecond()));
+ for (Map.Entry<T, Double> ratio : ratios.entrySet())
+ operations.add(new Pair<>(get(timer, generator, ratio.getKey()), ratio.getValue()));
return new SampledOpDistribution(new EnumeratedDistribution<>(operations), clustering.get());
}
public String desc()
{
List<T> keys = new ArrayList<>();
- for (Pair<T, Double> p : ratios)
- keys.add(p.getFirst());
+ for (Map.Entry<T, Double> ratio : ratios.entrySet())
+ keys.add(ratio.getKey());
return keys.toString();
}
public Iterable<OpDistributionFactory> each()
{
List<OpDistributionFactory> out = new ArrayList<>();
- for (final Pair<T, Double> ratio : ratios)
+ for (final Map.Entry<T, Double> ratio : ratios.entrySet())
{
out.add(new OpDistributionFactory()
{
public OpDistribution get(Timer timer)
{
- return new FixedOpDistribution(SampledOpDistributionFactory.this.get(timer, newGenerator(), ratio.getFirst()));
+ return new FixedOpDistribution(SampledOpDistributionFactory.this.get(timer, newGenerator(), ratio.getKey()));
}
public String desc()
{
- return ratio.getFirst().toString();
+ return ratio.getKey().toString();
}
public Iterable<OpDistributionFactory> each()