You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/02/11 06:46:48 UTC
[1/2] git commit: refs CASSANDRA-6687. Don't fail in checkAccess if
table doesn't exist
Updated Branches:
refs/heads/trunk 503a8a865 -> f05870ee8
refs CASSANDRA-6687. Don't fail in checkAccess if table doesn't exist
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87aca600
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87aca600
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87aca600
Branch: refs/heads/trunk
Commit: 87aca600fda47a1b72f27ee02cf5f854437ce2be
Parents: 9a6ae96
Author: Mikhail Stepura <mi...@apache.org>
Authored: Mon Feb 10 17:03:27 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Mon Feb 10 17:10:09 2014 -0800
----------------------------------------------------------------------
.../cassandra/cql3/statements/DropTableStatement.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87aca600/src/java/org/apache/cassandra/cql3/statements/DropTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/DropTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropTableStatement.java
index fa620e8..d27261c 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropTableStatement.java
@@ -38,7 +38,15 @@ public class DropTableStatement extends SchemaAlteringStatement
public void checkAccess(ClientState state) throws UnauthorizedException, InvalidRequestException
{
- state.hasColumnFamilyAccess(keyspace(), columnFamily(), Permission.DROP);
+ try
+ {
+ state.hasColumnFamilyAccess(keyspace(), columnFamily(), Permission.DROP);
+ }
+ catch (InvalidRequestException e)
+ {
+ if (!ifExists)
+ throw e;
+ }
}
public void validate(ClientState state)
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f05870ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f05870ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f05870ee
Branch: refs/heads/trunk
Commit: f05870ee8cefec3bd9a1af051b2c7098c1f82933
Parents: 503a8a8 87aca60
Author: Mikhail Stepura <mi...@apache.org>
Authored: Mon Feb 10 21:00:39 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Mon Feb 10 21:00:39 2014 -0800
----------------------------------------------------------------------
.../cassandra/cql3/statements/DropTableStatement.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------