Merge lp:~yshavit/akiban-persistit/bug1042960 into lp:akiban-persistit

[Yuval Shavit]

Adding an argument to Value#isNull, to specify whether the Value should skip to the next field if the result is null. See attached bug for reasoning. This branch is just a suggestion, so feel free to reject if you don't like the idea.

This constitutes an API change, so it shouldn't go in until we're ready to do a version bump. Or I can add a version bump with the branch.

Unmerged revisions

359. By Yuval Shavit on 2012-08-28

update isNull to take a flag specifying whether it should skip on null

=== modified file 'src/main/java/com/persistit/Value.java'
--- src/main/java/com/persistit/Value.java	2012-08-15 16:11:36 +0000
+++ src/main/java/com/persistit/Value.java	2012-08-28 21:41:21 +0000
@@ -954,13 +954,34 @@
     }
 
     /**
-     * Tests whether the data held by this <code>Value</code> is null.
+     * Tests whether the data held by this <code>Value</code> is null. If the data
+     * is null, and the <code>Value</code> is in stream mode, this method
+     * optionally skips to the next field. This can be useful in a loop such as:
+     * <pre>
+     *     for (int i = 0; i < segments; ++i) {
+     *         if (persistitValue.isNull(true)) {
+     *             handleNull();
+     *         }
+     *         else {
+     *             int intValueu = persistitValue.getInt();
+     *             handleInt(intValue);
+     *         }
+     *     }
+     * </pre>
+     *
+     * @param skipIfNull
+     *            whether to skip to the next element. This flag obeys the
+     *            contract of {@link #skip()}, which is a no-op when not in
+     *            stream mode.
      * 
      * @return <code>true</code> if the current state of this <code>Value</code>
      *         represents <i>null</i>.
      */
-    public boolean isNull() {
-        return getTypeHandle() == TYPE_NULL;
+    public boolean isNull(boolean skipIfNull) {
+        boolean result = getTypeHandle() == TYPE_NULL;
+        if (result && skipIfNull)
+            skip();
+        return result;
     }
 
     boolean isAntiValue() {
 
=== modified file 'src/test/java/com/persistit/stress/unit/Stress10.java'
--- src/test/java/com/persistit/stress/unit/Stress10.java	2012-08-15 16:11:36 +0000
+++ src/test/java/com/persistit/stress/unit/Stress10.java	2012-08-28 21:41:21 +0000
@@ -114,7 +114,7 @@
                         addWork(1);
 
                         int size1 = 0;
-                        if (_ex.getValue().isDefined() && !_ex.getValue().isNull()) {
+                        if (_ex.getValue().isDefined() && !_ex.getValue().isNull(false)) {
                             size1 = _ex.getValue().getInt();
                         }
                         _exs.fetch();
 
=== modified file 'src/test/java/com/persistit/stress/unit/Stress11.java'
--- src/test/java/com/persistit/stress/unit/Stress11.java	2012-08-15 16:11:36 +0000
+++ src/test/java/com/persistit/stress/unit/Stress11.java	2012-08-28 21:41:21 +0000
@@ -119,7 +119,7 @@
                         addWork(1);
 
                         int size1 = 0;
-                        if (_ex.getValue().isDefined() && !_ex.getValue().isNull()) {
+                        if (_ex.getValue().isDefined() && !_ex.getValue().isNull(false)) {
                             size1 = _ex.getValue().getInt();
                         }
                         _exs.fetch();
 
=== modified file 'src/test/java/com/persistit/stress/unit/Stress2.java'
--- src/test/java/com/persistit/stress/unit/Stress2.java	2012-08-15 16:11:36 +0000
+++ src/test/java/com/persistit/stress/unit/Stress2.java	2012-08-28 21:41:21 +0000
@@ -115,7 +115,7 @@
                         addWork(1);
 
                         int size1 = 0;
-                        if (_ex.getValue().isDefined() && !_ex.getValue().isNull()) {
+                        if (_ex.getValue().isDefined() && !_ex.getValue().isNull(false)) {
                             size1 = _ex.getValue().getInt();
                         }
                         _exs.fetch(value2);
 
=== modified file 'src/test/java/com/persistit/stress/unit/Stress2txn.java'
--- src/test/java/com/persistit/stress/unit/Stress2txn.java	2012-08-15 16:11:36 +0000
+++ src/test/java/com/persistit/stress/unit/Stress2txn.java	2012-08-28 21:41:21 +0000
@@ -150,7 +150,7 @@
                                 addWork(1);
 
                                 int size1 = 0;
-                                if (_ex.getValue().isDefined() && !_ex.getValue().isNull()) {
+                                if (_ex.getValue().isDefined() && !_ex.getValue().isNull(false)) {
                                     size1 = _ex.getValue().getInt();
                                 }
                                 _exs.fetch(value2);
 
=== modified file 'src/test/java/com/persistit/stress/unit/Stress3.java'
--- src/test/java/com/persistit/stress/unit/Stress3.java	2012-08-15 16:11:36 +0000
+++ src/test/java/com/persistit/stress/unit/Stress3.java	2012-08-28 21:41:21 +0000
@@ -148,7 +148,7 @@
                         ex1.clear().append("byName").append(s).fetch();
                         addWork(1);
 
-                        if (!ex1.getValue().isDefined() || ex1.getValue().isNull()) {
+                        if (!ex1.getValue().isDefined() || ex1.getValue().isNull(false)) {
                             atomic = _counter.incrementAndGet();
                             ex1.getValue().put(atomic);
                             ex1.store();
@@ -192,7 +192,7 @@
                         ex1.clear().append("byName").append(s).fetch();
                         addWork(1);
 
-                        if (!ex1.getValue().isDefined() || ex1.getValue().isNull()) {
+                        if (!ex1.getValue().isDefined() || ex1.getValue().isNull(false)) {
                             throw new RuntimeException("Expected filename <" + s + "> was not found - key="
                                     + ex1.getKey());
                         }
@@ -202,7 +202,7 @@
                         ex2.clear().append("byCounter").append(atomic).fetch(value2);
                         addWork(1);
 
-                        if (!value2.isDefined() || value2.isNull()) {
+                        if (!value2.isDefined() || value2.isNull(false)) {
                             throw new RuntimeException("Expected value for byCounter " + atomic
                                     + " was not found - key=" + ex2.getKey());
                         }
@@ -221,7 +221,7 @@
                         ex3.clear().append("byReversedName").append(_sb1).fetch();
                         addWork(1);
 
-                        if (!ex3.getValue().isDefined() || ex3.getValue().isNull()
+                        if (!ex3.getValue().isDefined() || ex3.getValue().isNull(false)
                                 || (ex3.getValue().getLong() != atomic)) {
                             throw new RuntimeException("Missing or incorrect value " + ex3.getValue() + " should be "
                                     + atomic + " key=" + ex3.getKey());
@@ -271,7 +271,7 @@
                             ex1.clear().append("byName").append(s).fetch();
                             addWork(1);
 
-                            if (!ex1.getValue().isDefined() || ex1.getValue().isNull()) {
+                            if (!ex1.getValue().isDefined() || ex1.getValue().isNull(false)) {
                                 fail("Expected filename <" + s + "> was not found - key=" + ex1.getKey()
                                         + " keyInteger=" + keyInteger + " at counter=" + _count);
                                 break;
 
=== modified file 'src/test/java/com/persistit/stress/unit/Stress3txn.java'
--- src/test/java/com/persistit/stress/unit/Stress3txn.java	2012-08-15 16:11:36 +0000
+++ src/test/java/com/persistit/stress/unit/Stress3txn.java	2012-08-28 21:41:21 +0000
@@ -135,7 +135,7 @@
                             txn.begin();
                             try {
                                 ex1.clear().append("byName").append(s).fetch();
-                                if (!ex1.getValue().isDefined() || ex1.getValue().isNull()) {
+                                if (!ex1.getValue().isDefined() || ex1.getValue().isNull(false)) {
                                     atomic = _counter.incrementAndGet();
                                     ex1.getValue().put(atomic);
                                     ex1.store();
@@ -193,7 +193,7 @@
                         ex1.clear().append("byName").append(s).fetch();
                         addWork(1);
 
-                        if (!ex1.getValue().isDefined() || ex1.getValue().isNull()) {
+                        if (!ex1.getValue().isDefined() || ex1.getValue().isNull(false)) {
                             throw new RuntimeException("Expected filename <" + s + "> was not found - key="
                                     + ex1.getKey());
                         }
@@ -203,7 +203,7 @@
                         ex2.clear().append("byCounter").append(atomic).fetch(value2);
                         addWork(1);
 
-                        if (!value2.isDefined() || value2.isNull()) {
+                        if (!value2.isDefined() || value2.isNull(false)) {
                             throw new RuntimeException("Expected value for byCounter " + atomic
                                     + " was not found - key=" + ex2.getKey());
                         }
@@ -222,7 +222,7 @@
                         ex3.clear().append("byReversedName").append(_sb1).fetch();
                         addWork(1);
 
-                        if (!ex3.getValue().isDefined() || ex3.getValue().isNull()
+                        if (!ex3.getValue().isDefined() || ex3.getValue().isNull(false)
                                 || (ex3.getValue().getLong() != atomic)) {
                             throw new RuntimeException("Missing or incorrect value " + ex3.getValue() + " should be "
                                     + atomic + " key=" + ex3.getKey());
@@ -272,7 +272,7 @@
                                     ex1.clear().append("byName").append(s).fetch();
                                     addWork(1);
 
-                                    if (!ex1.getValue().isDefined() || ex1.getValue().isNull()) {
+                                    if (!ex1.getValue().isDefined() || ex1.getValue().isNull(false)) {
                                         fail("Expected filename <" + s + "> was not found - key=" + ex1.getKey()
                                                 + " keyInteger=" + keyInteger + " at counter=" + _count);
                                         break;
 
=== modified file 'src/test/java/com/persistit/stress/unit/Stress9.java'
--- src/test/java/com/persistit/stress/unit/Stress9.java	2012-08-15 16:11:36 +0000
+++ src/test/java/com/persistit/stress/unit/Stress9.java	2012-08-28 21:41:21 +0000
@@ -126,7 +126,7 @@
                         addWork(1);
 
                         int size1 = 0;
-                        if (_ex.getValue().isDefined() && !_ex.getValue().isNull()) {
+                        if (_ex.getValue().isDefined() && !_ex.getValue().isNull(false)) {
                             size1 = _ex.getValue().getInt();
                         }
                         _exs.fetch(value2);
 
=== modified file 'src/test/java/com/persistit/stress/unit/StressBase.java'
--- src/test/java/com/persistit/stress/unit/StressBase.java	2012-08-15 16:11:36 +0000
+++ src/test/java/com/persistit/stress/unit/StressBase.java	2012-08-28 21:41:21 +0000
@@ -85,7 +85,7 @@
 
     protected void compareValues(final Value value1, final Value value2) {
         boolean ok = true;
-        if (!value2.isDefined() || value2.isNull()) {
+        if (!value2.isDefined() || value2.isNull(false)) {
             fail("value not expected to be null");
             ok = false;
         } else if (!value1.equals(value2)) {
 
=== modified file 'src/test/java/com/persistit/unit/ValueTest2.java'
--- src/test/java/com/persistit/unit/ValueTest2.java	2012-08-15 16:11:36 +0000
+++ src/test/java/com/persistit/unit/ValueTest2.java	2012-08-28 21:41:21 +0000
@@ -95,21 +95,21 @@
         value.put(null);
         value.trim();
         assertEquals(Void.TYPE, value.getType());
-        assertEquals(true, value.isNull());
+        assertEquals(true, value.isNull(false));
         assertEquals(true, value.isDefined());
         assertEquals(value.get(), null);
 
         value.put(true);
         value.trim();
         assertEquals(value.getType(), Boolean.TYPE);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getBoolean(), true);
         assertEquals(value.get(), Boolean.TRUE);
 
         value.put(false);
         assertEquals(value.getType(), Boolean.TYPE);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getBoolean(), false);
         assertEquals(value.get(), Boolean.FALSE);
@@ -117,70 +117,70 @@
         value.put(Boolean.TRUE);
         value.trim();
         assertEquals(value.getType(), Boolean.class);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getBoolean(), true);
         assertEquals(value.get(), Boolean.TRUE);
 
         value.put(Boolean.FALSE);
         assertEquals(value.getType(), Boolean.class);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getBoolean(), false);
         assertEquals(value.get(), Boolean.FALSE);
 
         value.put((byte) 123);
         assertEquals(value.getType(), Byte.TYPE);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getByte(), (byte) 123);
         assertEquals(value.get(), new Byte((byte) 123));
 
         value.put(new Byte((byte) 123));
         assertEquals(value.getType(), Byte.class);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getByte(), (byte) 123);
         assertEquals(value.get(), new Byte((byte) 123));
 
         value.put((short) 234);
         assertEquals(value.getType(), Short.TYPE);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getShort(), (short) 234);
         assertEquals(value.get(), new Short((short) 234));
 
         value.put(new Short((short) 234));
         assertEquals(value.getType(), Short.class);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getShort(), (short) 234);
         assertEquals(value.get(), new Short((short) 234));
 
         value.put((char) 345);
         assertEquals(value.getType(), Character.TYPE);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getChar(), (char) 345);
         assertEquals(value.get(), new Character((char) 345));
 
         value.put(new Character((char) 345));
         assertEquals(value.getType(), Character.class);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getChar(), (char) 345);
         assertEquals(value.get(), new Character((char) 345));
 
         value.put(456);
         assertEquals(value.getType(), Integer.TYPE);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getInt(), 456);
         assertEquals(value.get(), new Integer(456));
 
         value.put(new Integer(456));
         assertEquals(value.getType(), Integer.class);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         value.trim();
         assertEquals(value.getInt(), 456);
@@ -188,28 +188,28 @@
 
         value.put((float) 567);
         assertEquals(value.getType(), Float.TYPE);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getFloat(), 567, 0.0001f);
         assertEquals(value.get(), new Float(567));
 
         value.put(new Float(567));
         assertEquals(value.getType(), Float.class);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getFloat(), 567, 0.0001f);
         assertEquals(value.get(), new Float(567));
 
         value.put((double) 678);
         assertEquals(value.getType(), Double.TYPE);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         assertEquals(value.getDouble(), 678, 0.0001f);
         assertEquals(value.get(), new Double(678));
 
         value.put(new Double(678));
         assertEquals(value.getType(), Double.class);
-        assertEquals(value.isNull(), false);
+        assertEquals(value.isNull(false), false);
         assertEquals(value.isDefined(), true);
         value.trim(100);
         assertEquals(value.getDouble(), 678, 0.0001f);