cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [7/7] git commit: Merge branch 'cassandra-2.0' into trunk
Date Mon, 18 Nov 2013 16:34:28 GMT
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/542d9c8d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/542d9c8d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/542d9c8d

Branch: refs/heads/trunk
Commit: 542d9c8d15e25a26a22da10b88dbf72c491fbf91
Parents: e50d89d 4444fd6
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Nov 18 17:34:13 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Nov 18 17:34:13 2013 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../cql3/MeasurableForPreparedCache.java        | 26 ++++++++++++++++++++
 .../apache/cassandra/cql3/QueryProcessor.java   |  9 +++++--
 .../cql3/statements/BatchStatement.java         | 12 ++++++++-
 .../cql3/statements/ModificationStatement.java  |  9 ++++++-
 .../cql3/statements/SelectStatement.java        |  8 +++++-
 .../cassandra/dht/Murmur3Partitioner.java       |  9 ++++++-
 .../cassandra/thrift/CassandraServer.java       |  2 ++
 8 files changed, 71 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/542d9c8d/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/542d9c8d/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/542d9c8d/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 793b4c6,8833f34..25f59c7
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@@ -20,9 -20,10 +20,11 @@@ package org.apache.cassandra.cql3.state
  import java.nio.ByteBuffer;
  import java.util.*;
  
+ import org.github.jamm.MemoryMeter;
+ 
  import org.apache.cassandra.auth.Permission;
  import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.ColumnDefinition;
  import org.apache.cassandra.cql3.*;
  import org.apache.cassandra.db.*;
  import org.apache.cassandra.db.filter.ColumnSlice;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/542d9c8d/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 4b57766,b94e549..344e926
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -24,7 -24,7 +24,8 @@@ import com.google.common.base.Objects
  import com.google.common.base.Predicate;
  import com.google.common.collect.AbstractIterator;
  import com.google.common.collect.Iterables;
 +import com.google.common.collect.Iterators;
+ import org.github.jamm.MemoryMeter;
  
  import org.apache.cassandra.auth.Permission;
  import org.apache.cassandra.cql3.*;
@@@ -108,6 -110,11 +109,11 @@@ public class SelectStatement implement
               : selection.getResultMetadata();
      }
  
+     public long measureForPreparedCache(MemoryMeter meter)
+     {
 -        return meter.measureDeep(this) - meter.measureDeep(cfDef);
++        return meter.measureDeep(this) - meter.measureDeep(cfm);
+     }
+ 
      public int getBoundsTerms()
      {
          return boundTerms;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/542d9c8d/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------


Mime
View raw message