Resolve conflict

yuzhu · yuzhu · commit e7f187aeee61 · 2025-06-20T23:17:19.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
@@ -739,7 +739,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
`@@ -739,7 +739,7 @@ public static ParquetFileReader open(InputFile file, ParquetMetadata footer, Par`
`739`	`739`	`return new ParquetFileReader(file, footer, options, f);`
`740`	`740`	`}`
`741`	`741`
`742`		`- protected final SeekableInputStream f;`
	`742`	`+ protected SeekableInputStream f;`
`743`	`743`	`private final InputFile file;`
`744`	`744`	`private final ParquetReadOptions options;`
`745`	`745`	`private final Map<ColumnPath, ColumnDescriptor> paths = new HashMap<>();`