Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 59813 invoked from network); 19 Jan 2011 16:39:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Jan 2011 16:39:09 -0000 Received: (qmail 50843 invoked by uid 500); 19 Jan 2011 16:39:09 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 50724 invoked by uid 500); 19 Jan 2011 16:39:07 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 50477 invoked by uid 99); 19 Jan 2011 16:39:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jan 2011 16:39:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 19 Jan 2011 16:39:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D76D82388906; Wed, 19 Jan 2011 16:38:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1060855 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra: io/sstable/IndexHelper.java utils/ByteBufferUtil.java utils/FBUtilities.java Date: Wed, 19 Jan 2011 16:38:43 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110119163843.D76D82388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Wed Jan 19 16:38:43 2011 New Revision: 1060855 URL: http://svn.apache.org/viewvc?rev=1060855&view=rev Log: move FBU.inputStream to BBU patch by slebresne; reviewed by jbellis for CASSANDRA-2009 Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java?rev=1060855&r1=1060854&r2=1060855&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java Wed Jan 19 16:38:43 2011 @@ -103,7 +103,7 @@ public class IndexHelper int size = file.readInt(); ByteBuffer bytes = file.readBytes(size); - DataInputStream stream = new DataInputStream(FBUtilities.inputStream(bytes)); + DataInputStream stream = new DataInputStream(ByteBufferUtil.inputStream(bytes)); return useOldBuffer ? LegacyBloomFilter.serializer().deserialize(stream) Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java?rev=1060855&r1=1060854&r2=1060855&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java Wed Jan 19 16:38:43 2011 @@ -22,6 +22,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.EOFException; import java.io.IOException; +import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import java.nio.charset.Charset; @@ -355,4 +356,28 @@ public class ByteBufferUtil return ByteBuffer.allocate(8).putLong(0, n); } + public static InputStream inputStream(ByteBuffer bytes) + { + final ByteBuffer copy = bytes.duplicate(); + + return new InputStream() + { + public int read() throws IOException + { + if (!copy.hasRemaining()) + return -1; + + return copy.get(); + } + + public int read(byte[] bytes, int off, int len) throws IOException + { + len = Math.min(len, copy.remaining()); + copy.get(bytes, off, len); + + return len; + } + }; + } + } Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=1060855&r1=1060854&r2=1060855&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java Wed Jan 19 16:38:43 2011 @@ -590,28 +590,4 @@ public class FBUtilities return field; } - - public static InputStream inputStream(ByteBuffer bytes) - { - final ByteBuffer copy = ByteBufferUtil.clone(bytes); - - return new InputStream() - { - public int read() throws IOException - { - if (!copy.hasRemaining()) - return -1; - - return copy.get(); - } - - public int read(byte[] bytes, int off, int len) throws IOException - { - len = Math.min(len, copy.remaining()); - copy.get(bytes, off, len); - - return len; - } - }; - } }