cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: merge from 2.1
Date Mon, 04 Aug 2014 12:35:17 GMT
merge from 2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1b0c26a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1b0c26a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1b0c26a

Branch: refs/heads/trunk
Commit: f1b0c26a1537c8b9c48abc96ba0c972f4ddf5221
Parents: f47863e 5009ee3
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Aug 4 07:35:07 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Aug 4 07:35:07 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cql3/statements/SelectStatement.java        | 15 ++++-
 .../db/index/SecondaryIndexManager.java         | 47 ++++++++++++++++
 .../db/index/SecondaryIndexSearcher.java        | 12 ++++
 .../db/index/PerRowSecondaryIndexTest.java      | 58 +++++++++++++++++++-
 5 files changed, 127 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1b0c26a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f175b34,6ba5e7a..99a8fed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,6 +1,23 @@@
 +3.0
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 +
 +
  2.1.1
+  * Add support for custom 2i validation (CASSANDRA-7575)
   * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add duration mode to cassandra-stress (CASSANDRA-7468)
   * Add listen_interface and rpc_interface options (CASSANDRA-7417)
   * Improve schema merge performance (CASSANDRA-7444)
   * Adjust MT depth based on # of partition validating (CASSANDRA-5263)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1b0c26a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
index 3097099,c6a80ea..92fbf3a
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@@ -18,8 -18,11 +18,10 @@@
  package org.apache.cassandra.db.index;
  
  
+ import java.io.IOException;
  import java.nio.ByteBuffer;
  import java.util.Arrays;
 -import java.util.Collections;
+ import java.util.List;
  import java.util.Set;
  
  import org.junit.Before;
@@@ -29,22 -31,22 +31,32 @@@ import org.junit.Test
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
  import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.config.KSMetaData;
+ import org.apache.cassandra.cql3.QueryProcessor;
+ import org.apache.cassandra.cql3.UntypedResultSet;
 -import org.apache.cassandra.db.*;
 -import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 +import org.apache.cassandra.db.Cell;
 +import org.apache.cassandra.db.ColumnFamily;
 +import org.apache.cassandra.db.ColumnFamilyStore;
 +import org.apache.cassandra.db.DecoratedKey;
++import org.apache.cassandra.db.IndexExpression;
 +import org.apache.cassandra.db.Mutation;
++import org.apache.cassandra.db.Row;
  import org.apache.cassandra.db.composites.CellName;
+ import org.apache.cassandra.db.filter.ExtendedFilter;
  import org.apache.cassandra.db.filter.QueryFilter;
 -import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.exceptions.ConfigurationException;
+ import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.concurrent.OpOrder;
  
--import static org.junit.Assert.*;
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.assertNotNull;
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.fail;
  
 -public class PerRowSecondaryIndexTest extends SchemaLoader
 +public class PerRowSecondaryIndexTest
  {
  
      // test that when index(key) is called on a PRSI index,


Mime
View raw message