Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6B34B200AF7 for ; Mon, 30 May 2016 16:16:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 69D35160A3E; Mon, 30 May 2016 14:16:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B97A5160A3F for ; Mon, 30 May 2016 16:16:50 +0200 (CEST) Received: (qmail 49677 invoked by uid 500); 30 May 2016 14:16:49 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 49289 invoked by uid 99); 30 May 2016 14:16:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 May 2016 14:16:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2A054E04EB; Mon, 30 May 2016 14:16:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Mon, 30 May 2016 14:16:49 -0000 Message-Id: In-Reply-To: <0afb6251514342e883f89d4c27bc462f@git.apache.org> References: <0afb6251514342e883f89d4c27bc462f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/7] cassandra git commit: Pass the proper Op.Order when index partitions archived-at: Mon, 30 May 2016 14:16:51 -0000 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/trunk Commit: 8540415a6b5a44b86c62fc46450bb21866dab2dc Parents: 7a7704e Author: Sylvain Lebresne Authored: Fri May 27 10:37:22 2016 +0200 Committer: Sylvain Lebresne 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()); } }