Update Parquet

Author: cgivre

exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ColumnDataReader.java

@@ -55,7 +55,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -417,13 +416,10 @@ public void close() {
     recordReader = null;
     recordMaterializer = null;
     nullFilledVectors = null;
-    try {
-      if (pageReadStore != null) {
-        pageReadStore.close();
-        pageReadStore = null;
-      }
-    } catch (IOException e) {
-      logger.warn("Failure while closing PageReadStore", e);
+
+    if (pageReadStore != null) {
+      pageReadStore.close();
+      pageReadStore = null;
     }
   }
 

exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetReader.java

@@ -17,13 +17,7 @@
  */
 package org.apache.parquet.hadoop;
 
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import io.netty.buffer.ByteBuf;
 import org.apache.drill.common.exceptions.DrillRuntimeException;
 import org.apache.drill.exec.exception.OutOfMemoryException;
 import org.apache.drill.exec.memory.BufferAllocator;
@@ -47,11 +41,16 @@
 import org.apache.parquet.format.converter.ParquetMetadataConverter;
 import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
 import org.apache.parquet.hadoop.util.HadoopStreams;
-
-import io.netty.buffer.ByteBuf;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 
 public class ColumnChunkIncReadStore implements PageReadStore {
   private static final Logger logger = LoggerFactory.getLogger(ColumnChunkIncReadStore.class);
@@ -295,9 +294,13 @@ public void addColumn(ColumnDescriptor descriptor, ColumnChunkMetaData metaData)
     columns.put(descriptor, reader);
   }
 
-  public void close() throws IOException {
+  public void close() {
     for (FSDataInputStream stream : streams) {
-      stream.close();
+      try {
+        stream.close();
+      } catch (IOException e) {
+        logger.warn("Error closing stream: {}", e.getMessage(), e);
+      }
     }
     for (ColumnChunkIncPageReader reader : columns.values()) {
       reader.close();

exec/java-exec/src/main/java/org/apache/parquet/hadoop/ColumnChunkIncReadStore.java

@@ -125,8 +125,8 @@
     <netty.tcnative.classifier />
     <netty.tcnative.version>2.0.65.Final</netty.tcnative.version>
     <netty.version>4.1.115.Final</netty.version>
-    <parquet.format.version>2.9.0</parquet.format.version>
-    <parquet.version>1.12.3</parquet.version>
+    <parquet.format.version>2.11.0</parquet.format.version>
+    <parquet.version>1.15.1</parquet.version>
     <project.build.outputTimestamp>1676438963</project.build.outputTimestamp>
     <protobuf.version>3.25.5</protobuf.version>
     <proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path>