cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9
Date Fri, 15 Jul 2016 22:57:26 GMT
Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/136f6b1c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/136f6b1c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/136f6b1c

Branch: refs/heads/trunk
Commit: 136f6b1c740184da6377ffc3afc9d3f03ba1a14e
Parents: b0ab12f 557c596
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Fri Jul 15 17:56:32 2016 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Fri Jul 15 17:56:32 2016 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/ReadResponse.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/136f6b1c/src/java/org/apache/cassandra/db/ReadResponse.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ReadResponse.java
index 140652d,2304cb4..05ebd00
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@@ -282,12 -282,17 +282,17 @@@ public abstract class ReadRespons
  
                      // Pre-3.0, we didn't have a way to express exclusivity for non-composite
comparators, so all slices were
                      // inclusive on both ends. If we have exclusive slice ends, we need
to filter the results here.
+                     UnfilteredRowIterator iterator;
                      if (!command.metadata().isCompound())
-                         return ThriftResultsMerger.maybeWrap(
-                                 partition.unfilteredIterator(command.columnFilter(), filter.getSlices(command.metadata()),
filter.isReversed()), command.nowInSec());
- 
-                     return ThriftResultsMerger.maybeWrap(
-                             partition.unfilteredIterator(command.columnFilter(), Slices.ALL,
filter.isReversed()), command.nowInSec());
 -                        iterator = filter.filter(partition.sliceableUnfilteredIterator(command.columnFilter(),
filter.isReversed()));
++                        iterator = partition.unfilteredIterator(command.columnFilter(),
filter.getSlices(command.metadata()), filter.isReversed());
+                     else
+                         iterator = partition.unfilteredIterator(command.columnFilter(),
Slices.ALL, filter.isReversed());
+ 
+                     // Wrap results with a ThriftResultMerger only if they're intended for
the thrift command.
+                     if (command.isForThrift())
+                         return ThriftResultsMerger.maybeWrap(iterator, command.nowInSec());
+                     else
+                         return iterator;
                  }
              };
          }


Mime
View raw message