From c696902bb9313934786328a77f82e3383d2157bc Mon Sep 17 00:00:00 2001
From: Parth Chandra <parthc@apple.com>
Date: Wed, 3 Jan 2024 18:49:25 -0800
Subject: [PATCH] More review comments addressed

---
 .../apache/parquet/hadoop/ColumnChunkPageReadStore.java    | 7 +++----
 .../java/org/apache/parquet/hadoop/ParquetFileReader.java  | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageReadStore.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageReadStore.java
index 929b1519b1..494b2ba0b8 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageReadStore.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageReadStore.java
@@ -77,7 +77,7 @@ static final class ColumnChunkPageReader implements PageReader {
     private final BlockCipher.Decryptor blockDecryptor;
     private final byte[] dataPageAAD;
     private final byte[] dictionaryPageAAD;
-    private final ParquetMetricsCallback metricsCallback;
+//     private final ParquetMetricsCallback metricsCallback;
 
     ColumnChunkPageReader(
         BytesInputDecompressor decompressor,
@@ -89,8 +89,7 @@ static final class ColumnChunkPageReader implements PageReader {
         byte[] fileAAD,
         int rowGroupOrdinal,
         int columnOrdinal,
-        ParquetReadOptions options,
-        ParquetMetricsCallback callback) {
+        ParquetReadOptions options) {
       this.decompressor = decompressor;
       this.compressedPages = new ArrayDeque<DataPage>(compressedPages);
       this.compressedDictionaryPage = compressedDictionaryPage;
@@ -112,7 +111,6 @@ static final class ColumnChunkPageReader implements PageReader {
         dataPageAAD = null;
         dictionaryPageAAD = null;
       }
-      this.metricsCallback = callback;
     }
 
     private int getPageOrdinal(int currentPageIndex) {
@@ -305,6 +303,7 @@ public DataPage visit(DataPageV2 dataPageV2) {
     }
 
     private void setDecompressMetrics(BytesInput bytes, long start) {
+      final ParquetMetricsCallback metricsCallback = options.getMetricsCallback();
       if (metricsCallback != null) {
         long time = Math.max(System.nanoTime() - start, 0);
         long len = bytes.size();
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
index e1420da35f..2cae86faa6 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
@@ -827,8 +827,8 @@ public ParquetFileReader(Configuration conf, Path file, ParquetMetadata footer)
    * @param conf   the Hadoop Configuration
    * @param file   Path to a parquet file
    * @param footer a {@link ParquetMetadata} footer already read from the file
+   * @param options {@link ParquetReadOptions}
    * @throws IOException if the file can not be opened
-   * @deprecated will be removed in 2.0.0.
    */
   public ParquetFileReader(Configuration conf, Path file, ParquetMetadata footer, ParquetReadOptions options)
       throws IOException {