Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 6c3a3e130 -> a8052d7c8
Fix more stress bugs (ninja) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8052d7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8052d7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8052d7c Branch: refs/heads/cassandra-2.1 Commit: a8052d7c812fd232d7a249aa5a72afdeaa9f4583 Parents: 6c3a3e1 Author: Jake Luciani <[email protected]> Authored: Mon Oct 6 10:36:41 2014 -0400 Committer: Jake Luciani <[email protected]> Committed: Mon Oct 6 10:36:41 2014 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/stress/generate/Partition.java | 7 +++++-- .../stress/operations/userdefined/SchemaInsert.java | 11 +++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8052d7c/tools/stress/src/org/apache/cassandra/stress/generate/Partition.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/Partition.java b/tools/stress/src/org/apache/cassandra/stress/generate/Partition.java index 18f5732..66f8c1d 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/Partition.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/Partition.java @@ -271,10 +271,13 @@ public class Partition tosort.add((Comparable) generator.generate()); Collections.sort(tosort); for (int i = 0 ; i < count ; i++) - if (i == 0 || tosort.get(i - 1).compareTo(i) < 0) - queue.add(tosort.get(i)); + queue.add(tosort.get(i)); break; } + else + { + throw new RuntimeException("Generator class is not comparable: "+generator.clazz); + } case ARBITRARY: unique.clear(); for (int i = 0 ; i < count ; i++) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8052d7c/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaInsert.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaInsert.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaInsert.java index ffa965f..8e20ab3 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaInsert.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaInsert.java @@ -84,7 +84,7 @@ public class SchemaInsert extends SchemaStatement // 65535 is max number of stmts per batch, so if we have more, we need to manually batch them for (int j = 0 ; j < stmts.size() ; j += 65535) { - List<BoundStatement> substmts = stmts.subList(j, Math.min(stmts.size(), j + 65535)); + List<BoundStatement> substmts = stmts.subList(j, Math.min(j + stmts.size(), j + 65535)); Statement stmt; if (stmts.size() == 1) { @@ -98,7 +98,14 @@ public class SchemaInsert extends SchemaStatement stmt = batch; } - validate(client.getSession().execute(stmt)); + try + { + validate(client.getSession().execute(stmt)); + } + catch (ClassCastException e) + { + e.printStackTrace(); + } } for (Partition.RowIterator iterator : iterators)
