/*
 * Licensed to the University of California, Berkeley under one or more contributor license
 * agreements. See the NOTICE file distributed with this work for additional information regarding
 * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance with the License. You may obtain a
 * copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software distributed under the License
 * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 * or implied. See the License for the specific language governing permissions and limitations under
 * the License.
 */

package tachyon.underfs.s3;

import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;

import org.jets3t.service.S3Service;
import org.jets3t.service.ServiceException;
import org.jets3t.service.model.S3Object;

public class S3InputStream extends InputStream {

  private final String mBucketName;
  private final String mKey;
  private final S3Service mClient;

  private S3Object mObject;
  private BufferedInputStream mInputStream;
  private long mPos;

  S3InputStream(String bucketName, String key, S3Service client) throws ServiceException {
    mBucketName = bucketName;
    mKey = key;
    mClient = client;
    mObject = mClient.getObject(mBucketName, mKey);
    mInputStream = new BufferedInputStream(mObject.getDataInputStream());
  }

  @Override
  public void close() throws IOException {
    mInputStream.close();
  }

  public int read() throws IOException {
    int ret = mInputStream.read();
    if (ret != -1) {
      mPos++;
    }
    return ret;
  }

  public int read(byte[] b, int off, int len) throws IOException {
    int ret = mInputStream.read(b, off, len);
    if (ret != -1) {
      mPos += ret;
    }
    return ret;
  }

  @Override
  public long skip(long n) throws IOException {
    if (mInputStream.available() >= n) {
      return mInputStream.skip(n);
    }
    mInputStream.close();
    mPos += n;
    try {
      mObject = mClient.getObject(mBucketName, mKey, null, null, null, null, mPos, null);
      mInputStream = new BufferedInputStream(mObject.getDataInputStream());
    } catch (ServiceException se) {
      throw new IOException(se);
    }
    return n;
  }
}

@@ -1036,186 +1036,720 @@
 t;%0A%0A
-public class S3InputStream extends InputStream %7B%0A%0A  private final String mBucketName;%0A  private final String mKey;%0A  private final S3Service mClient;%0A%0A  private S3Object mObject;
+/**%0A * This class is a wrapper around the input stream returned by%0A * %7B@link org.jets3t.service.model.S3Object%7D getDataInputStream. The main purpose is to provide a%0A * faster skip method, as the underlying implementation will read and discard bytes until the%0A * number to skip has been reached.%0A */%0Apublic class S3InputStream extends InputStream %7B%0A%0A  /** Bucket name of the Tachyon S3 bucket */%0A  private final String mBucketName;%0A  /** Key of the file in S3 to read */%0A  private final String mKey;%0A  /** The JetS3t client for S3 operations */%0A  private final S3Service mClient;%0A%0A  /** The storage object that will be updated on each large skip */%0A  private S3Object mObject;%0A  /** The underlying input stream */
 %0A  p
@@ -1789,16 +1789,48 @@
 Stream;%0A
+  /** Position of the stream */%0A
   privat
@@ -2675,24 +2675,105 @@
 p(n);%0A    %7D%0A
+    // The number of bytes to skip is possibly large, open a new stream from S3.%0A
     mInputSt

Add documentation to S3InputStream.