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/15 16:57:05 UTC
cassandra git commit: Clone SliceQueryFilter in AbstractReadCommand
implementations
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 b2a2d4635 -> d4755287a
Clone SliceQueryFilter in AbstractReadCommand implementations
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for
CASSANDRA-8940
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4755287
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4755287
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4755287
Branch: refs/heads/cassandra-2.0
Commit: d4755287a35362a8728ef6929a5d30644788d9e7
Parents: b2a2d46
Author: blerer <be...@datastax.com>
Authored: Fri May 8 22:33:21 2015 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri May 15 17:57:26 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/PagedRangeCommand.java | 4 ++--
src/java/org/apache/cassandra/db/RangeSliceCommand.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4755287/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c3e84db..00cc335 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.16:
+ * Clone SliceQueryFilter in AbstractReadCommand implementations (CASSANDRA-8940)
* Push correct protocol notification for DROP INDEX (CASSANDRA-9310)
* token-generator - generated tokens too long (CASSANDRA-9300)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4755287/src/java/org/apache/cassandra/db/PagedRangeCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/PagedRangeCommand.java b/src/java/org/apache/cassandra/db/PagedRangeCommand.java
index 3bc6539..a640d4e 100644
--- a/src/java/org/apache/cassandra/db/PagedRangeCommand.java
+++ b/src/java/org/apache/cassandra/db/PagedRangeCommand.java
@@ -71,7 +71,7 @@ public class PagedRangeCommand extends AbstractRangeCommand
columnFamily,
timestamp,
subRange,
- (SliceQueryFilter)predicate,
+ ((SliceQueryFilter) predicate).cloneShallow(),
newStart,
newStop,
rowFilter,
@@ -84,7 +84,7 @@ public class PagedRangeCommand extends AbstractRangeCommand
columnFamily,
timestamp,
keyRange,
- (SliceQueryFilter)predicate,
+ ((SliceQueryFilter) predicate).cloneShallow(),
start,
stop,
rowFilter,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4755287/src/java/org/apache/cassandra/db/RangeSliceCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RangeSliceCommand.java b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
index 553f111..fdf3ccc 100644
--- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java
+++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
@@ -95,7 +95,7 @@ public class RangeSliceCommand extends AbstractRangeCommand implements Pageable
return new RangeSliceCommand(keyspace,
columnFamily,
timestamp,
- predicate,
+ predicate.cloneShallow(),
subRange,
rowFilter,
maxResults,
@@ -108,7 +108,7 @@ public class RangeSliceCommand extends AbstractRangeCommand implements Pageable
return new RangeSliceCommand(keyspace,
columnFamily,
timestamp,
- predicate,
+ predicate.cloneShallow(),
keyRange,
rowFilter,
newLimit,