cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 21 Oct 2014 15:59:23 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a0a30e03a1ff571b0804ea20c1575fa39542eb6b
Parents: c235603 3261d5e
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Oct 21 17:57:50 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue Oct 21 17:57:50 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../cql3/statements/SelectStatement.java        | 39 +++++++++++++++++++-
 .../statements/SingleColumnRestriction.java     | 10 +++++
 .../org/apache/cassandra/db/DataTracker.java    |  4 +-
 .../io/sstable/IndexSummaryManager.java         |  2 +-
 .../cassandra/io/sstable/SSTableRewriter.java   | 18 ++++-----
 .../cassandra/cql3/ContainsRelationTest.java    | 22 +++++++++++
 .../io/sstable/IndexSummaryManagerTest.java     |  2 +-
 .../cassandra/io/sstable/SSTableReaderTest.java |  2 +-
 9 files changed, 86 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0a30e03/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 85cb24b,96a5e23..cdae72a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,6 +1,37 @@@
 +3.0
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
 +   7924, 7812, 8063)
 + * 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)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * improve concurrency of repair (CASSANDRA-6455)
 +
 +
  2.1.1
+  * Dont notify when replacing tmplink files (CASSANDRA-8157)
+  * Fix validation with multiple CONTAINS clause (CASSANDRA-8131)
   * Fix validation of collections in TriggerExecutor (CASSANDRA-8146)
   * Fix IllegalArgumentException when a list of IN values containing tuples
     is passed as a single arg to a prepared statement with the v1 or v2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0a30e03/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index ff905c1,233f3db..30c5390
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -31,8 -31,8 +31,9 @@@ import org.github.jamm.MemoryMeter
  
  import org.apache.cassandra.auth.Permission;
  import org.apache.cassandra.cql3.*;
+ import org.apache.cassandra.cql3.statements.SingleColumnRestriction.Contains;
  import org.apache.cassandra.db.composites.*;
 +import org.apache.cassandra.db.composites.Composite.EOC;
  import org.apache.cassandra.transport.messages.ResultMessage;
  import org.apache.cassandra.config.CFMetaData;
  import org.apache.cassandra.config.ColumnDefinition;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0a30e03/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0a30e03/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0a30e03/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------


Mime
View raw message