natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix stress for CASSANDRA-2384 (patch by stuhood) 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089985 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sylvain Lebresne 2011-04-07 20:20:00 +00:00
parent 9026700d71
commit 65cdc6551f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/stress/bin/stress
View File

@ -48,4 +48,4 @@ if [ "x$JAVA" = "x" ]; then
exit 1
fi
$JAVA -server -cp $CLASSPATH org.apache.cassandra.contrib.stress.Stress $@
$JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.Stress $@

20
tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java
View File

@ -62,7 +62,7 @@ public class CounterAdder extends Operation
}
String rawKey = String.format(format, index);
Map<ByteBuffer, Map<String, List<CounterMutation>>> record = new HashMap<ByteBuffer, Map<String, List<CounterMutation>>>();
Map<ByteBuffer, Map<String, List<Mutation>>> record = new HashMap<ByteBuffer, Map<String, List<Mutation>>>();
record.put(ByteBufferUtil.bytes(rawKey), session.getColumnFamilyType() == ColumnFamilyType.Super
? getSuperColumnsMutationMap(superColumns)
@ -80,7 +80,7 @@ public class CounterAdder extends Operation
try
{
client.batch_add(record, session.getConsistencyLevel());
client.batch_mutate(record, session.getConsistencyLevel());
success = true;
}
catch (Exception e)
@ -104,15 +104,15 @@ public class CounterAdder extends Operation
session.latency.getAndAdd(System.currentTimeMillis() - start);
}
private Map<String, List<CounterMutation>> getSuperColumnsMutationMap(List<CounterSuperColumn> superColumns)
private Map<String, List<Mutation>> getSuperColumnsMutationMap(List<CounterSuperColumn> superColumns)
{
List<CounterMutation> mutations = new ArrayList<CounterMutation>();
Map<String, List<CounterMutation>> mutationMap = new HashMap<String, List<CounterMutation>>();
List<Mutation> mutations = new ArrayList<Mutation>();
Map<String, List<Mutation>> mutationMap = new HashMap<String, List<Mutation>>();
for (CounterSuperColumn s : superColumns)
{
Counter counter = new Counter().setSuper_column(s);
mutations.add(new CounterMutation().setCounter(counter));
mutations.add(new Mutation().setCounter(counter));
}
mutationMap.put("SuperCounter1", mutations);
@ -120,15 +120,15 @@ public class CounterAdder extends Operation
return mutationMap;
}
private Map<String, List<CounterMutation>> getColumnsMutationMap(List<CounterColumn> columns)
private Map<String, List<Mutation>> getColumnsMutationMap(List<CounterColumn> columns)
{
List<CounterMutation> mutations = new ArrayList<CounterMutation>();
Map<String, List<CounterMutation>> mutationMap = new HashMap<String, List<CounterMutation>>();
List<Mutation> mutations = new ArrayList<Mutation>();
Map<String, List<Mutation>> mutationMap = new HashMap<String, List<Mutation>>();
for (CounterColumn c : columns)
{
Counter counter = new Counter().setColumn(c);
mutations.add(new CounterMutation().setCounter(counter));
mutations.add(new Mutation().setCounter(counter));
}
mutationMap.put("Counter1", mutations);