Resolve conflict

yuzhu · yuzhu · commit 56197e3b21d3 · 2025-06-22T19:38:15.000-07:00
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
@@ -744,7 +744,7 @@ public static ParquetFileReader open(InputFile file, ParquetMetadata footer, Par
     return new ParquetFileReader(file, footer, options, f);
   }
 
-  protected final SeekableInputStream f;
+  protected SeekableInputStream f;
   private final InputFile file;
   private final ParquetReadOptions options;
   private final Map<ColumnPath, ColumnDescriptor> paths = new HashMap<>();

Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,7 @@ public static ParquetFileReader open(InputFile file, ParquetMetadata footer, Par`
`744`	`744`	`return new ParquetFileReader(file, footer, options, f);`
`745`	`745`	`}`
`746`	`746`
`747`		`- protected final SeekableInputStream f;`
	`747`	`+ protected SeekableInputStream f;`
`748`	`748`	`private final InputFile file;`
`749`	`749`	`private final ParquetReadOptions options;`
`750`	`750`	`private final Map<ColumnPath, ColumnDescriptor> paths = new HashMap<>();`