You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/08/01 22:48:07 UTC
[1/5] git commit: Set gc_grace_seconds to 7 days for system schema
tables
Repository: cassandra
Updated Branches:
refs/heads/trunk 63393eb24 -> 6fad4b09f
Set gc_grace_seconds to 7 days for system schema tables
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7668
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0dd39c6a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0dd39c6a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0dd39c6a
Branch: refs/heads/trunk
Commit: 0dd39c6a556a8e98c946855d7dc3dbfd110d1ec9
Parents: ee2ed3c
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Aug 1 15:40:40 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Aug 1 15:40:40 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/CFMetaData.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0dd39c6a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0ad02c1..b60d1d9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.19
+ * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
* SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
* Set correct stream ID on responses when non-Exception Throwables
are thrown while handling native protocol messages (CASSANDRA-7470)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0dd39c6a/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 9e3ceb7..31e17ed 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -108,7 +108,7 @@ public final class CFMetaData
+ "durable_writes boolean,"
+ "strategy_class text,"
+ "strategy_options text"
- + ") WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=8640");
+ + ") WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=604800");
public static final CFMetaData SchemaColumnFamiliesCf = compile(9, "CREATE TABLE " + SystemTable.SCHEMA_COLUMNFAMILIES_CF + "("
+ "keyspace_name text,"
@@ -137,7 +137,7 @@ public final class CFMetaData
+ "column_aliases text,"
+ "compaction_strategy_options text,"
+ "PRIMARY KEY (keyspace_name, columnfamily_name)"
- + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=8640");
+ + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=604800");
public static final CFMetaData SchemaColumnsCf = compile(10, "CREATE TABLE " + SystemTable.SCHEMA_COLUMNS_CF + "("
+ "keyspace_name text,"
@@ -149,7 +149,7 @@ public final class CFMetaData
+ "index_name text,"
+ "component_index int,"
+ "PRIMARY KEY(keyspace_name, columnfamily_name, column_name)"
- + ") WITH COMMENT='ColumnFamily column attributes' AND gc_grace_seconds=8640");
+ + ") WITH COMMENT='ColumnFamily column attributes' AND gc_grace_seconds=604800");
public static final CFMetaData HintsCf = compile("CREATE TABLE " + SystemTable.HINTS_CF + " ("
+ "target_id uuid,"
[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3faf88cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3faf88cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3faf88cd
Branch: refs/heads/trunk
Commit: 3faf88cd0769e7689561cef0a210fb14fa84aac0
Parents: a182ea0 a09e53c
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Aug 1 15:47:23 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Aug 1 15:47:23 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/CFMetaData.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3faf88cd/CHANGES.txt
----------------------------------------------------------------------
[2/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by ty...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
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/63a1e987
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63a1e987
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63a1e987
Branch: refs/heads/trunk
Commit: 63a1e987f75ce9ef2c5d0ca2f35965c43ee086f7
Parents: 5c0ddfb 0dd39c6
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Aug 1 15:44:33 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Aug 1 15:44:33 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/CFMetaData.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/63a1e987/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a5b49c5,b60d1d9..68d40b0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
-1.2.19
+2.0.10
+ * Fix truncate to always flush (CASSANDRA-7511)
+ * Remove shuffle and taketoken (CASSANDRA-7601)
+ * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
+ * Fix range merging when DES scores are zero (CASSANDRA-7535)
+ * Warn when SSL certificates have expired (CASSANDRA-7528)
+ * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
+ * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
+ * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
+ operations to incorrect become full QUORUM (CASSANDRA-7345)
+ * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
+ * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
+ * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
+ * Add option to disable STCS in L0 (CASSANDRA-6621)
+ * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
+ * Backport CASSANDRA-6747 (CASSANDRA-7560)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+Merged from 1.2:
+ * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
* SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
* Set correct stream ID on responses when non-Exception Throwables
are thrown while handling native protocol messages (CASSANDRA-7470)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/63a1e987/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 04b99e4,31e17ed..650d6c4
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -89,81 -79,79 +89,81 @@@ 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=604800");
-
- 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=604800");
-
- 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=604800");
-
- 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");
++ + ") WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=604800");
+
+ 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_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,"
+ + "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");
++ + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=604800");
+
+ 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");
++ + ") WITH COMMENT='ColumnFamily column attributes' AND gc_grace_seconds=604800");
+
+ 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'");
++ + ") WITH COMMENT='triggers metadata table' AND gc_grace_seconds=604800");
+
+ public static final CFMetaData HintsCf = compile("CREATE TABLE " + SystemKeyspace.HINTS_CF + " ("
+ "target_id uuid,"
+ "hint_id timeuuid,"
+ "message_version int,"
[3/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a09e53cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a09e53cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a09e53cd
Branch: refs/heads/trunk
Commit: a09e53cdadb0be17ef4c27e194a387c239a532a2
Parents: a2c91d7 63a1e98
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Aug 1 15:46:59 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Aug 1 15:46:59 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/CFMetaData.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a09e53cd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a8299c6,68d40b0..6ab8a73
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,53 -1,11 +1,54 @@@
-2.0.10
- * Fix truncate to always flush (CASSANDRA-7511)
+2.1.0-final
+ * Don't use strict consistency when replacing (CASSANDRA-7568)
+ * Fix min/max cell name collection on 2.0 SSTables with range
+ tombstones (CASSANDRA-7593)
+ * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
+ * Filter cached results correctly (CASSANDRA-7636)
+ * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
* Remove shuffle and taketoken (CASSANDRA-7601)
- * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
- * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
- * Always merge ranges owned by a single node (CASSANDRA-6930)
- * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Clean up Windows batch scripts (CASSANDRA-7619)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
+ * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+ * Fix NPE when dropping index from non-existent keyspace, AssertionError when
+ dropping non-existent index with IF EXISTS (CASSANDRA-7590)
+ * Fix sstablelevelresetter hang (CASSANDRA-7614)
+ * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
+ * Use "keyspace updated" schema change message for UDT changes in v1 and
+ v2 protocols (CASSANDRA-7617)
+ * Fix tracing of range slices and secondary index lookups that are local
+ to the coordinator (CASSANDRA-7599)
+ * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
+ * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596)
+ * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
+ * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
+ * Fix tracing of concurrent range slices and 2ary index queries (CASSANDRA-7626)
+Merged from 2.0:
++ * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
+ * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
+ * Always flush on truncate (CASSANDRA-7511)
* Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+
+
+2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
+ * Updated memtable_cleanup_threshold and memtable_flush_writers defaults
+ (CASSANDRA-7551)
+ * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
+ * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539)
+ * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
+ * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
+ * Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509)
+ * Handle queries on multiple secondary index types (CASSANDRA-7525)
+ * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
+ * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
+Merged from 2.0:
* (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
* Fix range merging when DES scores are zero (CASSANDRA-7535)
* Warn when SSL certificates have expired (CASSANDRA-7528)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a09e53cd/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 84804b0,650d6c4..83c1267
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -177,12 -136,11 +177,12 @@@ public final class CFMetaDat
+ "column_aliases text,"
+ "compaction_strategy_options text,"
+ "speculative_retry text,"
- + "populate_io_cache_on_flush boolean,"
+ "index_interval int,"
+ + "min_index_interval int,"
+ + "max_index_interval int,"
+ "dropped_columns map<text, bigint>,"
+ "PRIMARY KEY (keyspace_name, columnfamily_name)"
- + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=8640");
+ + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=604800");
public static final CFMetaData SchemaColumnsCf = compile("CREATE TABLE " + SystemKeyspace.SCHEMA_COLUMNS_CF + " ("
+ "keyspace_name text,"
@@@ -203,16 -161,8 +203,16 @@@
+ "trigger_name text,"
+ "trigger_options map<text, text>,"
+ "PRIMARY KEY (keyspace_name, columnfamily_name, trigger_name)"
- + ") WITH COMMENT='triggers metadata table'");
+ + ") WITH COMMENT='triggers metadata table' AND gc_grace_seconds=604800");
+ public static final CFMetaData SchemaUserTypesCf = compile("CREATE TABLE " + SystemKeyspace.SCHEMA_USER_TYPES_CF + " ("
+ + "keyspace_name text,"
+ + "type_name text,"
+ + "field_names list<text>,"
+ + "field_types list<text>,"
+ + "PRIMARY KEY (keyspace_name, type_name)"
- + ") WITH COMMENT='Defined user types' AND gc_grace_seconds=8640");
++ + ") WITH COMMENT='Defined user types' AND gc_grace_seconds=604800");
+
public static final CFMetaData HintsCf = compile("CREATE TABLE " + SystemKeyspace.HINTS_CF + " ("
+ "target_id uuid,"
+ "hint_id timeuuid,"
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fad4b09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fad4b09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fad4b09
Branch: refs/heads/trunk
Commit: 6fad4b09fb9bfd58b3acdb6fc1f9f28543229d80
Parents: 63393eb 3faf88c
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Aug 1 15:47:50 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Aug 1 15:47:50 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/CFMetaData.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fad4b09/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fad4b09/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------