Updated Branches: refs/heads/trunk 02308f6f9 -> 4bc873b79
Fix tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bc873b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bc873b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bc873b7 Branch: refs/heads/trunk Commit: 4bc873b79842c1a4debaa0b3da4adf0a6d84b3f5 Parents: 02308f6 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Jul 30 19:51:58 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jul 31 09:47:57 2012 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 1 + .../cassandra/thrift/ThriftValidationTest.java | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bc873b7/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index c5da29f..db74ebf 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -1172,6 +1172,7 @@ public final class CFMetaData cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "min_compaction_threshold")); cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "max_compaction_threshold")); cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "key_alias")); + cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "key_aliases")); cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "bloom_filter_fp_chance")); cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "caching")); cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, "compaction_strategy_class")); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bc873b7/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java index 478294f..41b432e 100644 --- a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java +++ b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java @@ -20,11 +20,10 @@ package org.apache.cassandra.thrift; * */ - -import java.util.Arrays; - import org.junit.Test; +import java.util.Collections; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.*; import org.apache.cassandra.db.marshal.AsciiType; @@ -56,7 +55,7 @@ public class ThriftValidationTest extends SchemaLoader boolean gotException = false; // add a key_alias = "id" - newMetadata.keyAliases(Arrays.asList(AsciiType.instance.decompose("id"))); + newMetadata.keyAliases(Collections.singletonList(AsciiType.instance.decompose("id"))); // should not throw IRE here try
