apache · jaltekruse · Sep 4, 2015 · Sep 4, 2015 · Sep 14, 2015 · Nov 4, 2015
diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseGroupScan.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseGroupScan.java
@@ -33,6 +33,7 @@
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import org.apache.drill.common.exceptions.DrillRuntimeException;
 import org.apache.drill.common.exceptions.ExecutionSetupException;
 import org.apache.drill.common.expression.SchemaPath;
@@ -52,8 +53,6 @@
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.client.HTable;
 
-import parquet.org.codehaus.jackson.annotate.JsonCreator;
-
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java
@@ -122,7 +122,7 @@ public static class HBaseSubScanSpec {
     protected byte[] stopRow;
     protected byte[] serializedFilter;
 
-    @parquet.org.codehaus.jackson.annotate.JsonCreator
+    @JsonCreator
     public HBaseSubScanSpec(@JsonProperty("tableName") String tableName,
                             @JsonProperty("regionServer") String regionServer,
                             @JsonProperty("startRow") byte[] startRow,

diff --git a/.../core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeScanBatchCreator.java b/.../core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeScanBatchCreator.java
@@ -37,7 +37,7 @@
 import org.apache.drill.exec.record.RecordBatch;
 import org.apache.drill.exec.store.AbstractRecordReader;
 import org.apache.drill.exec.store.RecordReader;
-import org.apache.drill.exec.store.parquet.DirectCodecFactory;
+import org.apache.drill.exec.store.parquet.ParquetDirectByteBufferAllocator;
 import org.apache.drill.exec.store.parquet.columnreaders.ParquetRecordReader;
 import org.apache.drill.exec.util.ImpersonationUtil;
 import org.apache.hadoop.conf.Configuration;
@@ -50,9 +50,10 @@
 import org.apache.hadoop.mapred.FileSplit;
 import org.apache.hadoop.mapred.InputSplit;
 import org.apache.hadoop.mapred.JobConf;
-import parquet.hadoop.ParquetFileReader;
-import parquet.hadoop.metadata.BlockMetaData;
-import parquet.hadoop.metadata.ParquetMetadata;
+import org.apache.parquet.hadoop.CodecFactory;
+import org.apache.parquet.hadoop.ParquetFileReader;
+import org.apache.parquet.hadoop.metadata.BlockMetaData;
+import org.apache.parquet.hadoop.metadata.ParquetMetadata;
 
 @SuppressWarnings("unused")
 public class HiveDrillNativeScanBatchCreator implements BatchCreator<HiveDrillNativeParquetSubScan> {
@@ -125,7 +126,8 @@ public ScanBatch getBatch(FragmentContext context, HiveDrillNativeParquetSubScan
                   context,
                   Path.getPathWithoutSchemeAndAuthority(finalPath).toString(),
                   rowGroupNum, fs,
-                  new DirectCodecFactory(fs.getConf(), oContext.getAllocator()),
+                  CodecFactory.createDirectCodecFactory(fs.getConf(),
+                      new ParquetDirectByteBufferAllocator(oContext.getAllocator()), 0),
                   parquetMetadata,
                   newColumns)
           );

diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java
@@ -31,6 +31,11 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.drill.common.exceptions.DrillRuntimeException;
 import org.apache.drill.common.exceptions.ExecutionSetupException;
@@ -53,12 +58,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import parquet.org.codehaus.jackson.annotate.JsonCreator;
-
-import com.fasterxml.jackson.annotation.JacksonInject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;

diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java
@@ -132,7 +132,7 @@ public static class MongoSubScanSpec {
 
     protected BasicDBObject filter;
 
-    @parquet.org.codehaus.jackson.annotate.JsonCreator
+    @JsonCreator
     public MongoSubScanSpec(@JsonProperty("dbName") String dbName,
         @JsonProperty("collectionName") String collectionName,
         @JsonProperty("hosts") List<String> hosts,

diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
@@ -159,7 +159,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.twitter</groupId>
+      <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-column</artifactId>
       <version>${parquet.version}</version>
       <exclusions>
@@ -174,7 +174,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.twitter</groupId>
+      <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-hadoop</artifactId>
       <version>${parquet.version}</version>
       <exclusions>
@@ -189,9 +189,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.twitter</groupId>
+      <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-format</artifactId>
-      <version>2.1.1-drill-r1</version>
+      <version>2.3.0-incubating</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.hadoop</groupId>
@@ -204,7 +204,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.twitter</groupId>
+      <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-common</artifactId>
       <version>${parquet.version}</version>
       <exclusions>
@@ -219,7 +219,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.twitter</groupId>
+      <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-jackson</artifactId>
       <version>${parquet.version}</version>
       <exclusions>
@@ -234,7 +234,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.twitter</groupId>
+      <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-encoding</artifactId>
       <version>${parquet.version}</version>
       <exclusions>
@@ -249,7 +249,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.twitter</groupId>
+      <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-generator</artifactId>
       <version>${parquet.version}</version>
       <exclusions>

diff --git a/exec/java-exec/src/main/codegen/templates/JsonOutputRecordWriter.java b/exec/java-exec/src/main/codegen/templates/JsonOutputRecordWriter.java
@@ -22,36 +22,13 @@
 
 package org.apache.drill.exec.store;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.google.common.collect.Lists;
-import org.apache.drill.common.types.TypeProtos.MinorType;
-import org.apache.drill.exec.expr.TypeHelper;
-import org.apache.drill.exec.expr.holders.*;
-import org.apache.drill.exec.record.BatchSchema;
 import org.apache.drill.exec.store.EventBasedRecordWriter.FieldConverter;
-import org.apache.drill.exec.store.parquet.ParquetTypeHelper;
-import org.apache.drill.exec.vector.*;
-import org.apache.drill.exec.util.DecimalUtility;
 import org.apache.drill.exec.vector.complex.reader.FieldReader;
-import parquet.io.api.RecordConsumer;
-import parquet.schema.MessageType;
-import parquet.io.api.Binary;
-import io.netty.buffer.ByteBuf;
-import org.apache.drill.exec.record.BatchSchema;
-import org.apache.drill.exec.record.MaterializedField;
 import org.apache.drill.exec.vector.complex.fn.JsonOutput;
 
-
-
-import org.apache.drill.common.types.TypeProtos;
-
-import org.joda.time.DateTimeUtils;
-
 import java.io.IOException;
 import java.lang.UnsupportedOperationException;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Abstract implementation of RecordWriter interface which exposes interface:

diff --git a/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java b/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java
@@ -17,7 +17,7 @@
  */
 
 import org.joda.time.DateTimeUtils;
-import parquet.io.api.Binary;
+import org.apache.parquet.io.api.Binary;
 
 import java.lang.Override;
 import java.lang.RuntimeException;
@@ -39,9 +39,9 @@
 import org.apache.drill.exec.vector.*;
 import org.apache.drill.exec.util.DecimalUtility;
 import org.apache.drill.exec.vector.complex.reader.FieldReader;
-import parquet.io.api.RecordConsumer;
-import parquet.schema.MessageType;
-import parquet.io.api.Binary;
+import org.apache.parquet.io.api.RecordConsumer;
+import org.apache.parquet.schema.MessageType;
+import org.apache.parquet.io.api.Binary;
 import io.netty.buffer.DrillBuf;
 import org.apache.drill.exec.record.BatchSchema;
 import org.apache.drill.exec.record.MaterializedField;

diff --git a/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java b/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java
@@ -17,10 +17,10 @@
  */
 
 import org.apache.drill.common.types.MinorType;
-import parquet.format.ConvertedType;
-import parquet.schema.DecimalMetadata;
-import parquet.schema.OriginalType;
-import parquet.schema.PrimitiveType.PrimitiveTypeName;
+import org.apache.parquet.format.ConvertedType;
+import org.apache.parquet.schema.DecimalMetadata;
+import org.apache.parquet.schema.OriginalType;
+import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
 
 <@pp.dropOutputFile />
 <@pp.changeOutputFile name="org/apache/drill/exec/store/parquet/ParquetTypeHelper.java" />
@@ -31,10 +31,10 @@
 import org.apache.drill.common.types.TypeProtos.DataMode;
 import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.exec.record.MaterializedField;
-import parquet.schema.OriginalType;
-import parquet.schema.DecimalMetadata;
-import parquet.schema.PrimitiveType.PrimitiveTypeName;
-import parquet.schema.Type.Repetition;
+import org.apache.parquet.schema.OriginalType;
+import org.apache.parquet.schema.DecimalMetadata;
+import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
+import org.apache.parquet.schema.Type.Repetition;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...c/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java b/...c/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java
@@ -78,7 +78,7 @@
 import org.apache.drill.exec.vector.ValueVector;
 import org.apache.calcite.rel.RelFieldCollation.Direction;
 
-import parquet.Preconditions;
+import com.google.common.base.Preconditions;
 
 import com.google.common.collect.Lists;
 import com.sun.codemodel.JConditional;

diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java
@@ -46,7 +46,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import parquet.Preconditions;
+import com.google.common.base.Preconditions;
 
 @XmlRootElement
 public class QueryWrapper {

diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ColumnDataReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ColumnDataReader.java
@@ -25,10 +25,10 @@
 
 import org.apache.hadoop.fs.FSDataInputStream;
 
-import parquet.bytes.BytesInput;
-import parquet.format.PageHeader;
-import parquet.format.Util;
-import parquet.hadoop.util.CompatibilityUtil;
+import org.apache.parquet.bytes.BytesInput;
+import org.apache.parquet.format.PageHeader;
+import org.apache.parquet.format.Util;
+import org.apache.parquet.hadoop.util.CompatibilityUtil;
 
 public class ColumnDataReader {
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ColumnDataReader.class);
@@ -46,6 +46,10 @@ public PageHeader readPageHeader() throws IOException{
     return Util.readPageHeader(input);
   }
 
+  public FSDataInputStream getInputStream() {
+    return input;
+  }
+
   public BytesInput getPageAsBytesInput(int pageLength) throws IOException{
     byte[] b = new byte[pageLength];
     input.read(b);
@@ -55,8 +59,9 @@ public BytesInput getPageAsBytesInput(int pageLength) throws IOException{
   public void loadPage(DrillBuf target, int pageLength) throws IOException {
     target.clear();
     ByteBuffer directBuffer = target.nioBuffer(0, pageLength);
-    while (directBuffer.remaining() > 0) {
-      CompatibilityUtil.getBuf(input, directBuffer, directBuffer.remaining());
+    int lengthLeftToRead = pageLength;
+    while (lengthLeftToRead > 0) {
+      lengthLeftToRead -= CompatibilityUtil.getBuf(input, directBuffer, lengthLeftToRead);
     }
     target.writerIndex(pageLength);
   }