Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 7a7704e5f -> 8540415a6 refs/heads/cassandra-3.6 dee84ccc5 -> 6837452e1 refs/heads/cassandra-3.7 22e0a1daa -> ac62a603a refs/heads/trunk 692d9992d -> 78d303db3
Pass the proper Op.Order when index partitions patch by slebresne; reviewed by Stefania for CASSANDRA-11905 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8540415a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8540415a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8540415a Branch: refs/heads/cassandra-3.0 Commit: 8540415a6b5a44b86c62fc46450bb21866dab2dc Parents: 7a7704e Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri May 27 10:37:22 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon May 30 16:03:18 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Keyspace.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8540415a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d96f3c6..6d5117f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.7 + * Fix sstables not being protected from removal during index build (CASSANDRA-11905) * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032) * Remove unneeded code to repair index summaries that have been improperly down-sampled (CASSANDRA-11127) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8540415a/src/java/org/apache/cassandra/db/Keyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java index 8b23186..bcf1d24 100644 --- a/src/java/org/apache/cassandra/db/Keyspace.java +++ b/src/java/org/apache/cassandra/db/Keyspace.java @@ -530,10 +530,11 @@ public class Keyspace FBUtilities.nowInSeconds(), key); - try (OpOrder.Group opGroup = cfs.keyspace.writeOrder.start(); - UnfilteredRowIterator partition = cmd.queryMemtableAndDisk(cfs, opGroup)) + try (OpOrder.Group writeGroup = cfs.keyspace.writeOrder.start(); + OpOrder.Group readGroup = cfs.readOrdering.start(); + UnfilteredRowIterator partition = cmd.queryMemtableAndDisk(cfs, readGroup)) { - cfs.indexManager.indexPartition(partition, opGroup, indexes, cmd.nowInSec()); + cfs.indexManager.indexPartition(partition, writeGroup, indexes, cmd.nowInSec()); } }
