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/fe980034 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe980034 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe980034 Branch: refs/heads/trunk Commit: fe980034e954a510e037c39e57dd19e751afeeaf Parents: 6849193 438acfc Author: Sylvain Lebresne <[email protected]> Authored: Sun Mar 18 11:12:15 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Sun Mar 18 11:12:15 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 25 +- .../apache/cassandra/config/ColumnDefinition.java | 6 +- .../cassandra/config/DatabaseDescriptor.java | 4 +- .../org/apache/cassandra/config/KSMetaData.java | 10 +- src/java/org/apache/cassandra/config/Schema.java | 22 +-- .../apache/cassandra/cql/DropIndexStatement.java | 5 +- .../org/apache/cassandra/cql/QueryProcessor.java | 62 +--- .../cql3/statements/AlterTableStatement.java | 163 +++++----- .../statements/CreateColumnFamilyStatement.java | 7 +- .../cql3/statements/CreateIndexStatement.java | 82 ++--- .../cql3/statements/CreateKeyspaceStatement.java | 7 +- .../cql3/statements/DropColumnFamilyStatement.java | 7 +- .../cql3/statements/DropIndexStatement.java | 7 +- .../cql3/statements/DropKeyspaceStatement.java | 7 +- .../cql3/statements/SchemaAlteringStatement.java | 50 +--- src/java/org/apache/cassandra/db/DefsTable.java | 209 +++++++++++-- src/java/org/apache/cassandra/db/Directories.java | 2 +- src/java/org/apache/cassandra/db/SystemTable.java | 5 +- .../cassandra/db/migration/AddColumnFamily.java | 59 ---- .../apache/cassandra/db/migration/AddKeyspace.java | 59 ---- .../cassandra/db/migration/DropColumnFamily.java | 57 ---- .../cassandra/db/migration/DropKeyspace.java | 54 ---- .../apache/cassandra/db/migration/Migration.java | 128 -------- .../cassandra/db/migration/MigrationHelper.java | 247 --------------- .../cassandra/db/migration/UpdateColumnFamily.java | 52 --- .../cassandra/db/migration/UpdateKeyspace.java | 58 ---- .../apache/cassandra/service/MigrationManager.java | 119 +++++++- .../org/apache/cassandra/service/StorageProxy.java | 3 +- .../apache/cassandra/thrift/CassandraServer.java | 47 +-- .../apache/cassandra/thrift/ThriftValidation.java | 7 +- .../org/apache/cassandra/db/LongTableTest.java | 4 +- .../apache/cassandra/db/MeteredFlusherTest.java | 8 +- .../db/compaction/LongCompactionSpeedTest.java | 4 +- .../cassandra/AbstractSerializationsTester.java | 2 +- test/unit/org/apache/cassandra/CleanupHelper.java | 126 -------- test/unit/org/apache/cassandra/EmbeddedServer.java | 2 +- test/unit/org/apache/cassandra/SchemaLoader.java | 115 +++++++- test/unit/org/apache/cassandra/cli/CliTest.java | 6 +- .../apache/cassandra/config/CFMetaDataTest.java | 4 +- .../cassandra/config/DatabaseDescriptorTest.java | 12 +- .../unit/org/apache/cassandra/config/DefsTest.java | 94 ++---- test/unit/org/apache/cassandra/db/CleanupTest.java | 4 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 4 +- .../org/apache/cassandra/db/CommitLogTest.java | 4 +- .../apache/cassandra/db/CounterMutationTest.java | 4 +- .../unit/org/apache/cassandra/db/KeyCacheTest.java | 4 +- .../org/apache/cassandra/db/KeyCollisionTest.java | 4 +- .../org/apache/cassandra/db/MultitableTest.java | 4 +- .../unit/org/apache/cassandra/db/NameSortTest.java | 4 +- .../apache/cassandra/db/RecoveryManager2Test.java | 4 +- .../apache/cassandra/db/RecoveryManager3Test.java | 4 +- .../apache/cassandra/db/RecoveryManagerTest.java | 4 +- .../cassandra/db/RecoveryManagerTruncateTest.java | 4 +- .../cassandra/db/RemoveColumnFamilyTest.java | 4 +- .../db/RemoveColumnFamilyWithFlush1Test.java | 4 +- .../db/RemoveColumnFamilyWithFlush2Test.java | 4 +- .../org/apache/cassandra/db/RemoveColumnTest.java | 4 +- .../apache/cassandra/db/RemoveSubColumnTest.java | 4 +- .../apache/cassandra/db/RemoveSuperColumnTest.java | 4 +- .../unit/org/apache/cassandra/db/RowCacheTest.java | 4 +- .../org/apache/cassandra/db/RowIterationTest.java | 4 +- test/unit/org/apache/cassandra/db/ScrubTest.java | 5 +- test/unit/org/apache/cassandra/db/TableTest.java | 4 +- .../unit/org/apache/cassandra/db/TimeSortTest.java | 4 +- .../db/compaction/CompactionsPurgeTest.java | 4 +- .../cassandra/db/compaction/CompactionsTest.java | 4 +- .../cassandra/db/compaction/OneCompactionTest.java | 4 +- .../cassandra/db/marshal/CompositeTypeTest.java | 4 +- .../db/marshal/DynamicCompositeTypeTest.java | 4 +- .../org/apache/cassandra/dht/BootStrapperTest.java | 4 +- .../cassandra/io/BloomFilterTrackerTest.java | 4 +- .../apache/cassandra/io/CompactSerializerTest.java | 4 +- .../cassandra/io/LazilyCompactedRowTest.java | 4 +- .../cassandra/io/sstable/LegacySSTableTest.java | 4 +- .../cassandra/io/sstable/SSTableReaderTest.java | 4 +- .../io/sstable/SSTableSimpleWriterTest.java | 4 +- .../apache/cassandra/io/sstable/SSTableTest.java | 4 +- .../cassandra/locator/SimpleStrategyTest.java | 4 +- .../service/AntiEntropyServiceTestAbstract.java | 4 +- .../cassandra/service/CassandraServerTest.java | 4 +- .../service/EmbeddedCassandraServiceTest.java | 6 +- .../cassandra/service/LeaveAndBootstrapTest.java | 48 ++-- .../org/apache/cassandra/service/MoveTest.java | 52 ++-- .../org/apache/cassandra/service/RemoveTest.java | 27 ++- .../apache/cassandra/service/StorageProxyTest.java | 4 +- .../service/StorageServiceClientTest.java | 6 +- .../service/StorageServiceServerTest.java | 6 +- .../cassandra/streaming/StreamingTransferTest.java | 4 +- .../cassandra/thrift/ThriftValidationTest.java | 4 +- 90 files changed, 818 insertions(+), 1444 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/src/java/org/apache/cassandra/config/KSMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/src/java/org/apache/cassandra/db/DefsTable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/src/java/org/apache/cassandra/db/SystemTable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/test/unit/org/apache/cassandra/cli/CliTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe980034/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index 57a703b,076aad3..3916669 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@@ -30,9 -30,8 +30,9 @@@ import java.util.concurrent.Future import org.junit.Test; import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; - import org.apache.cassandra.CleanupHelper; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*;
