Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 234FE11C74 for ; Wed, 20 Aug 2014 17:01:54 +0000 (UTC) Received: (qmail 81226 invoked by uid 500); 20 Aug 2014 17:01:53 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 81190 invoked by uid 500); 20 Aug 2014 17:01:53 -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 81149 invoked by uid 99); 20 Aug 2014 17:01:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Aug 2014 17:01:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8F229954BBE; Wed, 20 Aug 2014 17:01:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Wed, 20 Aug 2014 17:01:53 -0000 Message-Id: <6745b0084ef247e4b24f87d12d574dc7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/10] git commit: Configure system.paxos with LeveledCompactionStrategy patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7753 Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 a4e108c40 -> 44cfd958a refs/heads/cassandra-2.1 8d494c782 -> ab45a78d6 refs/heads/cassandra-2.1.0 d3450570c -> da4578678 refs/heads/trunk 0f530413c -> 753ccff52 Configure system.paxos with LeveledCompactionStrategy patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7753 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44cfd958 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44cfd958 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44cfd958 Branch: refs/heads/cassandra-2.0 Commit: 44cfd958a4b59c2e13881b42e2ba34db64dd64e8 Parents: a4e108c Author: Jonathan Ellis Authored: Wed Aug 20 10:00:34 2014 -0700 Committer: Jonathan Ellis Committed: Wed Aug 20 10:00:34 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44cfd958/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 94bdd89..17c0671 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.10 + * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753) * Fix ALTER clustering column type from DateType to TimestampType when using DESC clustering order (CASSANRDA-7797) * Stop inheriting liveRatio and liveRatioComputedAt from previous http://git-wip-us.apache.org/repos/asf/cassandra/blob/44cfd958/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index 296ecce..07c696f 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -260,7 +260,8 @@ public final class CFMetaData + "most_recent_commit_at timeuuid," + "most_recent_commit blob," + "PRIMARY KEY (row_key, cf_id)" - + ") WITH COMMENT='in-progress paxos proposals'"); + + ") WITH COMMENT='in-progress paxos proposals' " + + "AND COMPACTION={'class' : 'LeveledCompactionStrategy'}"); public static final CFMetaData SSTableActivityCF = compile("CREATE TABLE " + SystemKeyspace.SSTABLE_ACTIVITY_CF + " (" + "keyspace_name text,"