Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ef67f4d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ef67f4d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ef67f4d Branch: refs/heads/trunk Commit: 1ef67f4d1fa7a3479c04a8332e8754b5edd06432 Parents: f726cb2 25d9537 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Nov 29 10:19:52 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Nov 29 10:19:52 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 19 ++ NEWS.txt | 14 + conf/cassandra.yaml | 10 +- examples/client_only/conf/cassandra.yaml | 4 +- examples/hadoop_word_count/src/WordCount.java | 4 +- .../hadoop_word_count/src/WordCountCounters.java | 2 +- examples/simple_authentication/README.txt | 4 +- .../simple_authentication/conf/access.properties | 2 +- .../org/apache/cassandra/auth/SimpleAuthority.java | 157 --------- .../apache/cassandra/auth/SimpleAuthorizer.java | 157 +++++++++ pylib/cqlshlib/cql3handling.py | 68 ++--- .../cassandra/auth/AllowAllAuthenticator.java | 10 +- .../apache/cassandra/auth/AllowAllAuthority.java | 36 -- .../apache/cassandra/auth/AllowAllAuthorizer.java | 70 ++++ .../apache/cassandra/auth/AuthenticatedUser.java | 22 +- .../org/apache/cassandra/auth/DataResource.java | 248 +++++++++++++++ src/java/org/apache/cassandra/auth/IAuthority.java | 63 ---- .../org/apache/cassandra/auth/IAuthority2.java | 70 ---- .../apache/cassandra/auth/IAuthorityContainer.java | 83 ----- .../org/apache/cassandra/auth/IAuthorizer.java | 122 +++++++ src/java/org/apache/cassandra/auth/IResource.java | 53 +++ .../apache/cassandra/auth/LegacyAuthorizer.java | 111 +++++++ .../apache/cassandra/auth/MigrationListener.java | 53 +++ src/java/org/apache/cassandra/auth/Permission.java | 57 ++-- .../apache/cassandra/auth/PermissionDenied.java | 34 -- .../apache/cassandra/auth/PermissionDetails.java | 70 ++++ src/java/org/apache/cassandra/auth/Resources.java | 28 ++- .../org/apache/cassandra/cli/CliSessionState.java | 3 +- src/java/org/apache/cassandra/config/Config.java | 11 +- .../cassandra/config/DatabaseDescriptor.java | 43 ++-- .../apache/cassandra/config/EncryptionOptions.java | 18 +- .../org/apache/cassandra/cql/DeleteStatement.java | 2 +- .../apache/cassandra/cql/DropIndexStatement.java | 65 +++-- .../org/apache/cassandra/cql/QueryProcessor.java | 77 ++--- .../org/apache/cassandra/cql/UpdateStatement.java | 10 +- src/java/org/apache/cassandra/cql3/Cql.g | 116 ++++--- .../org/apache/cassandra/cql3/QueryProcessor.java | 2 +- .../cql3/statements/AuthorizationStatement.java | 66 ++++ .../cassandra/cql3/statements/BatchStatement.java | 2 +- .../statements/CreateColumnFamilyStatement.java | 2 +- .../cql3/statements/CreateKeyspaceStatement.java | 2 +- .../cql3/statements/DropIndexStatement.java | 57 ++-- .../cassandra/cql3/statements/GrantStatement.java | 17 +- .../cql3/statements/ListGrantsStatement.java | 42 --- .../cql3/statements/ListPermissionsStatement.java | 106 ++++++ .../cql3/statements/ModificationStatement.java | 5 +- .../statements/PermissionAlteringStatement.java | 54 ++-- .../cassandra/cql3/statements/RevokeStatement.java | 15 +- .../cql3/statements/TruncateStatement.java | 2 +- .../db/columniterator/IColumnIteratorFactory.java | 17 + .../db/columniterator/LazyColumnIterator.java | 17 + .../cassandra/hadoop/ColumnFamilyInputFormat.java | 27 ++- .../apache/cassandra/io/sstable/SSTableReader.java | 2 +- .../org/apache/cassandra/net/MessagingService.java | 4 +- .../apache/cassandra/service/CassandraDaemon.java | 6 + .../org/apache/cassandra/service/ClientState.java | 175 ++++------- .../apache/cassandra/thrift/CassandraServer.java | 119 +++---- .../apache/cassandra/thrift/CustomTHsHaServer.java | 3 +- .../cassandra/thrift/CustomTNonBlockingServer.java | 3 +- .../cassandra/thrift/CustomTThreadPoolServer.java | 7 +- test/conf/access.properties | 2 +- .../src/org/apache/cassandra/stress/Session.java | 3 +- 62 files changed, 1639 insertions(+), 1034 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ef67f4d/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ef67f4d/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ef67f4d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
