Updated Branches: refs/heads/trunk 18c5441cc -> a62800d21
Merge branch 'trunk' 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/a62800d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a62800d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a62800d2 Branch: refs/heads/trunk Commit: a62800d21bb1b5c120bf0fc79f00b7a705dab65b Parents: eac19fe 18c5441 Author: Sylvain Lebresne <[email protected]> Authored: Fri Feb 24 16:48:56 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Feb 24 16:48:56 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 + NEWS.txt | 4 + src/java/org/apache/cassandra/cli/Cli.g | 21 ++- src/java/org/apache/cassandra/cli/CliClient.java | 36 +++- .../org/apache/cassandra/config/KSMetaData.java | 4 +- .../org/apache/cassandra/cql/DeleteStatement.java | 2 +- .../org/apache/cassandra/cql/QueryProcessor.java | 18 +- .../cassandra/cql3/statements/BatchStatement.java | 2 +- .../statements/CreateColumnFamilyStatement.java | 2 +- .../cassandra/cql3/statements/DeleteStatement.java | 2 +- .../cassandra/cql3/statements/SelectStatement.java | 11 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 12 +- src/java/org/apache/cassandra/db/DefsTable.java | 9 +- src/java/org/apache/cassandra/db/Directories.java | 15 + .../apache/cassandra/db/RowIteratorFactory.java | 1 - src/java/org/apache/cassandra/db/RowMutation.java | 2 +- .../cassandra/db/SliceByNamesReadCommand.java | 2 +- src/java/org/apache/cassandra/db/SystemTable.java | 2 +- src/java/org/apache/cassandra/db/Table.java | 2 +- .../apache/cassandra/db/commitlog/CommitLog.java | 4 +- .../cassandra/db/commitlog/CommitLogSegment.java | 7 +- .../cassandra/db/compaction/CompactionManager.java | 51 +++-- .../db/compaction/ParallelCompactionIterable.java | 4 +- .../compaction/SizeTieredCompactionStrategy.java | 2 +- .../cassandra/db/index/SecondaryIndexManager.java | 4 +- .../db/marshal/AbstractCompositeType.java | 4 +- .../dht/AbstractByteOrderedPartitioner.java | 2 +- .../cassandra/dht/OrderPreservingPartitioner.java | 2 +- src/java/org/apache/cassandra/dht/Range.java | 4 +- .../cassandra/gms/GossipDigestSynVerbHandler.java | 2 +- .../cassandra/hadoop/pig/CassandraStorage.java | 5 +- .../cassandra/io/sstable/ReducingKeyIterator.java | 2 +- .../cassandra/locator/SimpleSeedProvider.java | 2 +- .../org/apache/cassandra/net/MessagingService.java | 2 +- .../cassandra/service/AntiEntropyService.java | 223 ++++++++++++-- .../org/apache/cassandra/service/CacheService.java | 2 +- .../apache/cassandra/service/MigrationManager.java | 2 +- .../org/apache/cassandra/service/StorageProxy.java | 4 +- .../apache/cassandra/service/StorageService.java | 40 ++-- .../cassandra/service/StorageServiceMBean.java | 4 +- .../cassandra/streaming/StreamRequestMessage.java | 2 +- .../apache/cassandra/thrift/CassandraServer.java | 4 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 7 +- src/java/org/apache/cassandra/tools/NodeProbe.java | 8 +- .../org/apache/cassandra/utils/PureJavaCrc32.java | 1 + .../org/apache/cassandra/cli/CliHelp.yaml | 21 ++ test/unit/org/apache/cassandra/cli/CliTest.java | 7 +- 47 files changed, 430 insertions(+), 142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a62800d2/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
