cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 18 Sep 2014 23:44:13 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/efa8efad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efa8efad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efa8efad

Branch: refs/heads/trunk
Commit: efa8efad485912087b226272c8de86744ca9a711
Parents: 1a7db7a e1bc6b4
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Sep 18 16:43:20 2014 -0700
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Sep 18 16:43:20 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +-
 .../apache/cassandra/cql3/QueryProcessor.java   | 23 ++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/efa8efad/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4e99c0a,527b4e9..33e26a2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,6 +1,31 @@@
 +3.0
 + * 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)
 + * Support Java source code for user-defined functions (CASSANDRA-7562)
 + * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Verify that UDF class methods are static (CASSANDRA-7781)
 + * Support pure user-defined functions (CASSANDRA-7395, 7740)
 + * 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
   * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
-  * Provide visibility into prepared statements churn (CASSANDRA-7921)
+  * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930)
   * Invalidate prepared statements when their keyspace or table is
     dropped (CASSANDRA-7566)
   * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/efa8efad/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java
index 990e55c,9a09d42..fb98d17
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@@ -27,10 -29,8 +29,8 @@@ import com.google.common.primitives.Int
  import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
  import com.googlecode.concurrentlinkedhashmap.EntryWeigher;
  import com.googlecode.concurrentlinkedhashmap.EvictionListener;
 +
  import org.antlr.runtime.*;
- import org.apache.cassandra.service.IMigrationListener;
- import org.apache.cassandra.service.MigrationManager;
  import org.github.jamm.MemoryMeter;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;


Mime
View raw message