Merge remote-tracking branch 'origin/cassandra-2.1' 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/350657c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/350657c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/350657c6 Branch: refs/heads/trunk Commit: 350657c64d4caee378ec310b1b19fb1e7427b9ef Parents: 9ef3eee 75508ec Author: Jonathan Ellis <[email protected]> Authored: Wed Mar 19 12:11:12 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Mar 19 12:11:12 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 +- doc/cql3/CQL.textile | 19 +- .../apache/cassandra/cache/AutoSavingCache.java | 3 +- .../cache/SerializingCacheProvider.java | 4 +- .../apache/cassandra/db/BatchlogManager.java | 12 +- .../cassandra/db/ColumnFamilySerializer.java | 7 +- .../org/apache/cassandra/db/ColumnIndex.java | 6 +- .../apache/cassandra/db/ColumnSerializer.java | 4 +- .../apache/cassandra/db/CounterMutation.java | 3 +- .../org/apache/cassandra/db/DeletionInfo.java | 4 +- .../org/apache/cassandra/db/DeletionTime.java | 4 +- src/java/org/apache/cassandra/db/Mutation.java | 4 +- .../org/apache/cassandra/db/OnDiskAtom.java | 3 +- .../apache/cassandra/db/PagedRangeCommand.java | 4 +- .../apache/cassandra/db/RangeSliceCommand.java | 4 +- .../apache/cassandra/db/RangeSliceReply.java | 4 +- .../org/apache/cassandra/db/RangeTombstone.java | 5 +- .../apache/cassandra/db/RangeTombstoneList.java | 4 +- .../org/apache/cassandra/db/ReadCommand.java | 4 +- .../org/apache/cassandra/db/ReadResponse.java | 5 +- src/java/org/apache/cassandra/db/Row.java | 3 +- .../org/apache/cassandra/db/RowIndexEntry.java | 4 +- .../org/apache/cassandra/db/RowPosition.java | 4 +- .../cassandra/db/SliceByNamesReadCommand.java | 3 +- .../cassandra/db/SliceFromReadCommand.java | 4 +- .../apache/cassandra/db/SnapshotCommand.java | 4 +- .../apache/cassandra/db/TruncateResponse.java | 4 +- .../org/apache/cassandra/db/Truncation.java | 4 +- .../org/apache/cassandra/db/WriteResponse.java | 4 +- .../cassandra/db/commitlog/CommitLog.java | 8 +- .../cassandra/db/commitlog/ReplayPosition.java | 4 +- .../db/compaction/AbstractCompactedRow.java | 3 +- .../db/compaction/LazilyCompactedRow.java | 3 +- .../cassandra/db/composites/AbstractCType.java | 4 +- .../db/composites/AbstractCellNameType.java | 4 +- .../apache/cassandra/db/filter/ColumnSlice.java | 4 +- .../cassandra/db/filter/IDiskAtomFilter.java | 5 +- .../cassandra/db/filter/NamesQueryFilter.java | 4 +- .../cassandra/db/filter/SliceQueryFilter.java | 4 +- .../apache/cassandra/dht/AbstractBounds.java | 3 +- .../org/apache/cassandra/dht/BootStrapper.java | 4 +- src/java/org/apache/cassandra/dht/Token.java | 4 +- .../org/apache/cassandra/gms/EchoMessage.java | 4 +- .../org/apache/cassandra/gms/EndpointState.java | 3 +- .../org/apache/cassandra/gms/GossipDigest.java | 3 +- .../apache/cassandra/gms/GossipDigestAck.java | 4 +- .../apache/cassandra/gms/GossipDigestAck2.java | 3 +- .../apache/cassandra/gms/GossipDigestSyn.java | 5 +- .../apache/cassandra/gms/HeartBeatState.java | 3 +- .../apache/cassandra/gms/VersionedValue.java | 3 +- .../apache/cassandra/io/ISSTableSerializer.java | 5 +- .../org/apache/cassandra/io/ISerializer.java | 6 +- .../cassandra/io/IVersionedSerializer.java | 6 +- .../io/compress/CompressionMetadata.java | 3 +- .../io/compress/CompressionParameters.java | 4 +- .../cassandra/io/sstable/IndexHelper.java | 3 +- .../cassandra/io/sstable/IndexSummary.java | 7 +- .../cassandra/io/sstable/SSTableReader.java | 4 +- .../cassandra/io/sstable/SSTableWriter.java | 4 +- .../io/sstable/metadata/CompactionMetadata.java | 4 +- .../metadata/IMetadataComponentSerializer.java | 5 +- .../sstable/metadata/IMetadataSerializer.java | 6 +- .../metadata/LegacyMetadataSerializer.java | 3 +- .../io/sstable/metadata/MetadataSerializer.java | 6 +- .../io/sstable/metadata/StatsMetadata.java | 4 +- .../io/sstable/metadata/ValidationMetadata.java | 4 +- .../cassandra/io/util/AbstractDataOutput.java | 43 +- .../io/util/ByteBufferOutputStream.java | 46 -- .../io/util/ChecksummedOutputStream.java | 56 --- .../cassandra/io/util/DataOutputBuffer.java | 23 +- .../cassandra/io/util/DataOutputByteBuffer.java | 59 +++ .../cassandra/io/util/DataOutputPlus.java | 32 ++ .../io/util/DataOutputStreamAndChannel.java | 55 +++ .../cassandra/io/util/DataOutputStreamPlus.java | 57 +++ .../io/util/FastByteArrayOutputStream.java | 11 + .../org/apache/cassandra/io/util/Memory.java | 21 +- .../cassandra/io/util/SequentialWriter.java | 63 ++- .../org/apache/cassandra/net/MessageOut.java | 3 +- .../apache/cassandra/net/MessagingService.java | 3 +- .../cassandra/net/OutboundTcpConnection.java | 15 +- .../org/apache/cassandra/repair/NodePair.java | 4 +- .../apache/cassandra/repair/RepairJobDesc.java | 5 +- .../repair/messages/AnticompactionRequest.java | 12 +- .../repair/messages/PrepareMessage.java | 4 +- .../repair/messages/RepairMessage.java | 4 +- .../cassandra/repair/messages/SyncComplete.java | 4 +- .../cassandra/repair/messages/SyncRequest.java | 4 +- .../repair/messages/ValidationComplete.java | 4 +- .../repair/messages/ValidationRequest.java | 4 +- .../apache/cassandra/service/CacheService.java | 10 +- .../cassandra/service/MigrationManager.java | 4 +- .../cassandra/service/pager/PagingState.java | 10 +- .../apache/cassandra/service/paxos/Commit.java | 4 +- .../service/paxos/PrepareResponse.java | 4 +- .../cassandra/streaming/ConnectionHandler.java | 16 +- .../cassandra/streaming/StreamRequest.java | 5 +- .../cassandra/streaming/StreamSummary.java | 4 +- .../streaming/compress/CompressionInfo.java | 3 +- .../streaming/messages/CompleteMessage.java | 4 +- .../streaming/messages/FileMessageHeader.java | 4 +- .../streaming/messages/IncomingFileMessage.java | 4 +- .../streaming/messages/OutgoingFileMessage.java | 13 +- .../streaming/messages/PrepareMessage.java | 14 +- .../streaming/messages/ReceivedMessage.java | 10 +- .../streaming/messages/RetryMessage.java | 10 +- .../messages/SessionFailedMessage.java | 4 +- .../streaming/messages/StreamInitMessage.java | 4 +- .../streaming/messages/StreamMessage.java | 8 +- .../cassandra/thrift/CassandraServer.java | 2 +- .../apache/cassandra/tools/SSTableExport.java | 3 +- .../cassandra/utils/AtomicLongArrayUpdater.java | 2 +- .../cassandra/utils/BloomFilterSerializer.java | 6 +- .../cassandra/utils/BooleanSerializer.java | 3 +- .../apache/cassandra/utils/ByteBufferUtil.java | 77 +--- .../cassandra/utils/EstimatedHistogram.java | 5 +- .../org/apache/cassandra/utils/FBUtilities.java | 2 +- .../cassandra/utils/FastByteComparisons.java | 240 ---------- .../cassandra/utils/FastByteOperations.java | 461 +++++++++++++++++++ .../apache/cassandra/utils/FilterFactory.java | 4 +- .../apache/cassandra/utils/IntervalTree.java | 6 +- .../org/apache/cassandra/utils/MerkleTree.java | 10 +- .../apache/cassandra/utils/PureJavaCrc32.java | 50 +- .../cassandra/utils/StreamingHistogram.java | 4 +- .../apache/cassandra/utils/UUIDSerializer.java | 4 +- .../cassandra/AbstractSerializationsTester.java | 13 +- test/unit/org/apache/cassandra/Util.java | 6 +- .../apache/cassandra/db/SerializationsTest.java | 15 +- .../cassandra/gms/SerializationsTest.java | 5 +- .../cassandra/io/sstable/IndexSummaryTest.java | 11 +- .../metadata/MetadataSerializerTest.java | 3 +- .../cassandra/io/util/DataOutputTest.java | 251 ++++++++++ .../apache/cassandra/repair/ValidatorTest.java | 4 +- .../cassandra/service/SerializationsTest.java | 3 +- .../apache/cassandra/utils/BloomFilterTest.java | 3 +- .../cassandra/utils/ByteBufferUtilTest.java | 8 +- .../cassandra/utils/FastByteOperationsTest.java | 162 +++++++ .../cassandra/utils/IntervalTreeTest.java | 14 +- .../apache/cassandra/utils/MerkleTreeTest.java | 3 +- .../cassandra/utils/SerializationsTest.java | 5 +- .../cassandra/utils/StreamingHistogramTest.java | 6 +- 140 files changed, 1636 insertions(+), 720 deletions(-) ----------------------------------------------------------------------
