cassandra-commits mailing list archives

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

Conflicts:
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
	src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
	src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
	test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
	test/unit/org/apache/cassandra/utils/SerializationsTest.java


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

Branch: refs/heads/trunk
Commit: 02c348939a6c2ba391af5eb52d290b0838643cb4
Parents: 5a17ec8 61384c5
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Wed Feb 11 15:23:17 2015 +0000
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Wed Feb 11 15:23:17 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../org/apache/cassandra/db/DataTracker.java    |   6 +-
 .../SizeTieredCompactionStrategy.java           |  10 +-
 .../io/compress/CompressionMetadata.java        |  19 +-
 .../cassandra/io/sstable/IndexSummary.java      |  47 +-
 .../io/sstable/IndexSummaryBuilder.java         |   3 +-
 .../io/sstable/IndexSummaryManager.java         |   6 +-
 .../io/sstable/SSTableDeletingTask.java         |  36 +-
 .../cassandra/io/sstable/SSTableLoader.java     |   4 +-
 .../cassandra/io/sstable/SSTableRewriter.java   |  10 +-
 .../io/sstable/format/SSTableReader.java        | 576 ++++++++++++-------
 .../io/sstable/format/SSTableWriter.java        |  18 +-
 .../io/sstable/format/big/BigTableWriter.java   |  31 +-
 .../io/util/BufferedPoolingSegmentedFile.java   |  12 +-
 .../io/util/BufferedSegmentedFile.java          |  22 +-
 .../io/util/CompressedPoolingSegmentedFile.java |  29 +-
 .../io/util/CompressedSegmentedFile.java        |  32 +-
 .../org/apache/cassandra/io/util/Memory.java    |   8 +-
 .../cassandra/io/util/MmappedSegmentedFile.java |  55 +-
 .../cassandra/io/util/PoolingSegmentedFile.java |  35 +-
 .../apache/cassandra/io/util/SegmentedFile.java |  40 +-
 .../cassandra/service/ActiveRepairService.java  |   4 +-
 .../cassandra/streaming/StreamSession.java      |   2 +-
 .../streaming/messages/OutgoingFileMessage.java |   2 +-
 .../cassandra/tools/StandaloneScrubber.java     |   2 +-
 .../cassandra/utils/AlwaysPresentFilter.java    |   5 +
 .../org/apache/cassandra/utils/BloomFilter.java |  20 +-
 .../org/apache/cassandra/utils/IFilter.java     |   7 +-
 .../cassandra/utils/Murmur3BloomFilter.java     |  14 +-
 .../apache/cassandra/utils/concurrent/Ref.java  | 208 ++++++-
 .../cassandra/utils/concurrent/RefCounted.java  |  52 +-
 .../utils/concurrent/RefCountedImpl.java        | 132 -----
 .../apache/cassandra/utils/concurrent/Refs.java |  26 +-
 .../cassandra/utils/obs/OffHeapBitSet.java      |   5 +
 .../cassandra/db/ColumnFamilyStoreTest.java     |   5 +-
 .../db/compaction/AntiCompactionTest.java       |   4 +-
 .../SizeTieredCompactionStrategyTest.java       |  30 +-
 .../io/sstable/IndexSummaryManagerTest.java     |  37 +-
 .../cassandra/io/sstable/LegacySSTableTest.java |   3 +-
 .../cassandra/io/sstable/SSTableReaderTest.java |  11 +-
 .../io/sstable/SSTableRewriterTest.java         |  21 +-
 .../streaming/StreamTransferTaskTest.java       |   2 +-
 .../cassandra/tools/SSTableExportTest.java      |   1 +
 .../cassandra/tools/SSTableImportTest.java      |   7 +
 .../apache/cassandra/utils/BloomFilterTest.java |  22 +-
 .../utils/concurrent/RefCountedTest.java        |  12 +-
 46 files changed, 986 insertions(+), 648 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02c34893/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f9faa6b,b323f18..c32a2c4
--- 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
+  * Safer Resource Management++ (CASSANDRA-8707)
   * Write partition size estimates into a system table (CASSANDRA-7688)
   * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
     (CASSANDRA-8154)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02c34893/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02c34893/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02c34893/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
index 6139a5c,aaf1656..890aa0a
--- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
@@@ -326,20 -325,17 +326,17 @@@ public class CompressionMetadat
          public CompressionMetadata open(long dataLength, long compressedLength, SSTableWriter.FinishType
finishType)
          {
              RefCountedMemory offsets;
-             switch (finishType)
+             if (finishType.isFinal)
              {
-                 case EARLY:
-                     offsets = this.offsets;
-                     break;
-                 case NORMAL:
-                 case FINISH_EARLY:
-                     offsets = this.offsets.copy(count * 8L);
-                     this.offsets.unreference();
-                     break;
-                 default:
-                     throw new AssertionError();
+                 // we now know how many offsets we have and can resize the offsets properly
+                 offsets = this.offsets.copy(count * 8L);
+                 this.offsets.unreference();
+             }
+             else
+             {
+                 offsets = this.offsets;
              }
 -            return new CompressionMetadata(filePath, parameters, offsets, count * 8L, dataLength,
compressedLength, Descriptor.Version.CURRENT.hasPostCompressionAdlerChecksums);
 +            return new CompressionMetadata(filePath, parameters, offsets, count * 8L, dataLength,
compressedLength);
          }
  
          /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02c34893/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02c34893/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02c34893/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02c34893/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------


Mime
View raw message