You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/08/12 12:40:47 UTC
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c606bb8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c606bb8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c606bb8
Branch: refs/heads/trunk
Commit: 1c606bb8afaeca049eb610b6c9075e9efaea032b
Parents: 9a28df0 cb0a0cd
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 12 12:39:46 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 12 12:39:46 2013 +0200
----------------------------------------------------------------------
pylib/cqlshlib/cql3handling.py | 4 ----
src/java/org/apache/cassandra/config/CFMetaData.java | 2 --
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c606bb8/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index ce8f9c6,ca95766..3c63d09
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -439,15 -501,11 +439,11 @@@ def cf_prop_val_completer(ctxt, cass)
if this_opt in ('replicate_on_write', 'populate_io_cache_on_flush'):
return ["'yes'", "'no'"]
if this_opt in ('min_compaction_threshold', 'max_compaction_threshold',
- 'gc_grace_seconds'):
+ 'gc_grace_seconds', 'index_interval'):
return [Hint('<integer>')]
- if this_opt == 'default_read_consistency':
- return [cl for cl in CqlRuleSet.consistency_levels if cl != 'ANY']
- if this_opt == 'default_write_consistency':
- return CqlRuleSet.consistency_levels
return [Hint('<option_value>')]
-def cf_new_prop_val_mapkey_completer(ctxt, cass):
+def cf_prop_val_mapkey_completer(ctxt, cass):
optname = ctxt.get_binding('propname')[-1]
for cql3option, _, subopts in CqlRuleSet.columnfamily_layout_map_options:
if optname == cql3option:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c606bb8/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 2da2361,33e3f00..9d116f9
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -88,84 -79,79 +88,82 @@@ public final class CFMetaDat
public final static boolean DEFAULT_POPULATE_IO_CACHE_ON_FLUSH = false;
// Note that this is the default only for user created tables
- public final static String DEFAULT_COMPRESSOR = SnappyCompressor.isAvailable() ? SnappyCompressor.class.getCanonicalName() : null;
-
- @Deprecated
- public static final CFMetaData OldStatusCf = newSystemMetadata(Table.SYSTEM_KS, SystemTable.OLD_STATUS_CF, 0, "unused", BytesType.instance, null);
- @Deprecated
- public static final CFMetaData OldHintsCf = newSystemMetadata(Table.SYSTEM_KS, SystemTable.OLD_HINTS_CF, 1, "unused", BytesType.instance, BytesType.instance);
- @Deprecated
- public static final CFMetaData OldMigrationsCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_MIGRATIONS_CF, 2, "unused", TimeUUIDType.instance, null);
- @Deprecated
- public static final CFMetaData OldSchemaCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_SCHEMA_CF, 3, "unused", UTF8Type.instance, null);
-
- public static final CFMetaData IndexCf = compile(5, "CREATE TABLE \"" + SystemTable.INDEX_CF + "\" ("
- + "table_name text,"
- + "index_name text,"
- + "PRIMARY KEY (table_name, index_name)"
- + ") WITH COMPACT STORAGE AND COMMENT='indexes that have been completed'");
-
- public static final CFMetaData CounterIdCf = compile(6, "CREATE TABLE \"" + SystemTable.COUNTER_ID_CF + "\" ("
- + "key text,"
- + "id timeuuid,"
- + "PRIMARY KEY (key, id)"
- + ") WITH COMPACT STORAGE AND COMMENT='counter node IDs'");
-
- // new-style schema
- public static final CFMetaData SchemaKeyspacesCf = compile(8, "CREATE TABLE " + SystemTable.SCHEMA_KEYSPACES_CF + "("
- + "keyspace_name text PRIMARY KEY,"
- + "durable_writes boolean,"
- + "strategy_class text,"
- + "strategy_options text"
- + ") 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,"
- + "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");
-
- public static final CFMetaData HintsCf = compile("CREATE TABLE " + SystemTable.HINTS_CF + " ("
+ public final static String DEFAULT_COMPRESSOR = LZ4Compressor.class.getCanonicalName();
+
+ public static final CFMetaData IndexCf = compile("CREATE TABLE \"" + SystemKeyspace.INDEX_CF + "\" ("
+ + "table_name text,"
+ + "index_name text,"
+ + "PRIMARY KEY (table_name, index_name)"
+ + ") WITH COMPACT STORAGE AND COMMENT='indexes that have been completed'");
+
+ public static final CFMetaData CounterIdCf = compile("CREATE TABLE \"" + SystemKeyspace.COUNTER_ID_CF + "\" ("
+ + "key text,"
+ + "id timeuuid,"
+ + "PRIMARY KEY (key, id)"
+ + ") WITH COMPACT STORAGE AND COMMENT='counter node IDs'");
+
+ public static final CFMetaData SchemaKeyspacesCf = compile("CREATE TABLE " + SystemKeyspace.SCHEMA_KEYSPACES_CF + " ("
+ + "keyspace_name text PRIMARY KEY,"
+ + "durable_writes boolean,"
+ + "strategy_class text,"
+ + "strategy_options text"
+ + ") WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=8640");
+
+ public static final CFMetaData SchemaColumnFamiliesCf = compile("CREATE TABLE " + SystemKeyspace.SCHEMA_COLUMNFAMILIES_CF + " ("
+ + "keyspace_name text,"
+ + "columnfamily_name text,"
+ + "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,"
+ + "memtable_flush_period_in_ms int,"
+ + "key_alias text," // that one is kept for compatibility sake
+ + "key_aliases text,"
+ + "bloom_filter_fp_chance double,"
+ + "caching text,"
+ + "default_time_to_live int,"
+ + "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,"
+ + "speculative_retry text,"
+ + "populate_io_cache_on_flush boolean,"
+ + "index_interval int,"
+ + "dropped_columns map<text, bigint>,"
+ + "PRIMARY KEY (keyspace_name, columnfamily_name)"
+ + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=8640");
+
+ public static final CFMetaData SchemaColumnsCf = compile("CREATE TABLE " + SystemKeyspace.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,"
+ + "type text,"
+ + "PRIMARY KEY(keyspace_name, columnfamily_name, column_name)"
+ + ") WITH COMMENT='ColumnFamily column attributes' AND gc_grace_seconds=8640");
+
+ public static final CFMetaData SchemaTriggersCf = compile("CREATE TABLE " + SystemKeyspace.SCHEMA_TRIGGERS_CF + " ("
+ + "keyspace_name text,"
+ + "columnfamily_name text,"
+ + "trigger_name text,"
+ + "trigger_options map<text, text>,"
+ + "PRIMARY KEY (keyspace_name, columnfamily_name, trigger_name)"
+ + ") WITH COMMENT='triggers metadata table'");
+
+ public static final CFMetaData HintsCf = compile("CREATE TABLE " + SystemKeyspace.HINTS_CF + " ("
+ "target_id uuid,"
+ "hint_id timeuuid,"
+ "message_version int,"