[incubator-pulsar] branch master updated: Make BlockAwareSegmentInputStream extend InputStream (#1730)

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new c570fb1  Make BlockAwareSegmentInputStream extend InputStream (#1730)
c570fb1 is described below

commit c570fb18289c3183d28b5128df6759c84e6c5afd
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Mon May 7 10:29:46 2018 +0200

    Make BlockAwareSegmentInputStream extend InputStream (#1730)
    
    So that it can be used as an InputStream with the S3 interfaces.
    
    Master Issue: #1511
---
 .../broker/s3offload/BlockAwareSegmentInputStream.java    | 15 ++++++++-------
 .../s3offload/impl/BlockAwareSegmentInputStreamImpl.java  |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/BlockAwareSegmentInputStream.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/BlockAwareSegmentInputStream.java
index c2d34da..50d9e37 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/BlockAwareSegmentInputStream.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/BlockAwareSegmentInputStream.java
@@ -19,6 +19,7 @@
 package org.apache.pulsar.broker.s3offload;
 
 import java.io.IOException;
+import java.io.InputStream;
 import org.apache.bookkeeper.client.api.ReadHandle;
 
 /**
@@ -27,44 +28,44 @@ import org.apache.bookkeeper.client.api.ReadHandle;
  * It gets data from ledger, and will be read out the content for a data block.
  * DataBlockHeader + entries(each with format[[entry_size -- int][entry_id -- long][entry_data]]) + padding
  */
-public interface BlockAwareSegmentInputStream {
+public abstract class BlockAwareSegmentInputStream extends InputStream {
     /**
      * Get the ledger, from which this InputStream read data.
      */
-    ReadHandle getLedger();
+    public abstract ReadHandle getLedger();
 
     /**
      * Get start entry id contained in this InputStream.
      *
      * @return the start entry id
      */
-    long getStartEntryId();
+    public abstract long getStartEntryId();
 
     /**
      * Get block size that could read out from this InputStream.
      *
      * @return the block size
      */
-    int getBlockSize();
+    public abstract int getBlockSize();
 
     /**
      * Get entry count that read out from this InputStream
      *
      * @return the block entry count
      */
-    int getBlockEntryCount();
+    public abstract int getBlockEntryCount();
 
     /**
      * Get end entry id contained in this InputStream.
      *
      * @return the end entry id
      */
-    long getEndEntryId();
+    public abstract long getEndEntryId();
 
     /**
      * Get sum of entries data size read from the this InputStream
      *
      * @return the block entry bytes count
      */
-    int getBlockEntryBytesCount();
+    public abstract int getBlockEntryBytesCount();
 }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/BlockAwareSegmentInputStreamImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/BlockAwareSegmentInputStreamImpl.java
index c83efc3..f1b07bd 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/BlockAwareSegmentInputStreamImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/BlockAwareSegmentInputStreamImpl.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * It gets data from ledger, and will be read out the content for a data block.
  * DataBlockHeader + entries(each with format[[entry_size -- int][entry_id -- long][entry_data]]) + padding
  */
-public class BlockAwareSegmentInputStreamImpl extends InputStream implements BlockAwareSegmentInputStream {
+public class BlockAwareSegmentInputStreamImpl extends BlockAwareSegmentInputStream {
     private static final Logger log = LoggerFactory.getLogger(BlockAwareSegmentInputStreamImpl.class);
 
     private static final byte[] BLOCK_END_PADDING = Ints.toByteArray(0xFEDCDEAD);

-- 
To stop receiving notification emails like this one, please contact
sijie@apache.org.