svn commit: r1074905 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/client/Increment.java

[ap...@apache.org]

Author: apurtell
Date: Sat Feb 26 19:10:30 2011
New Revision: 1074905

URL: http://svn.apache.org/viewvc?rev=1074905&view=rev
Log:
HBASE-3566  writeToWAL is not serialized for increment operation

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Increment.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1074905&r1=1074904&r2=1074905&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sat Feb 26 19:10:30 2011
@@ -51,6 +51,7 @@ Release 0.91.0 - Unreleased
                unflushable regions.
    HBASE-3550  FilterList reports false positives (Bill Graham via Andrew
                Purtell)
+   HBASE-3566  writeToWAL is not serialized for increment operation
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Increment.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Increment.java?rev=1074905&r1=1074904&r2=1074905&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Increment.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Increment.java Sat Feb 26 19:10:30 2011
@@ -44,7 +44,7 @@ import org.apache.hadoop.io.Writable;
  * {@link #addColumn(byte[], byte[], long)} method.
  */
 public class Increment implements Writable {
-  private static final byte INCREMENT_VERSION = (byte)1;
+  private static final byte INCREMENT_VERSION = (byte)2;
 
   private byte [] row = null;
   private long lockId = -1L;
@@ -296,6 +296,9 @@ public class Increment implements Writab
       }
       this.familyMap.put(family, set);
     }
+    if (version > 1) {
+      this.writeToWAL = in.readBoolean();
+    }
   }
 
   public void write(final DataOutput out)
@@ -323,5 +326,6 @@ public class Increment implements Writab
         }
       }
     }
+    out.writeBoolean(writeToWAL);
   }
 }