NIO + BDB stats - Code review comments

drucci · Jan 2, 2013 · 5aa3716 · 5aa3716
1 parent dd29d0e
commit 5aa3716
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/java/voldemort/common/nio/ByteBufferBackedInputStream.java b/src/java/voldemort/common/nio/ByteBufferBackedInputStream.java
@@ -54,7 +54,8 @@ public ByteBufferBackedInputStream(ByteBuffer buffer) {
     public ByteBufferBackedInputStream(ByteBuffer buffer, MutableLong sizeTracker) {
         this.buffer = buffer;
         this.sizeTracker = sizeTracker;
-        this.sizeTracker.add(buffer.capacity());
+        if(buffer != null)
+            this.sizeTracker.add(buffer.capacity());
     }
 
     public ByteBuffer getBuffer() {

diff --git a/src/java/voldemort/common/nio/ByteBufferBackedOutputStream.java b/src/java/voldemort/common/nio/ByteBufferBackedOutputStream.java
@@ -65,7 +65,8 @@ public ByteBufferBackedOutputStream(ByteBuffer buffer, MutableLong sizeTracker)
         this.buffer = buffer;
         wasExpanded = false;
         this.sizeTracker = sizeTracker;
-        this.sizeTracker.add(buffer.capacity());
+        if(buffer != null)
+            this.sizeTracker.add(buffer.capacity());
     }
 
     public ByteBuffer getBuffer() {

diff --git a/src/java/voldemort/store/bdb/stats/BdbEnvironmentStats.java b/src/java/voldemort/store/bdb/stats/BdbEnvironmentStats.java
@@ -6,7 +6,6 @@
 import voldemort.VoldemortException;
 import voldemort.annotations.Experimental;
 import voldemort.annotations.jmx.JmxGetter;
-import voldemort.annotations.jmx.JmxOperation;
 import voldemort.utils.CachedCallable;
 
 import com.sleepycat.je.Database;
@@ -351,12 +350,12 @@ public long getNumEnvironmentFailureExceptions() {
         return numEnvironmentFailureExceptions.longValue();
     }
 
-    @JmxOperation(description = "Obtain the number of k-v entries in the store")
+    @JmxGetter(name = "getEntryCount", description = "Obtain the number of k-v entries in the store")
     public long getEntryCount() throws Exception {
         return entryCount.call();
     }
 
-    @JmxOperation(description = "Obtain statistics about the BTree Index for a store")
+    @JmxGetter(name = "getBtreeStats", description = "Obtain statistics about the BTree Index for a store")
     public String getBtreeStats() throws Exception {
         return btreeStats.call().toString();
     }