cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [13/19] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 22 Apr 2014 12:34:49 GMT
Merge branch 'cassandra-2.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/4305bd40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4305bd40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4305bd40

Branch: refs/heads/cassandra-2.1
Commit: 4305bd40f619e1d4ebdfc5873c082deb82aac5f0
Parents: 3e6b299 364282a
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Apr 22 07:20:45 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Apr 22 07:20:45 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        | 3 ++-
 src/java/org/apache/cassandra/db/DeletionTime.java | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4305bd40/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d94f13b,791586c..ae7410e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,55 -1,16 +1,56 @@@
 -2.0.8
 - * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 -Merged from 1.2:
 - * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
 - * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
 +2.1.0-beta2
 + * Fix BTree.clear for large updates (CASSANDRA-6943)
 + * Fail write instead of logging a warning when unable to append to CL
 +   (CASSANDRA-6764)
 + * Eliminate possibility of CL segment appearing twice in active list 
 +   (CASSANDRA-6557)
 + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 + * Fix stress to do proper counter reads (CASSANDRA-6835)
 + * Fix help message for stress counter_write (CASSANDRA-6824)
 + * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848)
 + * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849)
 + * Fix race condition in Batch CLE (CASSANDRA-6860)
 + * Improve cleanup/scrub/upgradesstables failure handling (CASSANDRA-6774)
 + * ByteBuffer write() methods for serializing sstables (CASSANDRA-6781)
 + * Proper compare function for CollectionType (CASSANDRA-6783)
 + * Update native server to Netty 4 (CASSANDRA-6236)
 + * Fix off-by-one error in stress (CASSANDRA-6883)
 + * Make OpOrder AutoCloseable (CASSANDRA-6901)
 + * Remove sync repair JMX interface (CASSANDRA-6900)
 + * Add multiple memory allocation options for memtables (CASSANDRA-6689)
 + * Remove adjusted op rate from stress output (CASSANDRA-6921)
 + * Add optimized CF.hasColumns() implementations (CASSANDRA-6941)
 + * Serialize batchlog mutations with the version of the target node
 +   (CASSANDRA-6931)
 + * Optimize CounterColumn#reconcile() (CASSANDRA-6953)
 + * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869)
 + * Lock counter cells, not partitions (CASSANDRA-6880)
 + * Track presence of legacy counter shards in sstables (CASSANDRA-6888)
 + * Ensure safe resource cleanup when replacing sstables (CASSANDRA-6912)
 + * Add failure handler to async callback (CASSANDRA-6747)
 + * Fix AE when closing SSTable without releasing reference (CASSANDRA-7000)
 + * Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924)
 + * Only snapshot relative SSTables when sequential repair (CASSANDRA-7024)
   * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
 -
 -
 -2.0.7
 +Merged from 2.0:
   * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
-  * Allow compaction of system tables during startup (CASSANDRA-6913)
+  * Avoid early loading of non-system keyspaces before compaction-leftovers 
+    cleanup at startup (CASSANDRA-6913)
   * Restrict Windows to parallel repairs (CASSANDRA-6907)
   * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436)
   * Fix NPE in MeteredFlusher (CASSANDRA-6820)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4305bd40/src/java/org/apache/cassandra/db/DeletionTime.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/DeletionTime.java
index e3e18f1,a1b9f17..f08196d
--- a/src/java/org/apache/cassandra/db/DeletionTime.java
+++ b/src/java/org/apache/cassandra/db/DeletionTime.java
@@@ -125,17 -122,11 +125,16 @@@ public class DeletionTime implements Co
          {
              int ldt = in.readInt();
              long mfda = in.readLong();
-             if (mfda == Long.MIN_VALUE && ldt == Integer.MAX_VALUE)
-                 return LIVE;
-             else
-                 return new DeletionTime(mfda, ldt);
+             return mfda == Long.MIN_VALUE && ldt == Integer.MAX_VALUE
+                  ? LIVE
+                  : new DeletionTime(mfda, ldt);
          }
  
 +        public void skip(DataInput in) throws IOException
 +        {
 +            FileUtils.skipBytesFully(in, 4 + 8);
 +        }
 +
          public long serializedSize(DeletionTime delTime, TypeSizes typeSizes)
          {
              return typeSizes.sizeof(delTime.localDeletionTime)


Mime
View raw message