You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2011/03/17 00:18:51 UTC
svn commit: r1082342 - in /hbase/trunk/src:
main/java/org/apache/hadoop/hbase/util/ByteBufferOutputStream.java
test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
Author: rawson
Date: Wed Mar 16 23:18:51 2011
New Revision: 1082342
URL: http://svn.apache.org/viewvc?rev=1082342&view=rev
Log:
Build fix, HBASE-3514
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/ByteBufferOutputStream.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/ByteBufferOutputStream.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/ByteBufferOutputStream.java?rev=1082342&r1=1082341&r2=1082342&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/ByteBufferOutputStream.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/ByteBufferOutputStream.java Wed Mar 16 23:18:51 2011
@@ -90,7 +90,9 @@ public class ByteBufferOutputStream exte
*/
public synchronized void writeTo(OutputStream out) throws IOException {
WritableByteChannel channel = Channels.newChannel(out);
- channel.write(getByteBuffer());
+ ByteBuffer bb = buf.duplicate();
+ bb.flip();
+ channel.write(bb);
}
@Override
@@ -118,18 +120,13 @@ public class ByteBufferOutputStream exte
}
public byte[] toByteArray(int offset, int length) {
- int position = buf.position();
- byte[] chunk;
+ ByteBuffer bb = buf.duplicate();
+ bb.flip();
- try {
- buf.position(offset);
-
- chunk = new byte[length];
- buf.get(chunk, 0, length);
- } finally {
- buf.position(position);
- }
+ byte[] chunk = new byte[length];
+ bb.position(offset);
+ bb.get(chunk, 0, length);
return chunk;
}
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1082342&r1=1082341&r2=1082342&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java Wed Mar 16 23:18:51 2011
@@ -702,7 +702,6 @@ public class TestStoreFile extends HBase
while ((kv1 = scannerOne.next()) != null) {
kv2 = scannerTwo.next();
assertTrue(kv1.equals(kv2));
- assertTrue(Bytes.equals(kv1.getBuffer(), kv2.getBuffer()));
}
assertNull(scannerTwo.next());
assertEquals(startHit + 6, cs.getHitCount());