cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 14 Oct 2014 12:59:25 GMT
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/cd601294
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd601294
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd601294

Branch: refs/heads/trunk
Commit: cd601294d12fef3aac1b6c84316b40c77f987c8f
Parents: b94c87a c5cbd58
Author: T Jake Luciani <jake@apache.org>
Authored: Tue Oct 14 08:59:11 2014 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Tue Oct 14 08:59:11 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  2 +-
 .../io/sstable/SSTableDeletingTask.java         |  2 +-
 .../cassandra/io/sstable/SSTableReader.java     | 44 ++++++++++++--------
 .../cassandra/io/sstable/SSTableWriter.java     |  4 +-
 5 files changed, 31 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd601294/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 88ae215,b6b1953..61dd26e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
 +3.0
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
 +   7924, 7812, 8063)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * improve concurrency of repair (CASSANDRA-6455)
 +
 +
  2.1.1
+  * Fix high memory use due to tracking reads on incrementally opened sstable readers (CASSANDRA-8066)
   * Fix EXECUTE request with skipMetadata=false returning no metadata
     (CASSANDRA-8054)
   * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd601294/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd601294/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd601294/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------


Mime
View raw message