cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 09 Jan 2015 01:09:34 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/Auth.java
	src/java/org/apache/cassandra/service/ClientState.java


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

Branch: refs/heads/trunk
Commit: 8c5a959c97729c5fbd536bf0f47cf6330c0bddbc
Parents: 5674a96 e750ab2
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Jan 9 04:08:05 2015 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Jan 9 04:08:05 2015 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 conf/cassandra.yaml                             |   8 ++
 src/java/org/apache/cassandra/auth/Auth.java    |  55 ++--------
 .../org/apache/cassandra/auth/AuthMBean.java    |  27 -----
 .../apache/cassandra/auth/PermissionsCache.java | 108 +++++++++++++++++++
 .../org/apache/cassandra/config/Config.java     |   2 +
 .../cassandra/config/DatabaseDescriptor.java    |  10 +-
 .../apache/cassandra/service/ClientState.java   |  15 +--
 8 files changed, 138 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c5a959c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dac555b,adb374a..57c2f49
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,55 -1,6 +1,57 @@@
 -2.0.12:
 +2.1.3
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables (CASSANDRA-8192)
 + * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
 + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
 + * Properly calculate expected write size during compaction (CASSANDRA-8532)
 + * Invalidate affected prepared statements when a table's columns
 +   are altered (CASSANDRA-7910)
 + * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
 + * Fix regression in SSTableRewriter causing some rows to become unreadable 
 +   during compaction (CASSANDRA-8429)
 + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
 + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
 +   is disabled (CASSANDRA-8288)
 + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
 + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
 + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
 + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
 + * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
 + * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
 + * Disable mmap on Windows (CASSANDRA-6993)
 + * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253)
 + * Add auth support to cassandra-stress (CASSANDRA-7985)
 + * Fix ArrayIndexOutOfBoundsException when generating error message
 +   for some CQL syntax errors (CASSANDRA-8455)
 + * Scale memtable slab allocation logarithmically (CASSANDRA-7882)
 + * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
 + * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
 + * Ensure memtable flush cannot expire commit log entries from its future (CASSANDRA-8383)
 + * Make read "defrag" async to reclaim memtables (CASSANDRA-8459)
 + * Remove tmplink files for offline compactions (CASSANDRA-8321)
 + * Reduce maxHintsInProgress (CASSANDRA-8415)
 + * BTree updates may call provided update function twice (CASSANDRA-8018)
 + * Release sstable references after anticompaction (CASSANDRA-8386)
 + * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
 + * Fix high size calculations for prepared statements (CASSANDRA-8231)
 + * Centralize shared executors (CASSANDRA-8055)
 + * Fix filtering for CONTAINS (KEY) relations on frozen collection
 +   clustering columns when the query is restricted to a single
 +   partition (CASSANDRA-8203)
 + * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
 + * Add more log info if readMeter is null (CASSANDRA-8238)
 + * add check of the system wall clock time at startup (CASSANDRA-8305)
 + * Support for frozen collections (CASSANDRA-7859)
 + * Fix overflow on histogram computation (CASSANDRA-8028)
 + * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
 + * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
 + * Improve JBOD disk utilization (CASSANDRA-7386)
 + * Log failed host when preparing incremental repair (CASSANDRA-8228)
 + * Force config client mode in CQLSSTableWriter (CASSANDRA-8281)
 +Merged from 2.0:
+  * Introduce background cache refreshing to permissions cache
+    (CASSANDRA-8194)
   * Fix race condition in StreamTransferTask that could lead to
     infinite loops and premature sstable deletion (CASSANDRA-7704)
   * Add an extra version check to MigrationTask (CASSANDRA-8462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c5a959c/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c5a959c/src/java/org/apache/cassandra/auth/Auth.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/auth/Auth.java
index 0c3b0fe,465643d..05e5061
--- a/src/java/org/apache/cassandra/auth/Auth.java
+++ b/src/java/org/apache/cassandra/auth/Auth.java
@@@ -34,11 -29,9 +31,11 @@@ import org.apache.cassandra.config.CFMe
  import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.config.KSMetaData;
  import org.apache.cassandra.config.Schema;
- import org.apache.cassandra.cql3.UntypedResultSet;
- import org.apache.cassandra.cql3.QueryProcessor;
  import org.apache.cassandra.cql3.QueryOptions;
+ import org.apache.cassandra.cql3.QueryProcessor;
+ import org.apache.cassandra.cql3.UntypedResultSet;
 +import org.apache.cassandra.cql3.statements.CFStatement;
 +import org.apache.cassandra.cql3.statements.CreateTableStatement;
  import org.apache.cassandra.cql3.statements.SelectStatement;
  import org.apache.cassandra.db.ConsistencyLevel;
  import org.apache.cassandra.exceptions.RequestExecutionException;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c5a959c/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c5a959c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c5a959c/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/ClientState.java
index e1df1bd,63c9431..5ea3d0c
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@@ -19,8 -19,6 +19,7 @@@ package org.apache.cassandra.service
  
  import java.net.SocketAddress;
  import java.util.*;
- import java.util.concurrent.ExecutionException;
 +import java.util.concurrent.atomic.AtomicLong;
  
  import com.google.common.collect.Iterables;
  import com.google.common.collect.Sets;
@@@ -41,8 -39,6 +40,7 @@@ import org.apache.cassandra.exceptions.
  import org.apache.cassandra.tracing.Tracing;
  import org.apache.cassandra.thrift.ThriftValidation;
  import org.apache.cassandra.utils.FBUtilities;
 +import org.apache.cassandra.utils.JVMStabilityInspector;
- import org.apache.cassandra.utils.Pair;
  import org.apache.cassandra.utils.SemanticVersion;
  
  /**


Mime
View raw message