You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/05/28 17:40:16 UTC
[1/3] cassandra git commit: Fix check for non-empty slice start
Repository: cassandra
Updated Branches:
refs/heads/trunk 03f556ffa -> de0dcde6b
Fix check for non-empty slice start
Patch by Dave Brosius; reviewed by Tyler Hobbs as a follow up for
CASSANDRA-8502
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1662b14
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1662b14
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1662b14
Branch: refs/heads/trunk
Commit: f1662b1479c64213c06ac921631f7e1186619698
Parents: fb1eaab
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu May 28 10:37:58 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu May 28 10:38:43 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1662b14/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
index 9d5b705..65925b1 100644
--- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
@@ -184,7 +184,7 @@ public class SliceQueryFilter implements IDiskAtomFilter
}
else if (slice.includes(cmp, newStart))
{
- if (!reversed && sliceIncludesStatics(slice, cfm) && !newStart.equals(ByteBufferUtil.EMPTY_BYTE_BUFFER))
+ if (!reversed && sliceIncludesStatics(slice, cfm) && !newStart.isEmpty())
newSlices.add(new ColumnSlice(Composites.EMPTY, cfm.comparator.staticPrefix().end()));
newSlices.add(new ColumnSlice(newStart, slice.finish));
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ty...@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/de0dcde6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de0dcde6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de0dcde6
Branch: refs/heads/trunk
Commit: de0dcde6b7ac9fafd9f2e8a9c15c201f15deec0a
Parents: 03f556f 14b9866
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu May 28 10:40:01 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu May 28 10:40:01 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14b98665
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14b98665
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14b98665
Branch: refs/heads/trunk
Commit: 14b98665bdb1d4a6074317587d52082e17026506
Parents: 61bea5a f1662b1
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu May 28 10:39:37 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu May 28 10:39:37 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/14b98665/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
----------------------------------------------------------------------