cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Date Thu, 16 May 2013 13:50:08 GMT
Merge branch 'cassandra-1.2' into trunk

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/405c2515
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/405c2515
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/405c2515

Branch: refs/heads/trunk
Commit: 405c2515f1f1810c1cdab405105fd08b8756fddb
Parents: 9bb3441 61567e7
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu May 16 16:49:48 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu May 16 16:49:48 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    4 ++++
 .../org/apache/cassandra/config/CFMetaData.java    |    2 ++
 .../apache/cassandra/config/ColumnDefinition.java  |    2 ++
 3 files changed, 8 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/405c2515/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 11be8ba,6d5c117..543765c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,51 -1,7 +1,55 @@@
 +2.0
 + * JEMalloc support for off-heap allocation (CASSANDRA-3997)
 + * Single-pass compaction (CASSANDRA-4180)
 + * Removed token range bisection (CASSANDRA-5518)
 + * Removed compatibility with pre-1.2.5 sstables and network messages
 +   (CASSANDRA-5511)
 + * removed PBSPredictor (CASSANDRA-5455)
 + * CAS support (CASSANDRA-5062, 5441, 5443)
 + * Leveled compaction performs size-tiered compactions in L0 
 +   (CASSANDRA-5371, 5439)
 + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339)
 + * Log when a node is down longer than the hint window (CASSANDRA-4554)
 + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917)
 + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407)
 + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430)
 + * Change Message IDs to ints (CASSANDRA-5307)
 + * Move sstable level information into the Stats component, removing the
 +   need for a separate Manifest file (CASSANDRA-4872)
 + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199)
 + * make index_interval configurable per columnfamily (CASSANDRA-3961)
 + * add default_time_to_live (CASSANDRA-3974)
 + * add memtable_flush_period_in_ms (CASSANDRA-4237)
 + * replace supercolumns internally by composites (CASSANDRA-3237, 5123)
 + * upgrade thrift to 0.9.0 (CASSANDRA-3719)
 + * drop unnecessary keyspace parameter from user-defined compaction API 
 +   (CASSANDRA-5139)
 + * more robust solution to incomplete compactions + counters (CASSANDRA-5151)
 + * Change order of directory searching for c*.in.sh (CASSANDRA-3983)
 + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271)
 + * Allow custom configuration loader (CASSANDRA-5045)
 + * Remove memory emergency pressure valve logic (CASSANDRA-3534)
 + * Reduce request latency with eager retry (CASSANDRA-4705)
 + * cqlsh: Remove ASSUME command (CASSANDRA-5331)
 + * Rebuild BF when loading sstables if bloom_filter_fp_chance
 +   has changed since compaction (CASSANDRA-5015)
 + * remove row-level bloom filters (CASSANDRA-4885)
 + * Change Kernel Page Cache skipping into row preheating (disabled by default)
 +   (CASSANDRA-4937)
 + * Improve repair by deciding on a gcBefore before sending
 +   out TreeRequests (CASSANDRA-4932)
 + * Add an official way to disable compactions (CASSANDRA-5074)
 + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919)
 + * Add binary protocol versioning (CASSANDRA-5436)
 + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530)
 + * Add alias support to SELECT statement (CASSANDRA-5075)
 + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541)
 +
 +
+ 1.2.6
+  * Write row markers when serializing schema (CASSANDRA-5572)
+ 
+ 
  1.2.5
   * make BytesToken.toString only return hex bytes (CASSANDRA-5566)
   * Ensure that submitBackground enqueues at least one task (CASSANDRA-5554)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/405c2515/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index a686bf6,81afd23..e9ed8bb
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -1477,22 -1341,15 +1478,23 @@@ public final class CFMetaDat
          ColumnFamily cf = rm.addOrGet(SystemTable.SCHEMA_COLUMNFAMILIES_CF);
          int ldt = (int) (System.currentTimeMillis() / 1000);
  
 -        Integer oldId = Schema.instance.convertNewCfId(cfId);
 -        if (oldId != null) // keep old ids (see CASSANDRA-3794 for details)
 -            cf.addColumn(Column.create(oldId, timestamp, cfName, "id"));
 -
+         cf.addColumn(Column.create("", timestamp, cfName, ""));
          cf.addColumn(Column.create(cfType.toString(), timestamp, cfName, "type"));
 -        cf.addColumn(Column.create(comparator.toString(), timestamp, cfName, "comparator"));
 -        if (subcolumnComparator != null)
 -            cf.addColumn(Column.create(subcolumnComparator.toString(), timestamp, cfName,
"subcomparator"));
 +
 +        if (isSuper())
 +        {
 +            // We need to continue saving the comparator and subcomparator separatly, otherwise
 +            // we won't know at deserialization if the subcomparator should be taken into
account
 +            // TODO: we should implement an on-start migration if we want to get rid of
that.
 +            CompositeType ct = (CompositeType)comparator;
 +            cf.addColumn(Column.create(ct.types.get(0).toString(), timestamp, cfName, "comparator"));
 +            cf.addColumn(Column.create(ct.types.get(1).toString(), timestamp, cfName, "subcomparator"));
 +        }
 +        else
 +        {
 +            cf.addColumn(Column.create(comparator.toString(), timestamp, cfName, "comparator"));
 +        }
 +
          cf.addColumn(comment == null ? DeletedColumn.create(ldt, timestamp, cfName, "comment")
                                       : Column.create(comment, timestamp, cfName, "comment"));
          cf.addColumn(Column.create(readRepairChance, timestamp, cfName, "read_repair_chance"));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/405c2515/src/java/org/apache/cassandra/config/ColumnDefinition.java
----------------------------------------------------------------------


Mime
View raw message