diff --git a/dev/diffs/iceberg/1.8.1.diff b/dev/diffs/iceberg/1.8.1.diff index fe289bd2d7..dffd820ff9 100644 --- a/dev/diffs/iceberg/1.8.1.diff +++ b/dev/diffs/iceberg/1.8.1.diff @@ -17,7 +17,7 @@ index 7327b38905d..7967109f039 100644 exclude group: 'org.apache.avro', module: 'avro' // already shaded by Parquet diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml -index 04ffa8f4edc..cc0099ccc93 100644 +index 04ffa8f4edc..a909cd552c1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,6 +34,7 @@ azuresdk-bom = "1.2.31" @@ -300,10 +300,10 @@ index 00000000000..ddf6c7de5ae +} diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/CometVectorizedParquetReader.java b/parquet/src/main/java/org/apache/iceberg/parquet/CometVectorizedParquetReader.java new file mode 100644 -index 00000000000..88b195b76a2 +index 00000000000..a3cba401827 --- /dev/null +++ b/parquet/src/main/java/org/apache/iceberg/parquet/CometVectorizedParquetReader.java -@@ -0,0 +1,255 @@ +@@ -0,0 +1,260 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file @@ -446,6 +446,7 @@ index 00000000000..88b195b76a2 + private long valuesRead = 0; + private T last = null; + private final FileReader cometReader; ++ private ReadConf conf; + + FileIterator( + ReadConf conf, @@ -470,6 +471,7 @@ index 00000000000..88b195b76a2 + length, + fileEncryptionKey, + fileAADPrefix); ++ this.conf = conf; + } + + private FileReader newCometReader( @@ -556,6 +558,9 @@ index 00000000000..88b195b76a2 + public void close() throws IOException { + model.close(); + cometReader.close(); ++ if (conf != null && conf.reader() != null) { ++ conf.reader().close(); ++ } + } + } +} diff --git a/dev/diffs/iceberg/1.9.1.diff b/dev/diffs/iceberg/1.9.1.diff index e7b143981c..52e499874b 100644 --- a/dev/diffs/iceberg/1.9.1.diff +++ b/dev/diffs/iceberg/1.9.1.diff @@ -291,10 +291,10 @@ index 00000000000..ddf6c7de5ae +} diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/CometVectorizedParquetReader.java b/parquet/src/main/java/org/apache/iceberg/parquet/CometVectorizedParquetReader.java new file mode 100644 -index 00000000000..88b195b76a2 +index 00000000000..a3cba401827 --- /dev/null +++ b/parquet/src/main/java/org/apache/iceberg/parquet/CometVectorizedParquetReader.java -@@ -0,0 +1,255 @@ +@@ -0,0 +1,260 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file @@ -437,6 +437,7 @@ index 00000000000..88b195b76a2 + private long valuesRead = 0; + private T last = null; + private final FileReader cometReader; ++ private ReadConf conf; + + FileIterator( + ReadConf conf, @@ -461,6 +462,7 @@ index 00000000000..88b195b76a2 + length, + fileEncryptionKey, + fileAADPrefix); ++ this.conf = conf; + } + + private FileReader newCometReader( @@ -547,6 +549,9 @@ index 00000000000..88b195b76a2 + public void close() throws IOException { + model.close(); + cometReader.close(); ++ if (conf != null && conf.reader() != null) { ++ conf.reader().close(); ++ } + } + } +}