You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/05/20 14:32:46 UTC
[1/2] cassandra git commit: Add a more verbose assert to
SQFWTT.testBeyondThresholdSelect()
Repository: cassandra
Updated Branches:
refs/heads/trunk 66772b7ab -> 684ef27dc
Add a more verbose assert to SQFWTT.testBeyondThresholdSelect()
patch by Ariel Weisberg; reveiwed by Aleksey Yeschenko for
CASSANDRA-9432
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0088e5f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0088e5f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0088e5f1
Branch: refs/heads/trunk
Commit: 0088e5f1e85bd344cbbc7f7ab2200b238fc855c4
Parents: f970de5
Author: Ariel Weisberg <ar...@weisberg.ws>
Authored: Tue May 19 17:16:10 2015 -0400
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed May 20 15:33:12 2015 +0300
----------------------------------------------------------------------
.../cassandra/cql3/SliceQueryFilterWithTombstonesTest.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0088e5f1/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithTombstonesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithTombstonesTest.java b/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithTombstonesTest.java
index 0cb9819..a3f7197 100644
--- a/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithTombstonesTest.java
+++ b/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithTombstonesTest.java
@@ -19,10 +19,11 @@ package org.apache.cassandra.cql3;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Throwables;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.filter.TombstoneOverwhelmingException;
@@ -84,7 +85,10 @@ public class SliceQueryFilterWithTombstonesTest extends CQLTester
}
catch (Throwable e)
{
- assertTrue(e instanceof TombstoneOverwhelmingException);
+ String error = "Expected exception instanceof TombstoneOverwhelmingException instead got "
+ + System.lineSeparator()
+ + Throwables.getStackTraceAsString(e);
+ assertTrue(error, e instanceof TombstoneOverwhelmingException);
}
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/684ef27d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/684ef27d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/684ef27d
Branch: refs/heads/trunk
Commit: 684ef27dc8c6469f896491cb56bed28f7fdacd93
Parents: 66772b7 0088e5f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed May 20 15:33:34 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed May 20 15:33:34 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------