Author: brandonwilliams Date: Wed Dec 29 19:38:00 2010 New Revision: 1053715
URL: http://svn.apache.org/viewvc?rev=1053715&view=rev Log: Fix for stress.java using wrong key names and not detecting empty keys. Patch by Pavel Yaskevich, reviewed by brandonwilliams for CASSANDRA-1915 Modified: cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/tests/Reader.java cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/OperationThread.java Modified: cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java?rev=1053715&r1=1053714&r2=1053715&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java (original) +++ cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java Wed Dec 29 19:38:00 2010 @@ -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")); Modified: cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/tests/Reader.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/tests/Reader.java?rev=1053715&r1=1053714&r2=1053715&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/tests/Reader.java (original) +++ cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/tests/Reader.java Wed Dec 29 19:38:00 2010 @@ -75,9 +75,12 @@ public class Reader extends OperationThr 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 OperationThr 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) Modified: cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/OperationThread.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/OperationThread.java?rev=1053715&r1=1053714&r2=1053715&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/OperationThread.java (original) +++ cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/OperationThread.java Wed Dec 29 19:38:00 2010 @@ -101,7 +101,7 @@ public abstract class OperationThread ex */ private byte[] generateGaussKey() { - String format = "%0" + session.getTotalKeysLength() + "f"; + String format = "%0" + session.getTotalKeysLength() + "d"; for (;;) { @@ -109,7 +109,7 @@ public abstract class OperationThread ex if (0 <= token && token < session.getNumKeys()) { - return String.format(format, token).getBytes(); + return String.format(format, (int) token).getBytes(); } } }
