cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 11 Feb 2015 15:47:16 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d12ab8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d12ab8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d12ab8f

Branch: refs/heads/trunk
Commit: 6d12ab8fd78834c48fda8fa75473fe08f96279ed
Parents: d73e7db 9d4909e
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Wed Feb 11 15:46:56 2015 +0000
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Wed Feb 11 15:46:56 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../compress/CompressedRandomAccessReader.java  | 15 ++++---------
 .../io/sstable/format/SSTableReader.java        | 11 +++-------
 .../io/util/BufferedPoolingSegmentedFile.java   |  5 -----
 .../io/util/CompressedPoolingSegmentedFile.java | 16 +++++++++++++-
 .../io/util/CompressedSegmentedFile.java        | 14 +++++++++----
 .../cassandra/io/util/MappedFileDataInput.java  |  9 --------
 .../cassandra/io/util/MmappedSegmentedFile.java |  5 +++--
 .../cassandra/io/util/PoolingSegmentedFile.java |  9 ++++++--
 .../apache/cassandra/io/util/SegmentedFile.java | 22 ++++++++++++++++++--
 10 files changed, 63 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d12ab8f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1a4c87c,3f04637..107c923
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,63 -1,5 +1,64 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * 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 partition key column (CASSANDRA-7855)
 + * 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 user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * 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, 8208)
 +
 +
  2.1.4
+  * Cleanup SegmentedFile API (CASSANDRA-8749)
   * Avoid overlap with early compaction replacement (CASSANDRA-8683)
   * Safer Resource Management++ (CASSANDRA-8707)
   * Write partition size estimates into a system table (CASSANDRA-7688)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d12ab8f/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
index 57abba9,49dcd3d..d648299
--- a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
@@@ -45,8 -37,10 +45,12 @@@ import org.apache.cassandra.utils.FBUti
   */
  public class CompressedRandomAccessReader extends RandomAccessReader
  {
 +    private static final boolean useMmap = DatabaseDescriptor.getDiskAccessMode() == Config.DiskAccessMode.mmap;
 +
+     public static CompressedRandomAccessReader open(String dataFilePath, CompressionMetadata
metadata)
+     {
+         return open(dataFilePath, metadata, null);
+     }
      public static CompressedRandomAccessReader open(String path, CompressionMetadata metadata,
CompressedPoolingSegmentedFile owner)
      {
          try
@@@ -59,21 -53,7 +63,10 @@@
          }
      }
  
-     public static CompressedRandomAccessReader open(String dataFilePath, CompressionMetadata
metadata)
-     {
-         try
-         {
-             return new CompressedRandomAccessReader(dataFilePath, metadata, null);
-         }
-         catch (FileNotFoundException e)
-         {
-             throw new RuntimeException(e);
-         }
-     }
  
 +    private TreeMap<Long, MappedByteBuffer> chunkSegments;
 +    private int MAX_SEGMENT_SIZE = Integer.MAX_VALUE;
 +
      private final CompressionMetadata metadata;
  
      // we read the raw compressed bytes into this buffer, then move the uncompressed ones
into super.buffer.


Mime
View raw message