Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EAD7A200BAC for ; Wed, 26 Oct 2016 18:01:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E9771160B02; Wed, 26 Oct 2016 16:01:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 13D09160AEE for ; Wed, 26 Oct 2016 18:01:27 +0200 (CEST) Received: (qmail 47933 invoked by uid 500); 26 Oct 2016 16:01:25 -0000 Mailing-List: contact dev-help@drill.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@drill.apache.org Delivered-To: mailing list dev@drill.apache.org Received: (qmail 47306 invoked by uid 99); 26 Oct 2016 16:01:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2016 16:01:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 692BBE0FC4; Wed, 26 Oct 2016 16:01:25 +0000 (UTC) From: ppadma To: dev@drill.apache.org Reply-To: dev@drill.apache.org References: In-Reply-To: Subject: [GitHub] drill pull request #611: Drill-4800: Improve parquet reader performance Content-Type: text/plain Message-Id: <20161026160125.692BBE0FC4@git1-us-west.apache.org> Date: Wed, 26 Oct 2016 16:01:25 +0000 (UTC) archived-at: Wed, 26 Oct 2016 16:01:29 -0000 Github user ppadma commented on a diff in the pull request: https://github.com/apache/drill/pull/611#discussion_r85152503 --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/BufferedDirectBufInputStream.java --- @@ -0,0 +1,467 @@ +/** + * Licensed to the Apache Software Foundation (ASF) 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 org.apache.drill.exec.util.filereader; + +import com.google.common.base.Preconditions; +import io.netty.buffer.DrillBuf; +import org.apache.drill.common.config.DrillConfig; +import org.apache.drill.exec.memory.BufferAllocator; +import org.apache.drill.exec.memory.RootAllocatorFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FSDataInputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.parquet.hadoop.Footer; +import org.apache.parquet.hadoop.ParquetFileReader; +import org.apache.parquet.hadoop.metadata.BlockMetaData; +import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; +import org.apache.parquet.hadoop.util.CompatibilityUtil; + +import java.io.Closeable; +import java.io.IOException; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.util.List; + +/** + * BufferedDirectBufInputStream reads from the + * underlying InputStream in blocks of data, into an + * internal buffer. The internal buffer is a direct memory backed + * buffer. The implementation is similar to the BufferedInputStream + * class except that the internal buffer is a Drillbuf and + * not a byte array. The mark and reset methods of the underlying + * InputStreamare not supported. + */ +public class BufferedDirectBufInputStream extends DirectBufInputStream implements Closeable { + + private static final org.slf4j.Logger logger = + org.slf4j.LoggerFactory.getLogger(BufferedDirectBufInputStream.class); + + private static int defaultBufferSize = 8192 * 1024; // 8 MiB + private static int defaultTempBufferSize = 8192; // 8 KiB + private static int smallBufferSize = 64 * 1024; // 64 KiB + + /** + * The internal buffer to keep data read from the underlying inputStream. + * internalBuffer[0] through internalBuffer[count-1] + * contains data read from the underlying input stream. + */ + protected volatile DrillBuf internalBuffer; // the internal buffer + + /** + * The number of valid bytes in internalBuffer. + * count is always in the range [0,internalBuffer.capacity] + * internalBuffer[count-1] is the last valid byte in the buffer. + */ + protected int count; + + /** + * The current read position in the buffer; the index of the next + * character to be read from the internalBuffer array. + *

+ * This value is always in the range [0,count]. + * If curPosInBuffer is equal to count> then we have read + * all the buffered data and the next read (or skip) will require more data to be read + * from the underlying input stream. + */ + protected int curPosInBuffer; + + protected long curPosInStream; // current offset in the input stream + + private int bufSize; + + private volatile DrillBuf tempBuffer; // a temp Buffer for use by read(byte[] buf, int off, int len) + + private DrillBuf getBuf() throws IOException { + checkInputStreamState(); + if (internalBuffer == null) { + throw new IOException("Input stream is closed."); + } + return this.internalBuffer; + } + + /** + * Creates a BufferedDirectBufInputStream + * with the default (8 MiB) buffer size. + */ + public BufferedDirectBufInputStream(InputStream in, BufferAllocator allocator, String id, + long startOffset, long totalByteSize, boolean enableHints) { + this(in, allocator, id, startOffset, totalByteSize, defaultBufferSize, enableHints); + } + + /** + * Creates a BufferedDirectBufInputStream + * with the specified buffer size. + */ + public BufferedDirectBufInputStream(InputStream in, BufferAllocator allocator, String id, + long startOffset, long totalByteSize, int bufSize, boolean enableHints) { + super(in, allocator, id, startOffset, totalByteSize, enableHints); + Preconditions.checkArgument(bufSize >= 0); + // We make the buffer size the smaller of the buffer Size parameter or the total Byte Size + // rounded to next highest pwoer of two --- End diff -- typo: power --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---