cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/8] cassandra git commit: Pass the proper Op.Order when index partitions
Date Mon, 30 May 2016 15:48:23 GMT
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/6837452e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6837452e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6837452e

Branch: refs/heads/trunk
Commit: 6837452e10b57ff3cb0dad8d6c8f6a006ed8b88b
Parents: dee84cc
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri May 27 10:37:22 2016 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon May 30 16:04:32 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/6837452e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a2b472a..b549c8e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.6
+ * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
  * Correctly migrate schema for frozen UDTs during 2.x -> 3.x upgrades
    (does not affect any released versions) (CASSANDRA-11613)
  * Allow server startup if JMX is configured directly (CASSANDRA-11725)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6837452e/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 77277ba..5d2c571 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -564,10 +564,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());
         }
     }
 


Mime
View raw message