Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0E61F9C1F for ; Thu, 5 Apr 2012 20:48:28 +0000 (UTC) Received: (qmail 49679 invoked by uid 500); 5 Apr 2012 20:48:28 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 49550 invoked by uid 500); 5 Apr 2012 20:48:27 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 49530 invoked by uid 99); 5 Apr 2012 20:48:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2012 20:48:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2012 20:48:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A7C7B2388B46 for ; Thu, 5 Apr 2012 20:48:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1310067 - in /hbase/branches/0.94/src: main/java/org/apache/hadoop/hbase/KeyValue.java test/java/org/apache/hadoop/hbase/TestKeyValue.java Date: Thu, 05 Apr 2012 20:48:03 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120405204803.A7C7B2388B46@eris.apache.org> Author: stack Date: Thu Apr 5 20:48:03 2012 New Revision: 1310067 URL: http://svn.apache.org/viewvc?rev=1310067&view=rev Log: HBASE-5724 Row cache of KeyValue should be cleared in readFields(). Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/KeyValue.java hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/KeyValue.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/KeyValue.java?rev=1310067&r1=1310066&r2=1310067&view=diff ============================================================================== --- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/KeyValue.java (original) +++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/KeyValue.java Thu Apr 5 20:48:03 2012 @@ -27,7 +27,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Map; -import com.google.common.primitives.Longs; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.io.HeapSize; @@ -37,6 +36,8 @@ import org.apache.hadoop.hbase.util.Clas import org.apache.hadoop.io.RawComparator; import org.apache.hadoop.io.Writable; +import com.google.common.primitives.Longs; + /** * An HBase Key/Value. This is the fundamental HBase Type. * @@ -2231,6 +2232,7 @@ public class KeyValue implements Writabl // and it expects the length of the KeyValue to be explicitly passed // to it. public void readFields(int length, final DataInput in) throws IOException { + this.rowCache = null; this.length = length; this.offset = 0; this.bytes = new byte[this.length]; Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java?rev=1310067&r1=1310066&r2=1310067&view=diff ============================================================================== --- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java (original) +++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java Thu Apr 5 20:48:03 2012 @@ -19,6 +19,8 @@ */ package org.apache.hadoop.hbase; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; import java.io.IOException; import java.util.Set; import java.util.TreeSet; @@ -31,6 +33,7 @@ import org.apache.hadoop.hbase.KeyValue. import org.apache.hadoop.hbase.KeyValue.MetaComparator; import org.apache.hadoop.hbase.KeyValue.Type; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.io.WritableUtils; import org.junit.experimental.categories.Category; @Category(SmallTests.class) @@ -407,6 +410,25 @@ public class TestKeyValue extends TestCa kv.toString().replaceAll("=[0-9]+", "=0")); } + /** + * The row cache is cleared and re-read for the new value + * + * @throws IOException + */ + public void testReadFields() throws IOException { + KeyValue kv1 = new KeyValue(Bytes.toBytes("row1"), Bytes.toBytes("cf1"), + Bytes.toBytes("qualifier1"), 12345L, Bytes.toBytes("value1")); + kv1.getRow(); // set row cache of kv1 + KeyValue kv2 = new KeyValue(Bytes.toBytes("row2"), Bytes.toBytes("cf2"), + Bytes.toBytes("qualifier2"), 12345L, Bytes.toBytes("value2")); + kv1.readFields(new DataInputStream(new ByteArrayInputStream(WritableUtils + .toByteArray(kv2)))); + // check equality + assertEquals(kv1, kv2); + // check cache state (getRow() return the cached value if the cache is set) + assertTrue(Bytes.equals(kv1.getRow(), kv2.getRow())); + } + @org.junit.Rule public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();