Merge lp:~pbeaman/akiban-persistit/fix-1081659-serialized-item-count into lp:akiban-persistit

[Peter Beaman]

Fixes bug in the new isNull(boolean) and adds a unit test. See https://bugs.launchpad.net/akiban-persistit/+bug/1081659.

[Nathan Williams (nwilliams)]

Simple enough.

review: Approve

=== modified file 'src/main/java/com/persistit/Value.java'
--- src/main/java/com/persistit/Value.java	2012-11-19 16:30:08 +0000
+++ src/main/java/com/persistit/Value.java	2012-11-21 16:00:37 +0000
@@ -979,6 +979,7 @@
         if (isNull()) {
             if (skipNull && _depth > 0) {
                 _next++;
+                _serializedItemCount++;
             }
             return true;
         } else {

=== modified file 'src/test/java/com/persistit/StatisticsTaskTest.java'
--- src/test/java/com/persistit/StatisticsTaskTest.java	2012-11-19 16:35:35 +0000
+++ src/test/java/com/persistit/StatisticsTaskTest.java	2012-11-21 16:00:37 +0000
@@ -15,7 +15,11 @@
 
 package com.persistit;
 
-import static com.persistit.StatisticsTask.*;
+import static com.persistit.StatisticsTask.COUNT_FORMAT;
+import static com.persistit.StatisticsTask.PCOUNT_FORMAT;
+import static com.persistit.StatisticsTask.PHEADER_FORMAT;
+import static com.persistit.StatisticsTask.PRATE_FORMAT;
+import static com.persistit.StatisticsTask.RATE_FORMAT;
 import static org.junit.Assert.assertEquals;
 
 import java.io.BufferedReader;

=== modified file 'src/test/java/com/persistit/unit/ValueTest4.java'
--- src/test/java/com/persistit/unit/ValueTest4.java	2012-11-06 17:52:18 +0000
+++ src/test/java/com/persistit/unit/ValueTest4.java	2012-11-21 16:00:37 +0000
@@ -128,6 +128,28 @@
         assertEquals("Field 7 should be a String", String.class, value.getType());
         final String s7 = value.getString();
         assertTrue("expect identical", s5 == s7);
-
-    }
+    }
+
+    /**
+     * See https://bugs.launchpad.net/akiban-persistit/+bug/1081659
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void serializedItemCount() throws Exception {
+        final Value value = new Value(_persistit);
+        value.setStreamMode(true);
+        value.put(null);
+        value.put(ABC);
+        value.put(null);
+        value.put(ABC);
+        value.setStreamMode(false);
+        value.setStreamMode(true);
+        assertTrue("Expect null", value.isNull(true));
+        assertEquals("Don't expect null", ABC, value.get());
+        assertTrue("Expect null", value.isNull(true));
+        assertEquals("Expect String", String.class, value.getType());
+        assertEquals("Don't expect null", ABC, value.get());
+    }
+
 }