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 2014/04/01 22:26:36 UTC
[1/3] git commit: Clearer message for assertion error
Repository: cassandra
Updated Branches:
refs/heads/trunk 6660970c3 -> f94a7af17
Clearer message for assertion error
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55fba6ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55fba6ab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55fba6ab
Branch: refs/heads/trunk
Commit: 55fba6ab0b5521711ed5c33a2d8ddadd2edd8906
Parents: d8c29a3
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Apr 1 12:09:27 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Apr 1 12:09:27 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/filter/ExtendedFilter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/55fba6ab/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
index 5aa1ea9..5c3662b 100644
--- a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
@@ -255,7 +255,8 @@ public abstract class ExtendedFilter
* 2) We don't yet allow non-indexed range slice with filters in CQL3 (i.e. this will never be
* called by CFS.filter() for composites).
*/
- assert !(cfs.getComparator() instanceof CompositeType);
+ assert !(cfs.getComparator() instanceof CompositeType) : "Sequential scan with filters is not supported (if you just created an index, you "
+ + "need to wait for the creation to be propagated to all nodes before querying it)";
if (!needsExtraQuery(rowKey.key, data))
return null;
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6b58261
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6b58261
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6b58261
Branch: refs/heads/trunk
Commit: d6b582614f4f2c9cdd391623b340b2732311b98d
Parents: 353b214 55fba6a
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Apr 1 23:25:19 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Apr 1 23:25:19 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/filter/ExtendedFilter.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6b58261/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
index 7326d80,5c3662b..6bf25b1
--- a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
@@@ -253,6 -255,9 +253,9 @@@ public abstract class ExtendedFilte
* 2) We don't yet allow non-indexed range slice with filters in CQL3 (i.e. this will never be
* called by CFS.filter() for composites).
*/
- assert !(cfs.getComparator() instanceof CompositeType) : "Sequential scan with filters is not supported (if you just created an index, you "
- + "need to wait for the creation to be propagated to all nodes before querying it)";
++ assert !(cfs.getComparator().isCompound()) : "Sequential scan with filters is not supported (if you just created an index, you "
++ + "need to wait for the creation to be propagated to all nodes before querying it)";
+
if (!needsExtraQuery(rowKey.key, data))
return null;
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f94a7af1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f94a7af1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f94a7af1
Branch: refs/heads/trunk
Commit: f94a7af1737db714fac29330d1e0c0d67bd51c7d
Parents: 6660970 d6b5826
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Apr 1 23:26:19 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Apr 1 23:26:19 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/filter/ExtendedFilter.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------