Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D639110AE4 for ; Wed, 19 Mar 2014 17:12:38 +0000 (UTC) Received: (qmail 3728 invoked by uid 500); 19 Mar 2014 17:12:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3701 invoked by uid 500); 19 Mar 2014 17:12:32 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 3244 invoked by uid 99); 19 Mar 2014 17:12:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2014 17:12:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1135F9848A7; Wed, 19 Mar 2014 17:12:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Wed, 19 Mar 2014 17:12:32 -0000 Message-Id: <1196dfa314714e4b9fef77695bd90e13@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/16] git commit: Merge remote-tracking branch 'origin/trunk' into trunk Merge remote-tracking branch 'origin/trunk' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e13b11d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e13b11d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e13b11d4 Branch: refs/heads/trunk Commit: e13b11d46d7ae836a039bff5fb8cdb650d9dcb94 Parents: f0227a6 9f05783 Author: Jonathan Ellis Authored: Wed Mar 19 12:12:06 2014 -0500 Committer: Jonathan Ellis Committed: Wed Mar 19 12:12:06 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(-) ----------------------------------------------------------------------