You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/11/28 01:17:04 UTC
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/AlwaysPresentFilter.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/AlwaysPresentFilter.java
index 83d8f3a,0886edc..cc162d4
--- a/src/java/org/apache/cassandra/utils/AlwaysPresentFilter.java
+++ b/src/java/org/apache/cassandra/utils/AlwaysPresentFilter.java
@@@ -30,7 -31,13 +30,13 @@@ public class AlwaysPresentFilter implem
  
      public void clear() { }
  
 -    public void close() throws IOException { }
 +    public void close() { }
  
      public long serializedSize() { return 0; }
+ 
+     @Override
+     public long offHeapSize()
+     {
+         return 0;
+     }
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/IFilter.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/IFilter.java
index 91c0e36,aed5f39..60c0590
--- a/src/java/org/apache/cassandra/utils/IFilter.java
+++ b/src/java/org/apache/cassandra/utils/IFilter.java
@@@ -30,5 -30,9 +30,11 @@@ public interface IFilter extends Closea
  
      long serializedSize();
  
 +    void close();
++
+     /**
+      * Returns the amount of memory in bytes used off heap.
+      * @return the amount of memory in bytes used off heap
+      */
+     long offHeapSize();
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/obs/IBitSet.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/obs/IBitSet.java
index 96aac6b,47ba492..ed7e54b
--- a/src/java/org/apache/cassandra/utils/obs/IBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/IBitSet.java
@@@ -50,5 -50,9 +50,11 @@@ public interface IBitSet extends Closea
  
      public void clear();
  
 +    public void close();
++
+     /**
+      * Returns the amount of memory in bytes used off heap.
+      * @return the amount of memory in bytes used off heap
+      */
+     public long offHeapSize();
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java
----------------------------------------------------------------------