Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql/AlterTableStatement.java
src/java/org/apache/cassandra/cql/DropIndexStatement.java
src/java/org/apache/cassandra/cql/QueryProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5314641
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5314641
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5314641
Branch: refs/heads/trunk
Commit: e5314641a41b9464d04ed156e46465b3c213abe8
Parents: 5f6e780 8a2a0c3
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Mon Mar 24 17:00:00 2014 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Mon Mar 24 17:00:00 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/auth/Auth.java | 2 +-
.../org/apache/cassandra/config/CFMetaData.java | 94 ++++---------
.../cql3/statements/AlterTableStatement.java | 2 +-
.../cql3/statements/AlterTypeStatement.java | 2 +-
.../cql3/statements/CreateIndexStatement.java | 2 +-
.../cql3/statements/CreateTriggerStatement.java | 2 +-
.../cql3/statements/DropIndexStatement.java | 2 +-
.../cql3/statements/DropTriggerStatement.java | 2 +-
.../apache/cassandra/db/AtomicBTreeColumns.java | 14 +-
src/java/org/apache/cassandra/db/Cell.java | 23 +---
.../org/apache/cassandra/db/ColumnFamily.java | 6 +-
.../org/apache/cassandra/db/CounterCell.java | 9 +-
.../apache/cassandra/db/CounterMutation.java | 4 +-
.../apache/cassandra/db/CounterUpdateCell.java | 4 +-
.../org/apache/cassandra/db/DeletedCell.java | 8 +-
.../org/apache/cassandra/db/DeletionTime.java | 2 +-
.../org/apache/cassandra/db/ExpiringCell.java | 2 +-
.../cassandra/db/HintedHandOffManager.java | 8 +-
src/java/org/apache/cassandra/db/Memtable.java | 4 +-
.../org/apache/cassandra/db/OnDiskAtom.java | 3 +-
.../org/apache/cassandra/db/RangeTombstone.java | 9 +-
.../db/compaction/LazilyCompactedRow.java | 6 +-
.../cassandra/db/context/CounterContext.java | 22 ++-
.../apache/cassandra/db/filter/QueryFilter.java | 3 +-
.../io/sstable/AbstractSSTableSimpleWriter.java | 3 +-
.../cassandra/io/sstable/SSTableWriter.java | 4 +-
.../utils/memory/ContextAllocator.java | 11 +-
.../cassandra/utils/memory/PoolAllocator.java | 11 +-
.../apache/cassandra/config/CFMetaDataTest.java | 2 +-
.../org/apache/cassandra/config/DefsTest.java | 8 +-
.../apache/cassandra/db/CounterCellTest.java | 39 +++---
.../db/context/CounterContextTest.java | 138 +++++++------------
.../streaming/StreamingTransferTest.java | 3 +-
.../cassandra/thrift/ThriftValidationTest.java | 2 +-
.../cassandra/triggers/TriggersSchemaTest.java | 6 +-
35 files changed, 170 insertions(+), 292 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5314641/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5314641/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5314641/test/unit/org/apache/cassandra/config/DefsTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/config/DefsTest.java
index 6c06648,2e1876f..fd24822
--- a/test/unit/org/apache/cassandra/config/DefsTest.java
+++ b/test/unit/org/apache/cassandra/config/DefsTest.java
@@@ -69,9 -68,9 +69,9 @@@ public class DefsTest extends SchemaLoa
.maxCompactionThreshold(500);
// we'll be adding this one later. make sure it's not already there.
- assert cfm.getColumnDefinition(ByteBuffer.wrap(new byte[] { 5 })) ==
null;
+ Assert.assertNull(cfm.getColumnDefinition(ByteBuffer.wrap(new byte[]
{ 5 })));
- CFMetaData cfNew = cfm.clone();
+ CFMetaData cfNew = cfm.copy();
// add one.
ColumnDefinition addIndexDef = ColumnDefinition.regularDef(cfm,
ByteBuffer.wrap(new byte[] { 5 }), BytesType.instance, null)
@@@ -407,12 -406,12 +407,12 @@@
KSMetaData ksm = KSMetaData.testMetadata(cf.ksName,
SimpleStrategy.class, KSMetaData.optsWithRF(1), cf);
MigrationManager.announceNewKeyspace(ksm);
- assert Schema.instance.getKSMetaData(cf.ksName) != null;
- assert Schema.instance.getKSMetaData(cf.ksName).equals(ksm);
- assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName) != null;
+ Assert.assertNotNull(Schema.instance.getKSMetaData(cf.ksName));
+ Assert.assertEquals(Schema.instance.getKSMetaData(cf.ksName), ksm);
+ Assert.assertNotNull(Schema.instance.getCFMetaData(cf.ksName,
cf.cfName));
// updating certain fields should fail.
- CFMetaData newCfm = cf.clone();
+ CFMetaData newCfm = cf.copy();
newCfm.defaultValidator(BytesType.instance);
newCfm.minCompactionThreshold(5);
newCfm.maxCompactionThreshold(31);
@@@ -439,13 -438,13 +439,13 @@@
// can't test changing the reconciler because there is only one impl.
// check the cumulative affect.
- assert Schema.instance.getCFMetaData(cf.ksName,
cf.cfName).getComment().equals(newCfm.getComment());
- assert Schema.instance.getCFMetaData(cf.ksName,
cf.cfName).getReadRepairChance() == newCfm.getReadRepairChance();
- assert Schema.instance.getCFMetaData(cf.ksName,
cf.cfName).getGcGraceSeconds() == newCfm.getGcGraceSeconds();
- assert Schema.instance.getCFMetaData(cf.ksName,
cf.cfName).getDefaultValidator() == UTF8Type.instance;
+ Assert.assertEquals(Schema.instance.getCFMetaData(cf.ksName,
cf.cfName).getComment(), newCfm.getComment());
+ Assert.assertEquals(Schema.instance.getCFMetaData(cf.ksName,
cf.cfName).getReadRepairChance(), newCfm.getReadRepairChance(), 0.0001);
+ Assert.assertEquals(Schema.instance.getCFMetaData(cf.ksName,
cf.cfName).getGcGraceSeconds(), newCfm.getGcGraceSeconds());
+ Assert.assertEquals(UTF8Type.instance,
Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getDefaultValidator());
// Change cfId
- newCfm = new CFMetaData(cf.ksName, cf.cfName, cf.cfType,
cf.comparator, UUID.randomUUID());
+ newCfm = new CFMetaData(cf.ksName, cf.cfName, cf.cfType,
cf.comparator);
CFMetaData.copyOpts(newCfm, cf);
try
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5314641/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------
