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 2756DF01B for ; Mon, 22 Apr 2013 21:31:17 +0000 (UTC) Received: (qmail 28866 invoked by uid 500); 22 Apr 2013 21:31:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 28831 invoked by uid 500); 22 Apr 2013 21:31:16 -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 28580 invoked by uid 99); 22 Apr 2013 21:31:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Apr 2013 21:31:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5D30B81DEDF; Mon, 22 Apr 2013 21:31:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: consistentify CFMetaData system schema formatting Date: Mon, 22 Apr 2013 21:31:16 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 7746225dc -> a9ec77eb7 consistentify CFMetaData system schema formatting Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9ec77eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9ec77eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9ec77eb Branch: refs/heads/cassandra-1.2 Commit: a9ec77eb7011b52bd68d9c4feff8857b9d05501d Parents: 7746225 Author: Aleksey Yeschenko Authored: Tue Apr 23 00:31:02 2013 +0300 Committer: Aleksey Yeschenko Committed: Tue Apr 23 00:31:02 2013 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 110 ++++++++------- 1 files changed, 56 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9ec77eb/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 a5fc5dd..0b2be66 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -111,47 +111,47 @@ public final class CFMetaData + ") WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=8640"); public static final CFMetaData SchemaColumnFamiliesCf = compile(9, "CREATE TABLE " + SystemTable.SCHEMA_COLUMNFAMILIES_CF + "(" - + "keyspace_name text," - + "columnfamily_name text," - + "id int," - + "type text," - + "comparator text," - + "subcomparator text," - + "comment text," - + "read_repair_chance double," - + "local_read_repair_chance double," - + "replicate_on_write boolean," - + "gc_grace_seconds int," - + "default_validator text," - + "key_validator text," - + "min_compaction_threshold int," - + "max_compaction_threshold int," - + "key_alias text," // that one is kept for compatibility sake - + "key_aliases text," - + "bloom_filter_fp_chance double," - + "caching text," - + "populate_io_cache_on_flush boolean," - + "compaction_strategy_class text," - + "compression_parameters text," - + "value_alias text," - + "column_aliases text," - + "compaction_strategy_options text," - + "default_read_consistency text," - + "default_write_consistency text," - + "PRIMARY KEY (keyspace_name, columnfamily_name)" - + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=8640"); + + "keyspace_name text," + + "columnfamily_name text," + + "id int," + + "type text," + + "comparator text," + + "subcomparator text," + + "comment text," + + "read_repair_chance double," + + "local_read_repair_chance double," + + "replicate_on_write boolean," + + "gc_grace_seconds int," + + "default_validator text," + + "key_validator text," + + "min_compaction_threshold int," + + "max_compaction_threshold int," + + "key_alias text," // that one is kept for compatibility sake + + "key_aliases text," + + "bloom_filter_fp_chance double," + + "caching text," + + "populate_io_cache_on_flush boolean," + + "compaction_strategy_class text," + + "compression_parameters text," + + "value_alias text," + + "column_aliases text," + + "compaction_strategy_options text," + + "default_read_consistency text," + + "default_write_consistency text," + + "PRIMARY KEY (keyspace_name, columnfamily_name)" + + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=8640"); public static final CFMetaData SchemaColumnsCf = compile(10, "CREATE TABLE " + SystemTable.SCHEMA_COLUMNS_CF + "(" - + "keyspace_name text," - + "columnfamily_name text," - + "column_name text," - + "validator text," - + "index_type text," - + "index_options text," - + "index_name text," - + "component_index int," - + "PRIMARY KEY(keyspace_name, columnfamily_name, column_name)" - + ") WITH COMMENT='ColumnFamily column attributes' AND gc_grace_seconds=8640"); + + "keyspace_name text," + + "columnfamily_name text," + + "column_name text," + + "validator text," + + "index_type text," + + "index_options text," + + "index_name text," + + "component_index int," + + "PRIMARY KEY(keyspace_name, columnfamily_name, column_name)" + + ") WITH COMMENT='ColumnFamily column attributes' AND gc_grace_seconds=8640"); public static final CFMetaData HintsCf = compile("CREATE TABLE " + SystemTable.HINTS_CF + " (" + "target_id uuid," @@ -198,23 +198,25 @@ public final class CFMetaData + ") WITH COMMENT='information about the local node'"); public static final CFMetaData TraceSessionsCf = compile("CREATE TABLE " + Tracing.SESSIONS_CF + " (" - + " session_id uuid PRIMARY KEY," - + " coordinator inet," - + " request text," - + " started_at timestamp," - + " parameters map," - + " duration int" - + ") WITH COMMENT='traced sessions'", Tracing.TRACE_KS); + + "session_id uuid PRIMARY KEY," + + "coordinator inet," + + "request text," + + "started_at timestamp," + + "parameters map," + + "duration int" + + ") WITH COMMENT='traced sessions'", + Tracing.TRACE_KS); public static final CFMetaData TraceEventsCf = compile("CREATE TABLE " + Tracing.EVENTS_CF + " (" - + " session_id uuid," - + " event_id timeuuid," - + " source inet," - + " thread text," - + " activity text," - + " source_elapsed int," - + " PRIMARY KEY (session_id, event_id)" - + ");", Tracing.TRACE_KS); + + "session_id uuid," + + "event_id timeuuid," + + "source inet," + + "thread text," + + "activity text," + + "source_elapsed int," + + "PRIMARY KEY (session_id, event_id)" + + ")", + Tracing.TRACE_KS); public static final CFMetaData BatchlogCf = compile("CREATE TABLE " + SystemTable.BATCHLOG_CF + " (" + "id uuid PRIMARY KEY,"