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 534E0D735 for ; Tue, 17 Jul 2012 17:33:16 +0000 (UTC) Received: (qmail 98591 invoked by uid 500); 17 Jul 2012 17:33:06 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 98514 invoked by uid 500); 17 Jul 2012 17:33:06 -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 97070 invoked by uid 99); 17 Jul 2012 17:33:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2012 17:33:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CA01314D85; Tue, 17 Jul 2012 17:33:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eevans@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [42/50] git commit: Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path Message-Id: <20120717173304.CA01314D85@tyr.zones.apache.org> Date: Tue, 17 Jul 2012 17:33:04 +0000 (UTC) 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 Authored: Sat Jul 14 12:36:17 2012 -0600 Committer: Eric Evans 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(-) ----------------------------------------------------------------------