cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/16] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Date Mon, 27 Feb 2012 10:32:02 GMT
Merge branch 'cassandra-1.1.0' into cassandra-1.1


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

Branch: refs/heads/trunk
Commit: 5f43a695022e8d42e5b5a97137899c0322c9e59d
Parents: cbd46f1 a15c35b
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Feb 27 11:28:13 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Feb 27 11:28:13 2012 +0100

----------------------------------------------------------------------
 .../cassandra/auth/AllowAllAuthenticator.java      |   10 +-
 .../apache/cassandra/auth/AllowAllAuthority.java   |    8 +-
 .../apache/cassandra/auth/AuthenticatedUser.java   |    8 +-
 .../org/apache/cassandra/auth/IAuthenticator.java  |    8 +-
 src/java/org/apache/cassandra/auth/IAuthority.java |   16 +-
 src/java/org/apache/cassandra/auth/Permission.java |    8 +-
 src/java/org/apache/cassandra/auth/Resources.java  |    8 +-
 .../apache/cassandra/cache/AutoSavingCache.java    |    2 +-
 .../cassandra/cache/ConcurrentLinkedHashCache.java |    8 +-
 .../cache/ConcurrentLinkedHashCacheProvider.java   |    8 +-
 .../org/apache/cassandra/cache/FreeableMemory.java |    8 +-
 src/java/org/apache/cassandra/cache/ICache.java    |    8 +-
 .../apache/cassandra/cache/IRowCacheProvider.java  |    8 +-
 .../apache/cassandra/cache/InstrumentingCache.java |    8 +-
 .../org/apache/cassandra/cache/KeyCacheKey.java    |    3 -
 .../org/apache/cassandra/cache/RowCacheKey.java    |    1 -
 .../apache/cassandra/cache/SerializingCache.java   |   10 +-
 .../cassandra/cache/SerializingCacheProvider.java  |    8 +-
 src/java/org/apache/cassandra/cli/CliClient.java   |  146 ++++++------
 src/java/org/apache/cassandra/cli/CliCompiler.java |   16 +-
 .../org/apache/cassandra/cli/CliCompleter.java     |    4 +-
 src/java/org/apache/cassandra/cli/CliMain.java     |   20 +-
 .../org/apache/cassandra/cli/CliSessionState.java  |    4 +-
 src/java/org/apache/cassandra/cli/CliUtils.java    |    8 +-
 .../org/apache/cassandra/client/RingCache.java     |    4 +-
 .../concurrent/CreationTimeAwareFuture.java        |    8 +-
 .../DebuggableScheduledThreadPoolExecutor.java     |   11 +-
 .../concurrent/DebuggableThreadPoolExecutor.java   |    8 +-
 .../JMXConfigurableThreadPoolExecutor.java         |    6 +-
 .../concurrent/JMXEnabledThreadPoolExecutor.java   |    4 +-
 .../cassandra/concurrent/NamedThreadFactory.java   |    6 +-
 .../org/apache/cassandra/concurrent/Stage.java     |    8 +-
 .../apache/cassandra/concurrent/StageManager.java  |    6 +-
 .../org/apache/cassandra/config/CFMetaData.java    |   14 +-
 .../apache/cassandra/config/ColumnDefinition.java  |   32 ++--
 src/java/org/apache/cassandra/config/Config.java   |   39 ++--
 .../cassandra/config/DatabaseDescriptor.java       |   26 +-
 .../cassandra/config/RequestSchedulerOptions.java  |    8 +-
 .../apache/cassandra/config/SeedProviderDef.java   |    2 +-
 .../org/apache/cassandra/cql/CQLStatement.java     |   10 +-
 .../cassandra/cql/CreateColumnFamilyStatement.java |   28 ++--
 .../apache/cassandra/cql/CreateIndexStatement.java |   16 +-
 .../cassandra/cql/CreateKeyspaceStatement.java     |   24 +-
 .../org/apache/cassandra/cql/DeleteStatement.java  |   10 +-
 .../org/apache/cassandra/cql/QueryProcessor.java   |   98 ++++----
 src/java/org/apache/cassandra/cql/Relation.java    |   24 +-
 .../org/apache/cassandra/cql/SelectExpression.java |   36 ++--
 .../org/apache/cassandra/cql/SelectStatement.java  |   36 ++--
 .../org/apache/cassandra/cql/StatementType.java    |   10 +-
 src/java/org/apache/cassandra/cql/Term.java        |   44 ++--
 .../org/apache/cassandra/cql/UpdateStatement.java  |   36 ++--
 src/java/org/apache/cassandra/cql/WhereClause.java |   25 +-
 .../cassandra/cql/jdbc/AbstractJdbcType.java       |    8 +-
 .../cassandra/cql/jdbc/AbstractJdbcUUID.java       |   10 +-
 .../org/apache/cassandra/cql/jdbc/JdbcAscii.java   |   14 +-
 .../org/apache/cassandra/cql/jdbc/JdbcBoolean.java |   16 +-
 .../org/apache/cassandra/cql/jdbc/JdbcBytes.java   |   12 +-
 .../cassandra/cql/jdbc/JdbcCounterColumn.java      |   10 +-
 .../org/apache/cassandra/cql/jdbc/JdbcDate.java    |   18 +-
 .../org/apache/cassandra/cql/jdbc/JdbcDecimal.java |   18 +-
 .../org/apache/cassandra/cql/jdbc/JdbcDouble.java  |   16 +-
 .../org/apache/cassandra/cql/jdbc/JdbcFloat.java   |   16 +-
 .../org/apache/cassandra/cql/jdbc/JdbcInt32.java   |    8 +-
 .../org/apache/cassandra/cql/jdbc/JdbcInteger.java |   12 +-
 .../apache/cassandra/cql/jdbc/JdbcLexicalUUID.java |   12 +-
 .../org/apache/cassandra/cql/jdbc/JdbcLong.java    |    8 +-
 .../apache/cassandra/cql/jdbc/JdbcTimeUUID.java    |   12 +-
 .../org/apache/cassandra/cql/jdbc/JdbcUTF8.java    |   12 +-
 .../org/apache/cassandra/cql/jdbc/JdbcUUID.java    |   14 +-
 .../cassandra/cql/jdbc/MarshalException.java       |    8 +-
 .../org/apache/cassandra/cql/jdbc/TypesMap.java    |   12 +-
 .../org/apache/cassandra/cql3/CQLStatement.java    |    3 -
 .../org/apache/cassandra/cql3/QueryProcessor.java  |    5 -
 .../cassandra/cql3/statements/CFStatement.java     |    1 -
 .../statements/CreateColumnFamilyStatement.java    |    2 +-
 .../cql3/statements/CreateIndexStatement.java      |    2 -
 .../cassandra/cql3/statements/DeleteStatement.java |    1 -
 .../cassandra/cql3/statements/ParsedStatement.java |    7 -
 .../cql3/statements/SchemaAlteringStatement.java   |    1 -
 .../cassandra/cql3/statements/SelectStatement.java |    1 -
 .../apache/cassandra/db/CollationController.java   |    3 +-
 src/java/org/apache/cassandra/db/Column.java       |    2 +-
 src/java/org/apache/cassandra/db/ColumnFamily.java |    2 +-
 .../cassandra/db/ColumnFamilySerializer.java       |   11 +-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   18 +-
 .../cassandra/db/ColumnFamilyStoreMBean.java       |    1 -
 .../org/apache/cassandra/db/ColumnSerializer.java  |   11 +-
 .../org/apache/cassandra/db/CounterColumn.java     |    3 -
 .../org/apache/cassandra/db/CounterMutation.java   |    1 -
 .../cassandra/db/CounterMutationVerbHandler.java   |    5 -
 src/java/org/apache/cassandra/db/DataTracker.java  |    3 -
 .../org/apache/cassandra/db/DeletedColumn.java     |    4 +-
 src/java/org/apache/cassandra/db/EchoedRow.java    |    9 +-
 .../org/apache/cassandra/db/ExpiringColumn.java    |    4 +-
 .../org/apache/cassandra/db/IColumnContainer.java  |    8 +-
 .../org/apache/cassandra/db/IndexScanCommand.java  |    8 +-
 src/java/org/apache/cassandra/db/Memtable.java     |    5 +-
 .../org/apache/cassandra/db/MeteredFlusher.java    |    8 +-
 .../org/apache/cassandra/db/RangeSliceCommand.java |    3 +-
 src/java/org/apache/cassandra/db/ReadCommand.java  |    4 +-
 .../apache/cassandra/db/ReadRepairVerbHandler.java |    6 +-
 src/java/org/apache/cassandra/db/ReadResponse.java |   12 +-
 .../apache/cassandra/db/RowIteratorFactory.java    |    3 +-
 .../cassandra/db/RowMutationVerbHandler.java       |    6 +-
 .../cassandra/db/SchemaCheckVerbHandler.java       |    2 +-
 .../cassandra/db/SliceByNamesReadCommand.java      |    2 +-
 .../org/apache/cassandra/db/SnapshotCommand.java   |    8 +-
 src/java/org/apache/cassandra/db/SystemTable.java  |   14 +-
 src/java/org/apache/cassandra/db/Table.java        |   24 +--
 .../db/UnserializableColumnFamilyException.java    |    2 +-
 .../org/apache/cassandra/db/WriteResponse.java     |    6 +-
 .../db/columniterator/IColumnIterator.java         |   10 +-
 .../columniterator/ICountableColumnIterator.java   |    8 +-
 .../db/columniterator/IdentityQueryFilter.java     |    8 +-
 .../db/columniterator/IndexedSliceReader.java      |    8 +-
 .../db/columniterator/SSTableNamesIterator.java    |    8 +-
 .../db/columniterator/SSTableSliceIterator.java    |    8 +-
 .../SimpleAbstractColumnIterator.java              |    8 +-
 .../db/columniterator/SimpleSliceReader.java       |    9 +-
 .../AbstractCommitLogExecutorService.java          |   11 +-
 .../commitlog/BatchCommitLogExecutorService.java   |    8 +-
 .../apache/cassandra/db/commitlog/CommitLog.java   |   14 +-
 .../cassandra/db/commitlog/CommitLogAllocator.java |    4 +-
 .../cassandra/db/commitlog/CommitLogSegment.java   |   14 +-
 .../db/commitlog/ICommitLogExecutorService.java    |   10 +-
 .../PeriodicCommitLogExecutorService.java          |    8 +-
 .../cassandra/db/commitlog/ReplayPosition.java     |    8 +-
 .../db/compaction/AbstractCompactedRow.java        |    8 +-
 .../db/compaction/AbstractCompactionIterable.java  |    8 +-
 .../db/compaction/AbstractCompactionStrategy.java  |    1 -
 .../compaction/CompactionInterruptedException.java |    8 +-
 .../db/compaction/CompactionIterable.java          |    8 +-
 .../cassandra/db/compaction/CompactionManager.java |   16 +-
 .../db/compaction/CompactionManagerMBean.java      |    1 -
 .../db/compaction/LazilyCompactedRow.java          |    9 +-
 .../db/compaction/LeveledCompactionStrategy.java   |    8 +-
 .../db/compaction/LeveledCompactionTask.java       |   15 +-
 .../cassandra/db/compaction/LeveledManifest.java   |    9 +-
 .../cassandra/db/compaction/OperationType.java     |    8 +-
 .../cassandra/db/compaction/PrecompactedRow.java   |    8 +-
 .../compaction/SizeTieredCompactionStrategy.java   |    1 -
 .../db/filter/AbstractColumnIterator.java          |    8 +-
 .../apache/cassandra/db/filter/ExtendedFilter.java |    8 +-
 .../cassandra/db/filter/NamesQueryFilter.java      |   10 +-
 .../apache/cassandra/db/filter/QueryFilter.java    |    8 +-
 .../org/apache/cassandra/db/filter/QueryPath.java  |   12 +-
 .../cassandra/db/filter/SliceQueryFilter.java      |   14 +-
 .../db/index/PerColumnSecondaryIndex.java          |   14 +-
 .../cassandra/db/index/PerRowSecondaryIndex.java   |   16 +-
 .../apache/cassandra/db/index/SecondaryIndex.java  |   80 ++++----
 .../cassandra/db/index/SecondaryIndexBuilder.java  |    2 +-
 .../cassandra/db/index/SecondaryIndexManager.java  |  180 +++++++-------
 .../cassandra/db/index/SecondaryIndexSearcher.java |    4 +-
 .../apache/cassandra/db/index/keys/KeysIndex.java  |   22 +-
 .../cassandra/db/index/keys/KeysSearcher.java      |    6 +-
 .../db/marshal/AbstractCommutativeType.java        |   10 +-
 .../apache/cassandra/db/marshal/AbstractType.java  |   12 +-
 .../org/apache/cassandra/db/marshal/AsciiType.java |    8 +-
 .../apache/cassandra/db/marshal/BooleanType.java   |   18 +-
 .../org/apache/cassandra/db/marshal/BytesType.java |   12 +-
 .../cassandra/db/marshal/CounterColumnType.java    |    8 +-
 .../org/apache/cassandra/db/marshal/DateType.java  |   20 +-
 .../apache/cassandra/db/marshal/DecimalType.java   |   14 +-
 .../apache/cassandra/db/marshal/DoubleType.java    |   22 +-
 .../org/apache/cassandra/db/marshal/FloatType.java |   20 +-
 .../org/apache/cassandra/db/marshal/Int32Type.java |   12 +-
 .../apache/cassandra/db/marshal/IntegerType.java   |    2 +-
 .../cassandra/db/marshal/LexicalUUIDType.java      |    8 +-
 .../cassandra/db/marshal/LocalByPartionerType.java |    4 +-
 .../org/apache/cassandra/db/marshal/LongType.java  |   12 +-
 .../cassandra/db/marshal/MarshalException.java     |    8 +-
 .../apache/cassandra/db/marshal/TimeUUIDType.java  |   16 +-
 .../org/apache/cassandra/db/marshal/UTF8Type.java  |   18 +-
 .../org/apache/cassandra/db/marshal/UUIDType.java  |   10 +-
 .../cassandra/db/migration/AddColumnFamily.java    |    2 +-
 .../apache/cassandra/db/migration/AddKeyspace.java |    2 +-
 .../cassandra/db/migration/DropColumnFamily.java   |    2 +-
 .../cassandra/db/migration/DropKeyspace.java       |    4 +-
 .../apache/cassandra/db/migration/Migration.java   |    6 +-
 .../org/apache/cassandra/dht/AbstractBounds.java   |    8 +-
 .../org/apache/cassandra/dht/BootStrapper.java     |   13 +-
 src/java/org/apache/cassandra/dht/Bounds.java      |    8 +-
 src/java/org/apache/cassandra/dht/BytesToken.java  |    6 +-
 .../org/apache/cassandra/dht/IPartitioner.java     |    6 +-
 .../org/apache/cassandra/dht/LocalPartitioner.java |    4 +-
 .../cassandra/dht/OrderPreservingPartitioner.java  |    2 +-
 .../apache/cassandra/dht/RandomPartitioner.java    |    2 +-
 src/java/org/apache/cassandra/dht/Range.java       |    3 -
 .../org/apache/cassandra/dht/RingPosition.java     |    9 -
 .../org/apache/cassandra/gms/ApplicationState.java |    8 +-
 .../org/apache/cassandra/gms/EndpointState.java    |   22 +-
 .../org/apache/cassandra/gms/FailureDetector.java  |   48 ++--
 .../org/apache/cassandra/gms/GossipDigest.java     |   20 +-
 .../cassandra/gms/GossipDigestAck2Message.java     |   10 +-
 .../cassandra/gms/GossipDigestAck2VerbHandler.java |    8 +-
 .../cassandra/gms/GossipDigestAckMessage.java      |   10 +-
 .../cassandra/gms/GossipDigestAckVerbHandler.java  |    8 +-
 .../cassandra/gms/GossipDigestSynMessage.java      |   26 +-
 .../cassandra/gms/GossipDigestSynVerbHandler.java  |    8 +-
 src/java/org/apache/cassandra/gms/Gossiper.java    |   37 ++--
 .../org/apache/cassandra/gms/HeartBeatState.java   |   14 +-
 .../gms/IEndpointStateChangeSubscriber.java        |    4 +-
 .../gms/IFailureDetectionEventListener.java        |    2 +-
 .../org/apache/cassandra/gms/IFailureDetector.java |   26 +-
 .../apache/cassandra/gms/IFailureNotification.java |    2 +-
 .../org/apache/cassandra/gms/VersionGenerator.java |    4 +-
 .../org/apache/cassandra/gms/VersionedValue.java   |    6 +-
 .../apache/cassandra/hadoop/BulkOutputFormat.java  |   15 +-
 .../apache/cassandra/hadoop/BulkRecordWriter.java  |   11 +-
 .../cassandra/hadoop/ColumnFamilyInputFormat.java  |    6 +-
 .../cassandra/hadoop/ColumnFamilyOutputFormat.java |   22 +-
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |   42 ++--
 .../cassandra/hadoop/ColumnFamilyRecordWriter.java |   27 +--
 .../apache/cassandra/hadoop/ColumnFamilySplit.java |   10 +-
 .../org/apache/cassandra/hadoop/ConfigHelper.java  |   24 +-
 .../cassandra/hadoop/pig/CassandraStorage.java     |   10 +-
 src/java/org/apache/cassandra/io/ISerializer.java  |    8 +-
 .../apache/cassandra/io/IVersionedSerializer.java  |    8 +-
 .../io/compress/CompressedSequentialWriter.java    |    4 +-
 .../cassandra/io/compress/DeflateCompressor.java   |    1 -
 .../apache/cassandra/io/compress/ICompressor.java  |    1 -
 .../cassandra/io/sstable/BloomFilterTracker.java   |    8 +-
 .../org/apache/cassandra/io/sstable/Component.java |   10 +-
 .../apache/cassandra/io/sstable/Descriptor.java    |   15 +-
 .../apache/cassandra/io/sstable/IndexSummary.java  |    1 -
 .../apache/cassandra/io/sstable/KeyIterator.java   |    8 +-
 .../cassandra/io/sstable/ReducingKeyIterator.java  |    8 +-
 .../org/apache/cassandra/io/sstable/SSTable.java   |    5 +-
 .../io/sstable/SSTableIdentityIterator.java        |    8 +-
 .../cassandra/io/sstable/SSTableMetadata.java      |    4 +-
 .../apache/cassandra/io/sstable/SSTableReader.java |    3 -
 .../io/sstable/SSTableSimpleUnsortedWriter.java    |    8 -
 .../apache/cassandra/io/sstable/SSTableWriter.java |    6 +-
 .../cassandra/io/util/BufferedSegmentedFile.java   |    8 +-
 .../apache/cassandra/io/util/ColumnSortedMap.java  |    9 +-
 .../apache/cassandra/io/util/DataOutputBuffer.java |    8 +-
 .../io/util/FastByteArrayInputStream.java          |   22 +-
 .../io/util/FastByteArrayOutputStream.java         |   24 +-
 .../apache/cassandra/io/util/FileDataInput.java    |    8 +-
 .../org/apache/cassandra/io/util/FileMark.java     |    8 +-
 .../org/apache/cassandra/io/util/FileUtils.java    |    8 +-
 .../apache/cassandra/io/util/IIterableColumns.java |    8 +-
 .../cassandra/io/util/MemoryInputStream.java       |   20 +-
 .../cassandra/io/util/MemoryOutputStream.java      |   14 +-
 .../cassandra/io/util/MmappedSegmentedFile.java    |    8 +-
 .../org/apache/cassandra/io/util/OutputBuffer.java |    6 +-
 .../apache/cassandra/io/util/SegmentedFile.java    |    4 +-
 .../locator/AbstractNetworkTopologySnitch.java     |    1 -
 .../cassandra/locator/DynamicEndpointSnitch.java   |    4 +-
 .../cassandra/locator/Ec2MultiRegionSnitch.java    |   22 +-
 .../org/apache/cassandra/locator/Ec2Snitch.java    |    2 +-
 .../cassandra/locator/EndpointSnitchInfoMBean.java |    2 +-
 .../cassandra/locator/NetworkTopologyStrategy.java |   11 +-
 .../org/apache/cassandra/locator/SeedProvider.java |    4 +-
 .../cassandra/locator/SimpleSeedProvider.java      |   12 +-
 .../org/apache/cassandra/locator/SimpleSnitch.java |    2 -
 .../apache/cassandra/locator/TokenMetadata.java    |    4 +-
 src/java/org/apache/cassandra/net/AsyncResult.java |   16 +-
 .../cassandra/net/CachingMessageProducer.java      |   10 +-
 .../org/apache/cassandra/net/CallbackInfo.java     |    2 +-
 .../net/CompactEndpointSerializationHelper.java    |    4 +-
 src/java/org/apache/cassandra/net/Header.java      |    8 +-
 src/java/org/apache/cassandra/net/HeaderTypes.java |    2 +-
 .../org/apache/cassandra/net/IAsyncResult.java     |    4 +-
 .../org/apache/cassandra/net/IMessageCallback.java |    8 +-
 .../cassandra/net/IncomingTcpConnection.java       |   22 +-
 src/java/org/apache/cassandra/net/Message.java     |   12 +-
 .../org/apache/cassandra/net/MessageProducer.java  |    8 +-
 .../org/apache/cassandra/net/MessagingService.java |    6 +-
 .../cassandra/net/OutboundTcpConnection.java       |   10 +-
 .../cassandra/net/OutboundTcpConnectionPool.java   |    8 +-
 .../apache/cassandra/net/ResponseVerbHandler.java  |    2 +-
 .../cassandra/notifications/INotification.java     |    8 +-
 .../notifications/INotificationConsumer.java       |    8 +-
 .../notifications/SSTableAddedNotification.java    |   10 +-
 .../SSTableListChangedNotification.java            |   10 +-
 .../cassandra/scheduler/IRequestScheduler.java     |   10 +-
 .../apache/cassandra/scheduler/NoScheduler.java    |   10 +-
 .../cassandra/scheduler/RoundRobinScheduler.java   |   14 +-
 .../apache/cassandra/scheduler/WeightedQueue.java  |    8 +-
 .../cassandra/scheduler/WeightedQueueMBean.java    |    8 +-
 .../org/apache/cassandra/security/SSLFactory.java  |    2 +-
 .../cassandra/service/AbstractCassandraDaemon.java |   38 ++--
 .../cassandra/service/AbstractRowResolver.java     |    8 +-
 .../service/AbstractWriteResponseHandler.java      |   13 +-
 .../cassandra/service/AntiEntropyService.java      |   21 +-
 .../cassandra/service/AsyncRepairCallback.java     |    8 +-
 .../org/apache/cassandra/service/CacheService.java |    4 -
 .../apache/cassandra/service/CassandraDaemon.java  |   25 +-
 .../org/apache/cassandra/service/ClientState.java  |   12 +-
 .../cassandra/service/DatacenterReadCallback.java  |   12 +-
 .../DatacenterSyncWriteResponseHandler.java        |    8 +-
 .../service/DatacenterWriteResponseHandler.java    |   10 +-
 .../service/EmbeddedCassandraService.java          |    8 +-
 .../org/apache/cassandra/service/GCInspector.java  |   18 +-
 .../org/apache/cassandra/service/IReadCommand.java |    8 +-
 .../cassandra/service/IWriteResponseHandler.java   |    1 -
 .../service/RangeSliceResponseResolver.java        |    3 -
 .../apache/cassandra/service/RepairCallback.java   |    8 +-
 .../service/SocketSessionManagementService.java    |    8 +-
 .../org/apache/cassandra/service/StorageProxy.java |   18 +-
 .../apache/cassandra/service/StorageService.java   |   20 +-
 .../cassandra/service/StorageServiceMBean.java     |   10 +-
 .../apache/cassandra/streaming/FileStreamTask.java |    5 +-
 .../apache/cassandra/streaming/PendingFile.java    |   16 +-
 .../streaming/ReplicationFinishedVerbHandler.java  |    8 +-
 .../apache/cassandra/streaming/StreamHeader.java   |    2 +-
 .../org/apache/cassandra/streaming/StreamIn.java   |   13 +-
 .../org/apache/cassandra/streaming/StreamOut.java  |    4 +-
 .../cassandra/streaming/StreamOutSession.java      |    4 +-
 .../apache/cassandra/streaming/StreamReply.java    |    8 +-
 .../cassandra/streaming/StreamRequestMessage.java  |   16 +-
 .../streaming/StreamRequestVerbHandler.java        |    2 +-
 .../cassandra/streaming/StreamingService.java      |    2 +-
 .../cassandra/streaming/StreamingServiceMBean.java |    2 +-
 .../apache/cassandra/thrift/CassandraDaemon.java   |   29 ++--
 .../apache/cassandra/thrift/CassandraServer.java   |   56 +++---
 .../apache/cassandra/thrift/CustomTHsHaServer.java |   34 ++--
 .../cassandra/thrift/CustomTNonBlockingServer.java |    8 +-
 .../cassandra/thrift/CustomTThreadPoolServer.java  |    7 +-
 .../org/apache/cassandra/thrift/RequestType.java   |    8 +-
 .../thrift/TCustomNonblockingServerSocket.java     |   10 +-
 .../cassandra/thrift/TCustomServerSocket.java      |   12 +-
 .../org/apache/cassandra/thrift/TCustomSocket.java |   48 ++--
 .../apache/cassandra/thrift/ThriftValidation.java  |   16 +-
 .../org/apache/cassandra/tools/BulkLoader.java     |    4 -
 src/java/org/apache/cassandra/tools/NodeCmd.java   |   58 +++---
 src/java/org/apache/cassandra/tools/NodeProbe.java |   47 ++--
 .../org/apache/cassandra/tools/SSTableExport.java  |   16 +-
 .../org/apache/cassandra/tools/SSTableImport.java  |   10 +-
 src/java/org/apache/cassandra/utils/Allocator.java |    2 +-
 .../cassandra/utils/BloomFilterSerializer.java     |    8 +-
 .../org/apache/cassandra/utils/ByteBufferUtil.java |   42 ++--
 .../apache/cassandra/utils/BytesReadTracker.java   |    4 +-
 src/java/org/apache/cassandra/utils/CLibrary.java  |    6 +-
 .../apache/cassandra/utils/CloseableIterator.java  |    8 +-
 .../org/apache/cassandra/utils/DefaultDouble.java  |   14 +-
 .../org/apache/cassandra/utils/DefaultInteger.java |   16 +-
 .../apache/cassandra/utils/EstimatedHistogram.java |    6 +-
 .../org/apache/cassandra/utils/FBUtilities.java    |    8 +-
 .../cassandra/utils/FastByteComparisons.java       |    6 +-
 .../org/apache/cassandra/utils/GuidGenerator.java  |    6 +-
 src/java/org/apache/cassandra/utils/Hex.java       |    8 +-
 .../org/apache/cassandra/utils/IMergeIterator.java |    8 +-
 .../cassandra/utils/IntervalTree/Interval.java     |    8 +-
 .../cassandra/utils/IntervalTree/IntervalNode.java |    8 +-
 .../cassandra/utils/IntervalTree/IntervalTree.java |    8 +-
 .../org/apache/cassandra/utils/LatencyTracker.java |    8 +-
 .../apache/cassandra/utils/LegacyBloomFilter.java  |    1 -
 .../utils/LegacyBloomFilterSerializer.java         |   10 +-
 .../org/apache/cassandra/utils/MerkleTree.java     |   42 ++--
 .../org/apache/cassandra/utils/MurmurHash.java     |    4 +-
 src/java/org/apache/cassandra/utils/Mx4jTool.java  |    8 +-
 src/java/org/apache/cassandra/utils/Pair.java      |    4 +-
 .../apache/cassandra/utils/ResourceWatcher.java    |   10 +-
 .../apache/cassandra/utils/SimpleCondition.java    |   10 +-
 .../cassandra/utils/SkipNullRepresenter.java       |    8 +-
 .../org/apache/cassandra/utils/SlabAllocator.java  |    7 +-
 .../org/apache/cassandra/utils/StatusLogger.java   |   10 +-
 src/java/org/apache/cassandra/utils/Throttle.java  |    2 +-
 src/java/org/apache/cassandra/utils/UUIDGen.java   |   60 +++---
 .../apache/cassandra/utils/WrappedRunnable.java    |    8 +-
 .../org/apache/cassandra/utils/obs/OpenBitSet.java |   16 +-
 .../apache/cassandra/db/MeteredFlusherTest.java    |    8 +-
 .../db/compaction/LongCompactionSpeedTest.java     |    2 -
 .../cassandra/utils/LongBloomFilterTest.java       |    1 -
 .../cassandra/utils/LongLegacyBloomFilterTest.java |    1 -
 .../cassandra/AbstractSerializationsTester.java    |   18 +-
 test/unit/org/apache/cassandra/EmbeddedServer.java |   12 +-
 test/unit/org/apache/cassandra/SchemaLoader.java   |    7 +-
 test/unit/org/apache/cassandra/Util.java           |   12 +-
 .../apache/cassandra/cache/CacheProviderTest.java  |   16 +-
 test/unit/org/apache/cassandra/cli/CliTest.java    |    3 +-
 .../org/apache/cassandra/client/TestRingCache.java |    6 +-
 .../DebuggableThreadPoolExecutorTest.java          |    8 +-
 .../cassandra/config/ColumnDefinitionTest.java     |    8 +-
 .../cassandra/config/DatabaseDescriptorTest.java   |    2 +-
 .../apache/cassandra/cql/jdbc/ClientUtilsTest.java |    8 +-
 .../cassandra/db/ArrayBackedSortedColumnsTest.java |    8 +-
 test/unit/org/apache/cassandra/db/CleanupTest.java |    3 -
 .../apache/cassandra/db/ColumnFamilyStoreTest.java |  106 ++++-----
 .../org/apache/cassandra/db/CommitLogTest.java     |    5 +-
 .../org/apache/cassandra/db/CounterColumnTest.java |    7 -
 test/unit/org/apache/cassandra/db/DefsTest.java    |   82 ++++----
 .../org/apache/cassandra/db/DirectoriesTest.java   |    1 -
 .../unit/org/apache/cassandra/db/KeyCacheTest.java |   11 +-
 .../org/apache/cassandra/db/KeyCollisionTest.java  |    2 -
 .../org/apache/cassandra/db/MultitableTest.java    |    9 +-
 .../unit/org/apache/cassandra/db/NameSortTest.java |    3 -
 .../org/apache/cassandra/db/ReadMessageTest.java   |   34 ++--
 .../apache/cassandra/db/RecoveryManager2Test.java  |   11 +-
 .../apache/cassandra/db/RecoveryManager3Test.java  |    8 +-
 .../apache/cassandra/db/RecoveryManagerTest.java   |    1 -
 .../cassandra/db/RecoveryManagerTruncateTest.java  |    1 -
 .../cassandra/db/RemoveColumnFamilyTest.java       |    1 -
 .../db/RemoveColumnFamilyWithFlush1Test.java       |    1 -
 .../db/RemoveColumnFamilyWithFlush2Test.java       |    1 -
 .../org/apache/cassandra/db/RemoveColumnTest.java  |    1 -
 .../apache/cassandra/db/RemoveSubColumnTest.java   |    1 -
 .../apache/cassandra/db/RemoveSuperColumnTest.java |    1 -
 .../org/apache/cassandra/db/RowIterationTest.java  |    3 -
 test/unit/org/apache/cassandra/db/RowTest.java     |    1 -
 test/unit/org/apache/cassandra/db/ScrubTest.java   |   41 ++--
 .../apache/cassandra/db/SerializationsTest.java    |   80 ++++----
 .../org/apache/cassandra/db/SuperColumnTest.java   |    8 +-
 .../org/apache/cassandra/db/SystemTableTest.java   |    8 +-
 test/unit/org/apache/cassandra/db/TableTest.java   |   34 ++--
 .../cassandra/db/context/CounterContextTest.java   |   14 +-
 .../cassandra/db/marshal/CompositeTypeTest.java    |    1 -
 .../cassandra/db/marshal/DecimalTypeTest.java      |   28 ++--
 .../db/marshal/DynamicCompositeTypeTest.java       |    1 -
 .../apache/cassandra/db/marshal/RoundTripTest.java |   30 ++--
 .../cassandra/db/marshal/TimeUUIDTypeTest.java     |   12 +-
 .../cassandra/db/marshal/TypeCompareTest.java      |   12 +-
 .../cassandra/db/marshal/TypeParserTest.java       |   13 -
 .../cassandra/db/marshal/TypeValidationTest.java   |   34 ++--
 .../apache/cassandra/db/marshal/UUIDTypeTest.java  |    8 +-
 .../org/apache/cassandra/dht/BootStrapperTest.java |   30 ++--
 .../cassandra/dht/ByteOrderedPartitionerTest.java  |    4 -
 .../CollatingOrderPreservingPartitionerTest.java   |    4 -
 .../dht/OrderPreservingPartitionerTest.java        |    5 -
 .../apache/cassandra/dht/PartitionerTestCase.java  |   10 +-
 .../cassandra/dht/RandomPartitionerTest.java       |   14 +-
 .../apache/cassandra/gms/ArrivalWindowTest.java    |   12 +-
 .../org/apache/cassandra/gms/GossipDigestTest.java |   12 +-
 .../apache/cassandra/gms/SerializationsTest.java   |   26 +-
 .../hadoop/ColumnFamilyInputFormatTest.java        |    8 +-
 .../cassandra/io/BloomFilterTrackerTest.java       |    8 +-
 .../apache/cassandra/io/CompactSerializerTest.java |   24 +-
 .../cassandra/io/LazilyCompactedRowTest.java       |    8 +-
 .../cassandra/io/sstable/DescriptorTest.java       |   12 +-
 .../cassandra/io/sstable/IndexHelperTest.java      |    2 -
 .../cassandra/io/sstable/SSTableReaderTest.java    |   10 +-
 .../io/sstable/SSTableSimpleWriterTest.java        |    1 -
 .../apache/cassandra/io/sstable/SSTableTest.java   |    1 -
 .../apache/cassandra/locator/EC2SnitchTest.java    |   14 +-
 .../cassandra/locator/SimpleStrategyTest.java      |    6 +-
 .../cassandra/locator/TokenMetadataTest.java       |    3 -
 .../apache/cassandra/net/MessageSerializer.java    |    8 +-
 .../service/AntiEntropyServiceCounterTest.java     |    8 +-
 .../service/AntiEntropyServiceStandardTest.java    |    8 +-
 .../service/AntiEntropyServiceTestAbstract.java    |    7 +-
 .../service/EmbeddedCassandraServiceTest.java      |    5 +-
 .../apache/cassandra/service/InitClientTest.java   |    2 +-
 .../apache/cassandra/service/RowResolverTest.java  |    8 +-
 .../cassandra/service/SerializationsTest.java      |   20 +-
 .../apache/cassandra/service/StorageProxyTest.java |    3 -
 .../service/StorageServiceClientTest.java          |    1 -
 .../service/StorageServiceServerTest.java          |    1 -
 .../cassandra/streaming/SerializationsTest.java    |   39 ++--
 .../org/apache/cassandra/streaming/StreamUtil.java |    5 +-
 .../cassandra/streaming/StreamingTransferTest.java |    8 +-
 .../cassandra/thrift/ThriftValidationTest.java     |    8 +-
 .../apache/cassandra/tools/SSTableExportTest.java  |   40 ++--
 .../apache/cassandra/tools/SSTableImportTest.java  |    6 +-
 .../cassandra/utils/BoundedStatsDequeTest.java     |   18 +-
 .../apache/cassandra/utils/ByteBufferUtilTest.java |    1 -
 .../apache/cassandra/utils/FBUtilitiesTest.java    |    7 +-
 .../apache/cassandra/utils/FilterTestHelper.java   |    9 -
 test/unit/org/apache/cassandra/utils/HexTest.java  |    2 +-
 .../org/apache/cassandra/utils/IntervalTest.java   |    9 +-
 .../apache/cassandra/utils/IntervalTreeTest.java   |    8 +-
 .../cassandra/utils/LegacyBloomFilterTest.java     |    2 +-
 .../apache/cassandra/utils/MergeIteratorTest.java  |    6 +-
 .../org/apache/cassandra/utils/MerkleTreeTest.java |   30 ++--
 .../apache/cassandra/utils/SerializationsTest.java |   30 ++--
 .../unit/org/apache/cassandra/utils/UUIDTests.java |   10 +-
 .../stress/operations/CqlCounterAdder.java         |    8 +-
 .../stress/operations/CqlCounterGetter.java        |    8 +-
 .../stress/operations/CqlIndexedRangeSlicer.java   |    9 +-
 .../cassandra/stress/operations/CqlInserter.java   |   20 +-
 .../stress/operations/CqlMultiGetter.java          |    8 +-
 .../stress/operations/CqlRangeSlicer.java          |   13 +-
 .../cassandra/stress/operations/CqlReader.java     |    9 +-
 .../cassandra/stress/server/StressThread.java      |    2 -
 475 files changed, 2678 insertions(+), 3024 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/cql/DeleteStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/cql/QueryProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/db/RowIteratorFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/db/Table.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 5fcb67d,2d99d1c..110903c
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@@ -538,9 -538,11 +538,9 @@@ public class SecondaryIndexManage
       */
      private List<SecondaryIndexSearcher> getIndexSearchersForQuery(List<IndexExpression>
clause)
      {
 -        List<SecondaryIndexSearcher> indexSearchers = new ArrayList<SecondaryIndexSearcher>();
 -
          Map<String, Set<ByteBuffer>> groupByIndexType = new HashMap<String,
Set<ByteBuffer>>();
-  
-         
+ 
+ 
          //Group columns by type
          for (IndexExpression ix : clause)
          {
@@@ -556,12 -558,10 +556,12 @@@
                  columns = new HashSet<ByteBuffer>();
                  groupByIndexType.put(index.getClass().getCanonicalName(), columns);
              }
-             
-             columns.add(ix.column_name);        
+ 
+             columns.add(ix.column_name);
          }
-         
+ 
 +        List<SecondaryIndexSearcher> indexSearchers = new ArrayList<SecondaryIndexSearcher>(groupByIndexType.size());
 +
          //create searcher per type
          for (Map.Entry<String, Set<ByteBuffer>> entry : groupByIndexType.entrySet())
          {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/dht/Range.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
index 52ebb91,ca71aca..21a4667
--- a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
+++ b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
@@@ -32,13 -32,13 +32,13 @@@ import org.slf4j.LoggerFactory
  public class SimpleSeedProvider implements SeedProvider
  {
      private static final Logger logger = LoggerFactory.getLogger(SimpleSeedProvider.class);
-     
+ 
      private List<InetAddress> seeds;
-     
+ 
      public SimpleSeedProvider(Map<String, String> args)
      {
 -        seeds = new ArrayList<InetAddress>();
          String[] hosts = args.get("seeds").split(",", -1);
 +        seeds = new ArrayList<InetAddress>(hosts.length);
          for (String host : hosts)
          {
              try

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/service/AntiEntropyService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index bb67a5a,026b931..6b048b5
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -44,7 -44,7 +44,6 @@@ public interface CassandraDaemo
      /**
       * Start the Cassandra Daemon, assuming that it has already been
       * initialized (via {@link CassandraDaemon#init(String[])})
-      * 
 -     *
       * @throws IOException
       */
      public void start() throws IOException;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/streaming/StreamRequestMessage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 35a1db5,46b369b..3a6894f
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -72,9 -69,8 +70,9 @@@ public class NodeCm
          options.addOption(PASSWORD_OPT, true, "remote jmx agent password");
          options.addOption(TAG_OPT,      true, "optional name to give a snapshot");
          options.addOption(PRIMARY_RANGE_OPT, false, "only repair the first range returned
by the partitioner for the node");
 +        options.addOption(SNAPSHOT_REPAIR_OPT, false, "repair one node at a time using snapshots");
      }
-     
+ 
      public NodeCmd(NodeProbe probe)
      {
          this.probe = probe;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f43a695/test/unit/org/apache/cassandra/cli/CliTest.java
----------------------------------------------------------------------


Mime
View raw message