Merge branch 'cassandra-3.0' into cassandra-3.9
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ReadResponse.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32825a9b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32825a9b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32825a9b
Branch: refs/heads/cassandra-3.8
Commit: 32825a9b4d9b20620f0536e4acd0e43d7a1737c0
Parents: 237330a 2217695
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Tue Jul 5 11:47:34 2016 -0500
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Tue Jul 5 11:47:34 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/db/ReadResponse.java | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/32825a9b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 68854b3,7f8a3a1..aa3e939
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,7 +1,10 @@@
-3.0.9
+3.9
+ * Fix SASI PREFIX search in CONTAINS mode with partial terms
(CASSANDRA-12073)
+ * Increase size of flushExecutor thread pool (CASSANDRA-12071)
+Merged from 3.0:
+ * Fix column ordering of results with static columns for Thrift requests in
+ a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
+ those static columns in query results (CASSANDRA-12123)
* Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
* Fix EOF exception when altering column type (CASSANDRA-11820)
Merged from 2.2:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/32825a9b/src/java/org/apache/cassandra/db/ReadResponse.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ReadResponse.java
index 6d0b2e1,8bd1be6..3f21480
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@@ -272,9 -273,11 +273,11 @@@ 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.
if (!command.metadata().isCompound())
- return
partition.unfilteredIterator(command.columnFilter(),
filter.getSlices(command.metadata()), filter.isReversed());
+ return ThriftResultsMerger.maybeWrap(
-
filter.filter(partition.sliceableUnfilteredIterator(command.columnFilter(),
filter.isReversed())), command.nowInSec());
++
partition.unfilteredIterator(command.columnFilter(),
filter.getSlices(command.metadata()), filter.isReversed()), command.nowInSec());
- return
partition.unfilteredIterator(command.columnFilter(), Slices.ALL,
filter.isReversed());
+ return ThriftResultsMerger.maybeWrap(
+
partition.unfilteredIterator(command.columnFilter(), Slices.ALL,
filter.isReversed()), command.nowInSec());
}
};
}
