Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 255B1119C6 for ; Thu, 18 Sep 2014 13:53:02 +0000 (UTC) Received: (qmail 27505 invoked by uid 500); 18 Sep 2014 13:53:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 27443 invoked by uid 500); 18 Sep 2014 13:53:01 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 27266 invoked by uid 99); 18 Sep 2014 13:53:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2014 13:53:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 019D4A1AFC9; Thu, 18 Sep 2014 13:53:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Thu, 18 Sep 2014 13:53:05 -0000 Message-Id: In-Reply-To: <910841f0479d437cb35fac8daf2d9e92@git.apache.org> References: <910841f0479d437cb35fac8daf2d9e92@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch 'cassandra-2.1' into trunk 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/381ff18b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/381ff18b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/381ff18b Branch: refs/heads/trunk Commit: 381ff18b2390e5134b04b2669f44718b3c865238 Parents: d57890c ace937e Author: Brandon Williams Authored: Thu Sep 18 06:52:34 2014 +0000 Committer: Brandon Williams Committed: Thu Sep 18 06:52:34 2014 +0000 ---------------------------------------------------------------------- CHANGES.txt | 3 ++ src/java/org/apache/cassandra/auth/Auth.java | 46 +++++++++++++++++++- .../org/apache/cassandra/auth/AuthMBean.java | 25 +++++++++++ .../cassandra/config/DatabaseDescriptor.java | 6 +++ .../apache/cassandra/service/ClientState.java | 31 +------------ 5 files changed, 81 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/381ff18b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/381ff18b/src/java/org/apache/cassandra/auth/Auth.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/381ff18b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/381ff18b/src/java/org/apache/cassandra/service/ClientState.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/ClientState.java index 20682e9,09dc165..435c651 --- a/src/java/org/apache/cassandra/service/ClientState.java +++ b/src/java/org/apache/cassandra/service/ClientState.java @@@ -20,13 -20,10 +20,9 @@@ package org.apache.cassandra.service import java.net.SocketAddress; import java.util.*; import java.util.concurrent.ExecutionException; - import java.util.concurrent.TimeUnit; - import com.google.common.cache.CacheBuilder; - import com.google.common.cache.CacheLoader; - import com.google.common.cache.LoadingCache; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@@ -271,31 -298,19 +264,11 @@@ public class ClientStat return user; } - public SemanticVersion getCQLVersion() - { - return cqlVersion; - } - public static SemanticVersion[] getCQLSupportedVersion() { - SemanticVersion cql = org.apache.cassandra.cql.QueryProcessor.CQL_VERSION; - SemanticVersion cql3 = org.apache.cassandra.cql3.QueryProcessor.CQL_VERSION; - - return new SemanticVersion[]{ cql, cql3 }; + return new SemanticVersion[]{ QueryProcessor.CQL_VERSION }; } - private static LoadingCache, Set> initPermissionsCache() - { - if (DatabaseDescriptor.getAuthorizer() instanceof AllowAllAuthorizer) - return null; - - int validityPeriod = DatabaseDescriptor.getPermissionsValidity(); - if (validityPeriod <= 0) - return null; - - return CacheBuilder.newBuilder().expireAfterWrite(validityPeriod, TimeUnit.MILLISECONDS) - .build(new CacheLoader, Set>() - { - public Set load(Pair userResource) - { - return DatabaseDescriptor.getAuthorizer().authorize(userResource.left, - userResource.right); - } - }); - } - private Set authorize(IResource resource) { // AllowAllAuthorizer or manually disabled caching.