Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed6584ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed6584ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed6584ee
Branch: refs/heads/trunk
Commit: ed6584ee1609aaac3702f1f20fe694e0565e8571
Parents: 0d695d4 9c17189
Author: Aleksey Yeschenko <[email protected]>
Authored: Fri Dec 20 20:19:43 2013 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Fri Dec 20 20:19:43 2013 +0300
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/CQLStatement.java | 2 +-
.../apache/cassandra/cql3/QueryProcessor.java | 20 ++++++++++----------
.../statements/AuthenticationStatement.java | 2 +-
.../cql3/statements/AuthorizationStatement.java | 2 +-
.../cql3/statements/BatchStatement.java | 4 ++--
.../cql3/statements/ModificationStatement.java | 4 ++--
.../cql3/statements/ParsedStatement.java | 2 +-
.../statements/SchemaAlteringStatement.java | 2 +-
.../cql3/statements/SelectStatement.java | 4 ++--
.../cql3/statements/TruncateStatement.java | 2 +-
.../cassandra/cql3/statements/UseStatement.java | 2 +-
.../cassandra/thrift/CassandraServer.java | 2 +-
.../transport/messages/BatchMessage.java | 5 ++---
13 files changed, 26 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed6584ee/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed6584ee/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------
diff --cc
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 2574f73,9e0fd62..a396ef4
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@@ -72,9 -70,9 +72,9 @@@ public abstract class ModificationState
}
public abstract boolean requireFullClusteringKey();
- public abstract ColumnFamily updateForKey(ByteBuffer key,
ColumnNameBuilder builder, UpdateParameters params) throws
InvalidRequestException;
+ public abstract ColumnFamily updateForKey(ByteBuffer key, Composite
prefix, UpdateParameters params) throws InvalidRequestException;
- public int getBoundsTerms()
+ public int getBoundTerms()
{
return boundTerms;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed6584ee/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index b29a044,133444a..b3f10c6
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -112,10 -112,10 +112,10 @@@ public class SelectStatement implement
public long measureForPreparedCache(MemoryMeter meter)
{
- return meter.measureDeep(this) - meter.measureDeep(cfDef);
+ return meter.measureDeep(this) - meter.measureDeep(cfm);
}
- public int getBoundsTerms()
+ public int getBoundTerms()
{
return boundTerms;
}
@@@ -1027,7 -1067,9 +1027,7 @@@
{
CFMetaData cfm =
ThriftValidation.validateColumnFamily(keyspace(), columnFamily());
- VariableSpecifications names = getBoundsVariables();
- CFDefinition cfDef = cfm.getCfDef();
-
+ VariableSpecifications names = getBoundVariables();
// Select clause
if (parameters.isCount && !selectClause.isEmpty())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed6584ee/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
