Skip to content

Commit 7fb72a2

Browse files
committed
Test Parquet MR 1.14.0
1 parent 0323308 commit 7fb72a2

File tree

6 files changed

+19
-104
lines changed

6 files changed

+19
-104
lines changed

.palantir/revapi.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,6 +1018,11 @@ acceptedBreaks:
10181018
old: "method void org.apache.iceberg.PositionDeletesTable.PositionDeletesBatchScan::<init>(org.apache.iceberg.Table,\
10191019
\ org.apache.iceberg.Schema, org.apache.iceberg.TableScanContext)"
10201020
justification: "Removing deprecated code"
1021+
"1.5.0":
1022+
org.apache.iceberg:iceberg-parquet:
1023+
- code: "java.class.removed"
1024+
old: "class org.apache.iceberg.parquet.ParquetCodecFactory"
1025+
justification: "Workaround for a bug in Parquet-MR"
10211026
apache-iceberg-0.14.0:
10221027
org.apache.iceberg:iceberg-api:
10231028
- code: "java.class.defaultSerializationChanged"

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ allprojects {
128128
repositories {
129129
mavenCentral()
130130
mavenLocal()
131+
maven {
132+
url = uri("https://repository.apache.org/content/repositories/orgapacheparquet-1054")
133+
}
131134
}
132135
}
133136

flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -217,27 +217,27 @@ public void testPrimitiveColumns() throws Exception {
217217

218218
Row binaryCol =
219219
Row.of(
220-
52L,
220+
55L,
221221
4L,
222222
2L,
223223
null,
224224
Base64.getDecoder().decode("1111"),
225225
Base64.getDecoder().decode("2222"));
226-
Row booleanCol = Row.of(32L, 4L, 0L, null, false, true);
227-
Row decimalCol = Row.of(85L, 4L, 1L, null, new BigDecimal("1.00"), new BigDecimal("2.00"));
228-
Row doubleCol = Row.of(85L, 4L, 0L, 1L, 1.0D, 2.0D);
226+
Row booleanCol = Row.of(36L, 4L, 0L, null, false, true);
227+
Row decimalCol = Row.of(91L, 4L, 1L, null, new BigDecimal("1.00"), new BigDecimal("2.00"));
228+
Row doubleCol = Row.of(91L, 4L, 0L, 1L, 1.0D, 2.0D);
229229
Row fixedCol =
230230
Row.of(
231-
44L,
231+
47L,
232232
4L,
233233
2L,
234234
null,
235235
Base64.getDecoder().decode("1111"),
236236
Base64.getDecoder().decode("2222"));
237-
Row floatCol = Row.of(71L, 4L, 0L, 2L, 0f, 0f);
238-
Row intCol = Row.of(71L, 4L, 0L, null, 1, 2);
239-
Row longCol = Row.of(79L, 4L, 0L, null, 1L, 2L);
240-
Row stringCol = Row.of(79L, 4L, 0L, null, "1", "2");
237+
Row floatCol = Row.of(77L, 4L, 0L, 2L, 0f, 0f);
238+
Row intCol = Row.of(77L, 4L, 0L, null, 1, 2);
239+
Row longCol = Row.of(85L, 4L, 0L, null, 1L, 2L);
240+
Row stringCol = Row.of(85L, 4L, 0L, null, "1", "2");
241241

242242
List<Row> expected =
243243
Lists.newArrayList(

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ netty-buffer = "4.1.109.Final"
7070
netty-buffer-compat = "4.1.109.Final"
7171
object-client-bundle = "3.3.2"
7272
orc = "1.9.3"
73-
parquet = "1.13.1"
73+
parquet = "1.14.0"
7474
pig = "0.17.0"
7575
roaringbitmap = "1.0.6"
7676
s3mock-junit5 = "2.11.0"

parquet/src/main/java/org/apache/iceberg/parquet/ParquetCodecFactory.java

Lines changed: 0 additions & 92 deletions
This file was deleted.

parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ class ParquetWriter<T> implements FileAppender<T>, Closeable {
8686
this.targetRowGroupSize = rowGroupSize;
8787
this.props = properties;
8888
this.metadata = ImmutableMap.copyOf(metadata);
89-
this.compressor =
90-
new ParquetCodecFactory(conf, props.getPageSizeThreshold()).getCompressor(codec);
89+
this.compressor = new CodecFactory(conf, props.getPageSizeThreshold()).getCompressor(codec);
9190
this.parquetSchema = ParquetSchemaUtil.convert(schema, "table");
9291
this.model = (ParquetValueWriter<T>) createWriterFunc.apply(parquetSchema);
9392
this.metricsConfig = metricsConfig;

0 commit comments

Comments
 (0)