cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/3] cassandra git commit: Fix check for non-empty slice start
Date Thu, 28 May 2015 15:40:16 GMT
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 <tylerlhobbs@gmail.com>
Authored: Thu May 28 10:37:58 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@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));


Mime
View raw message