You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2012/07/17 19:33:04 UTC
[42/50] git commit: Merge branch 'p/4125/01_admin_tools' into
refs/top-bases/p/4127/01_migration_path
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cdbbc69c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cdbbc69c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cdbbc69c
Branch: refs/heads/vnodes
Commit: cdbbc69c4951329d1a99eb03e028a0c2a5b9bd24
Parents: 4a9b40e 0d646f1
Author: Eric Evans <ee...@apache.org>
Authored: Sat Jul 14 12:36:17 2012 -0600
Committer: Eric Evans <ee...@apache.org>
Committed: Sat Jul 14 12:36:17 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 7 +-
NEWS.txt | 2 +
README.txt | 86 ++---
bin/cqlsh | 13 +-
conf/cassandra-env.sh | 6 +
examples/pig/test/populate-cli.txt | 20 +
examples/pig/test/test_storage.pig | 17 +-
interface/cassandra.thrift | 8 +-
.../org/apache/cassandra/thrift/Cassandra.java | 4 +
.../org/apache/cassandra/thrift/Constants.java | 2 +-
.../apache/cassandra/thrift/TimedOutException.java | 118 ++++++-
pylib/cqlshlib/cql3handling.py | 15 +-
.../org/apache/cassandra/config/CFMetaData.java | 1 -
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/config/KSMetaData.java | 3 +-
.../org/apache/cassandra/cql/QueryProcessor.java | 17 +-
.../cql3/statements/ModificationStatement.java | 9 +-
.../org/apache/cassandra/db/CounterColumn.java | 3 +-
.../cassandra/db/CounterMutationVerbHandler.java | 7 +-
.../apache/cassandra/db/HintedHandOffManager.java | 4 +-
.../db/compaction/AbstractCompactionStrategy.java | 44 ++
.../db/compaction/LeveledCompactionStrategy.java | 45 ++-
.../cassandra/db/compaction/LeveledManifest.java | 6 +
.../cassandra/db/compaction/OperationType.java | 2 +
.../compaction/SizeTieredCompactionStrategy.java | 35 +--
.../cassandra/hadoop/pig/CassandraStorage.java | 44 ++-
.../service/AbstractWriteResponseHandler.java | 7 +-
.../DatacenterSyncWriteResponseHandler.java | 14 +-
.../cassandra/service/IWriteResponseHandler.java | 3 +-
.../org/apache/cassandra/service/StorageProxy.java | 34 +-
.../cassandra/service/WriteResponseHandler.java | 10 +-
.../apache/cassandra/thrift/CassandraServer.java | 28 +-
.../org/apache/cassandra/tools/SSTableExport.java | 120 +++++-
.../org/apache/cassandra/tools/SSTableImport.java | 245 +++++++-----
test/resources/CounterCF.json | 6 +-
test/resources/SimpleCF.json | 8 +-
test/resources/SimpleCF.oldformat.json | 8 +-
test/resources/SimpleCFWithDeletionInfo.json | 4 +
test/resources/SuperCF.json | 8 +-
test/resources/UnsortedCF.json | 4 +
test/resources/UnsortedSuperCF.json | 10 +-
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +-
.../cassandra/db/compaction/CompactionsTest.java | 53 +++-
.../apache/cassandra/tools/SSTableExportTest.java | 172 ++++++--
.../apache/cassandra/tools/SSTableImportTest.java | 85 +++-
tools/bin/token-generator | 317 +++++++++++++++
46 files changed, 1284 insertions(+), 392 deletions(-)
----------------------------------------------------------------------