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/6b4d9803 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b4d9803 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b4d9803 Branch: refs/heads/trunk Commit: 6b4d980357de573f9128c3a065a6d11c54a3b571 Parents: ad34247 9872b74 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Apr 30 20:22:53 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Apr 30 20:22:53 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- doc/native_protocol_v3.spec | 911 +++++++++++++++++++ src/java/org/apache/cassandra/auth/Auth.java | 16 +- .../cassandra/auth/CassandraAuthorizer.java | 6 +- .../cassandra/auth/PasswordAuthenticator.java | 4 +- .../org/apache/cassandra/cql3/Attributes.java | 8 +- .../cassandra/cql3/BatchQueryOptions.java | 81 +- .../apache/cassandra/cql3/ColumnCondition.java | 32 +- .../org/apache/cassandra/cql3/Constants.java | 20 +- src/java/org/apache/cassandra/cql3/Lists.java | 34 +- src/java/org/apache/cassandra/cql3/Maps.java | 32 +- .../org/apache/cassandra/cql3/QueryHandler.java | 3 +- .../org/apache/cassandra/cql3/QueryOptions.java | 283 ++++-- .../apache/cassandra/cql3/QueryProcessor.java | 29 +- .../org/apache/cassandra/cql3/ResultSet.java | 6 +- src/java/org/apache/cassandra/cql3/Sets.java | 26 +- src/java/org/apache/cassandra/cql3/Term.java | 18 +- .../apache/cassandra/cql3/UpdateParameters.java | 6 +- .../org/apache/cassandra/cql3/UserTypes.java | 18 +- .../cassandra/cql3/functions/FunctionCall.java | 20 +- .../cql3/statements/BatchStatement.java | 95 +- .../cql3/statements/CQL3CasConditions.java | 14 +- .../cql3/statements/ModificationStatement.java | 63 +- .../cassandra/cql3/statements/Restriction.java | 28 +- .../cql3/statements/SelectStatement.java | 150 +-- .../org/apache/cassandra/db/DefsTables.java | 19 +- .../cassandra/db/marshal/CollectionType.java | 29 +- .../apache/cassandra/db/marshal/ListType.java | 12 +- .../apache/cassandra/db/marshal/MapType.java | 21 +- .../apache/cassandra/db/marshal/SetType.java | 15 +- .../apache/cassandra/db/marshal/UserType.java | 5 + .../hadoop/pig/AbstractCassandraStorage.java | 11 +- .../cassandra/io/sstable/CQLSSTableWriter.java | 11 +- .../serializers/CollectionSerializer.java | 106 ++- .../cassandra/serializers/ListSerializer.java | 39 +- .../cassandra/serializers/MapSerializer.java | 48 +- .../cassandra/serializers/SetSerializer.java | 39 +- .../cassandra/service/IMigrationListener.java | 3 + .../cassandra/service/MigrationManager.java | 18 + .../cassandra/thrift/CassandraServer.java | 4 +- .../org/apache/cassandra/transport/CBUtil.java | 17 + .../org/apache/cassandra/transport/Client.java | 4 +- .../apache/cassandra/transport/DataType.java | 79 +- .../org/apache/cassandra/transport/Event.java | 158 +++- .../apache/cassandra/transport/OptionCodec.java | 28 +- .../org/apache/cassandra/transport/Server.java | 21 +- .../cassandra/transport/SimpleClient.java | 4 +- .../transport/messages/BatchMessage.java | 53 +- .../transport/messages/EventMessage.java | 6 +- .../transport/messages/ExecuteMessage.java | 5 +- .../cassandra/transport/SerDeserTest.java | 217 +++++ 52 files changed, 2232 insertions(+), 646 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b4d9803/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b4d9803/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b4d9803/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java index db99060,40c45af..9a5ac92 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@@ -51,13 -51,14 +51,13 @@@ public class QueryProcessor implements private static final Logger logger = LoggerFactory.getLogger(QueryProcessor.class); private static final MemoryMeter meter = new MemoryMeter().withGuessing(MemoryMeter.Guess.FALLBACK_BEST); private static final long MAX_CACHE_PREPARED_MEMORY = Runtime.getRuntime().maxMemory() / 256; - private static final int MAX_CACHE_PREPARED_COUNT = 10000; - private static EntryWeigher<MD5Digest, CQLStatement> cqlMemoryUsageWeigher = new EntryWeigher<MD5Digest, CQLStatement>() + private static EntryWeigher<MD5Digest, ParsedStatement.Prepared> cqlMemoryUsageWeigher = new EntryWeigher<MD5Digest, ParsedStatement.Prepared>() { @Override - public int weightOf(MD5Digest key, CQLStatement value) + public int weightOf(MD5Digest key, ParsedStatement.Prepared value) { - return Ints.checkedCast(measure(key) + measure(value)); + return Ints.checkedCast(measure(key) + measure(value.statement) + measure(value.boundNames)); } }; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b4d9803/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b4d9803/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
