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

Fix for stress.java using wrong key names and not detecting empty keys. 

Patch by Pavel Yaskevich, reviewed by brandonwilliams for CASSANDRA-1915

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1053715 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brandon Williams 2010-12-29 19:38:00 +00:00
parent df9e121fd9
commit 1d8ba59c9b
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java
View File

@ -164,7 +164,7 @@ public class Session
columnFamilyType = ColumnFamilyType.valueOf(cmd.getOptionValue("y"));
if (cmd.hasOption("k"))
ignoreErrors = Boolean.parseBoolean(cmd.getOptionValue("k"));
ignoreErrors = true;
if (cmd.hasOption("i"))
progressInterval = Integer.parseInt(cmd.getOptionValue("i"));

14
contrib/stress/src/org/apache/cassandra/contrib/stress/tests/Reader.java
View File

@ -75,9 +75,12 @@ public class Reader extends OperationThread
List<ColumnOrSuperColumn> columns;
columns = client.get_slice(key, parent, predicate, session.getConsistencyLevel());
if (columns == null)
if (columns.size() == 0)
{
throw new RuntimeException(String.format("Key %s not found.", superColumn));
System.err.println(String.format("Key %s not found.", superColumn));
if (!session.ignoreErrors())
break;
}
}
catch (Exception e)
@ -111,9 +114,12 @@ public class Reader extends OperationThread
List<ColumnOrSuperColumn> columns;
columns = client.get_slice(keyBuffer, parent, predicate, session.getConsistencyLevel());
if (columns == null)
if (columns.size() == 0)
{
throw new RuntimeException(String.format("Key %s not found.", key.toString()));
System.err.println(String.format("Key %s not found.", new String(key)));
if (!session.ignoreErrors())
break;
}
}
catch (Exception e)

4
contrib/stress/src/org/apache/cassandra/contrib/stress/util/OperationThread.java
View File

@ -101,7 +101,7 @@ public abstract class OperationThread extends Thread
*/
private byte[] generateGaussKey()
{
String format = "%0" + session.getTotalKeysLength() + "f";
String format = "%0" + session.getTotalKeysLength() + "d";
for (;;)
{
@ -109,7 +109,7 @@ public abstract class OperationThread extends Thread
if (0 <= token && token < session.getNumKeys())
{
return String.format(format, token).getBytes();
return String.format(format, (int) token).getBytes();
}
}
}