cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject git commit: consistentify CFMetaData system schema formatting
Date Mon, 22 Apr 2013 21:31:16 GMT
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 <aleksey@apache.org>
Authored: Tue Apr 23 00:31:02 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
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<text,
text>,"
-                                                             + "  duration int"
-                                                             + ") WITH COMMENT='traced sessions'",
Tracing.TRACE_KS);
+                                                             + "session_id uuid PRIMARY KEY,"
+                                                             + "coordinator inet,"
+                                                             + "request text,"
+                                                             + "started_at timestamp,"
+                                                             + "parameters map<text, text>,"
+                                                             + "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,"


Mime
View raw message