cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Fri, 01 Aug 2014 20:47:14 GMT
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/cassandra-2.1.0
Commit: 63a1e987f75ce9ef2c5d0ca2f35965c43ee086f7
Parents: 5c0ddfb 0dd39c6
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Fri Aug 1 15:44:33 2014 -0500
Committer: Tyler Hobbs <tyler@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,"


Mime
View raw message