From a8052d7c812fd232d7a249aa5a72afdeaa9f4583 Mon Sep 17 00:00:00 2001
From: Jake Luciani <jake@apache.org>
Date: Mon, 6 Oct 2014 10:36:41 -0400
Subject: [PATCH] Fix more stress bugs (ninja)

---
 .../apache/cassandra/stress/generate/Partition.java   |  7 +++++--
 .../stress/operations/userdefined/SchemaInsert.java   | 11 +++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

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 18f5732af8..66f8c1d71d 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++)
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 ffa965fcde..8e20ab3780 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)