Updated Branches: refs/heads/cassandra-1.0 27cd2bfda -> 1ad710b6e refs/heads/cassandra-1.1 10372c20d -> 070c1d8dd refs/heads/trunk 94e413f5a -> 80baefddc
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/80baefdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80baefdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/80baefdd Branch: refs/heads/trunk Commit: 80baefddc5749a15edc21b6ea9fa84bdfb879883 Parents: 94e413f 070c1d8 Author: Jonathan Ellis <[email protected]> Authored: Thu Jul 26 17:17:21 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jul 26 17:17:21 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../db/index/PerColumnSecondaryIndex.java | 8 + .../cassandra/db/index/PerRowSecondaryIndex.java | 7 + .../apache/cassandra/db/index/SecondaryIndex.java | 3 + .../cassandra/db/index/SecondaryIndexManager.java | 19 +- .../apache/cassandra/thrift/ThriftValidation.java | 14 +- .../cassandra/db/SecondaryIndexColumnSizeTest.java | 215 +++++++++++++++ .../cassandra/thrift/ThriftValidationTest.java | 58 +---- 8 files changed, 259 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/SecondaryIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/thrift/ThriftValidation.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java index d57f9c1,af0e668..04f0d0f --- a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java +++ b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java @@@ -24,19 -24,15 +24,12 @@@ package org.apache.cassandra.thrift import org.junit.Test; import org.apache.cassandra.SchemaLoader; --import org.apache.cassandra.config.CFMetaData; --import org.apache.cassandra.config.ConfigurationException; --import org.apache.cassandra.config.ColumnDefinition; --import org.apache.cassandra.config.KSMetaData; --import org.apache.cassandra.config.Schema; ++import org.apache.cassandra.config.*; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.locator.LocalStrategy; import org.apache.cassandra.locator.NetworkTopologyStrategy; +import org.apache.cassandra.utils.ByteBufferUtil; - import org.apache.cassandra.utils.FBUtilities; public class ThriftValidationTest extends SchemaLoader {
