Skip to content

Commit

Permalink
Revert "Build: Bump parquet from 1.13.1 to 1.14.3 (#11264)" (#11462)
Browse files Browse the repository at this point in the history 
This reverts commit b8c2b20.

apache/parquet-java#3040
Was discovered by @pan3793 in Parquet 1.14.(0,1,2,3).
  • Loading branch information
@RussellSpitzer
RussellSpitzer committed Nov 4, 2024
1 parent 91e04c9 commit 36aeda4
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
22 changes: 11 additions & 11 deletions ...flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,27 +217,27 @@ public void testPrimitiveColumns() throws Exception {

Row binaryCol =
Row.of(
55L,
52L,
4L,
2L,
null,
Base64.getDecoder().decode("1111"),
Base64.getDecoder().decode("2222"));
Row booleanCol = Row.of(36L, 4L, 0L, null, false, true);
Row decimalCol = Row.of(91L, 4L, 1L, null, new BigDecimal("1.00"), new BigDecimal("2.00"));
Row doubleCol = Row.of(91L, 4L, 0L, 1L, 1.0D, 2.0D);
Row booleanCol = Row.of(32L, 4L, 0L, null, false, true);
Row decimalCol = Row.of(85L, 4L, 1L, null, new BigDecimal("1.00"), new BigDecimal("2.00"));
Row doubleCol = Row.of(85L, 4L, 0L, 1L, 1.0D, 2.0D);
Row fixedCol =
Row.of(
47L,
44L,
4L,
2L,
null,
Base64.getDecoder().decode("1111"),
Base64.getDecoder().decode("2222"));
Row floatCol = Row.of(77L, 4L, 0L, 2L, 0f, 0f);
Row intCol = Row.of(77L, 4L, 0L, null, 1, 2);
Row longCol = Row.of(85L, 4L, 0L, null, 1L, 2L);
Row stringCol = Row.of(85L, 4L, 0L, null, "1", "2");
Row floatCol = Row.of(71L, 4L, 0L, 2L, 0f, 0f);
Row intCol = Row.of(71L, 4L, 0L, null, 1, 2);
Row longCol = Row.of(79L, 4L, 0L, null, 1L, 2L);
Row stringCol = Row.of(79L, 4L, 0L, null, "1", "2");

List<Row> expected =
Lists.newArrayList(
Expand Down Expand Up @@ -289,8 +289,8 @@ public void testSelectNestedValues() throws Exception {
public void testNestedValues() throws Exception {
createNestedTable();

Row leafDoubleCol = Row.of(50L, 3L, 1L, 1L, 0.0D, 0.0D);
Row leafLongCol = Row.of(57L, 3L, 1L, null, 0L, 1L);
Row leafDoubleCol = Row.of(46L, 3L, 1L, 1L, 0.0D, 0.0D);
Row leafLongCol = Row.of(54L, 3L, 1L, null, 0L, 1L);
Row metrics = Row.of(Row.of(leafDoubleCol, leafLongCol));

TestHelpers.assertRows(
Expand Down
22 changes: 11 additions & 11 deletions ...flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,27 +217,27 @@ public void testPrimitiveColumns() throws Exception {

Row binaryCol =
Row.of(
55L,
52L,
4L,
2L,
null,
Base64.getDecoder().decode("1111"),
Base64.getDecoder().decode("2222"));
Row booleanCol = Row.of(36L, 4L, 0L, null, false, true);
Row decimalCol = Row.of(91L, 4L, 1L, null, new BigDecimal("1.00"), new BigDecimal("2.00"));
Row doubleCol = Row.of(91L, 4L, 0L, 1L, 1.0D, 2.0D);
Row booleanCol = Row.of(32L, 4L, 0L, null, false, true);
Row decimalCol = Row.of(85L, 4L, 1L, null, new BigDecimal("1.00"), new BigDecimal("2.00"));
Row doubleCol = Row.of(85L, 4L, 0L, 1L, 1.0D, 2.0D);
Row fixedCol =
Row.of(
47L,
44L,
4L,
2L,
null,
Base64.getDecoder().decode("1111"),
Base64.getDecoder().decode("2222"));
Row floatCol = Row.of(77L, 4L, 0L, 2L, 0f, 0f);
Row intCol = Row.of(77L, 4L, 0L, null, 1, 2);
Row longCol = Row.of(85L, 4L, 0L, null, 1L, 2L);
Row stringCol = Row.of(85L, 4L, 0L, null, "1", "2");
Row floatCol = Row.of(71L, 4L, 0L, 2L, 0f, 0f);
Row intCol = Row.of(71L, 4L, 0L, null, 1, 2);
Row longCol = Row.of(79L, 4L, 0L, null, 1L, 2L);
Row stringCol = Row.of(79L, 4L, 0L, null, "1", "2");

List<Row> expected =
Lists.newArrayList(
Expand Down Expand Up @@ -289,8 +289,8 @@ public void testSelectNestedValues() throws Exception {
public void testNestedValues() throws Exception {
createNestedTable();

Row leafDoubleCol = Row.of(50L, 3L, 1L, 1L, 0.0D, 0.0D);
Row leafLongCol = Row.of(57L, 3L, 1L, null, 0L, 1L);
Row leafDoubleCol = Row.of(46L, 3L, 1L, 1L, 0.0D, 0.0D);
Row leafLongCol = Row.of(54L, 3L, 1L, null, 0L, 1L);
Row metrics = Row.of(Row.of(leafDoubleCol, leafLongCol));

TestHelpers.assertRows(
Expand Down
22 changes: 11 additions & 11 deletions ...flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,27 +217,27 @@ public void testPrimitiveColumns() throws Exception {

Row binaryCol =
Row.of(
55L,
52L,
4L,
2L,
null,
Base64.getDecoder().decode("1111"),
Base64.getDecoder().decode("2222"));
Row booleanCol = Row.of(36L, 4L, 0L, null, false, true);
Row decimalCol = Row.of(91L, 4L, 1L, null, new BigDecimal("1.00"), new BigDecimal("2.00"));
Row doubleCol = Row.of(91L, 4L, 0L, 1L, 1.0D, 2.0D);
Row booleanCol = Row.of(32L, 4L, 0L, null, false, true);
Row decimalCol = Row.of(85L, 4L, 1L, null, new BigDecimal("1.00"), new BigDecimal("2.00"));
Row doubleCol = Row.of(85L, 4L, 0L, 1L, 1.0D, 2.0D);
Row fixedCol =
Row.of(
47L,
44L,
4L,
2L,
null,
Base64.getDecoder().decode("1111"),
Base64.getDecoder().decode("2222"));
Row floatCol = Row.of(77L, 4L, 0L, 2L, 0f, 0f);
Row intCol = Row.of(77L, 4L, 0L, null, 1, 2);
Row longCol = Row.of(85L, 4L, 0L, null, 1L, 2L);
Row stringCol = Row.of(85L, 4L, 0L, null, "1", "2");
Row floatCol = Row.of(71L, 4L, 0L, 2L, 0f, 0f);
Row intCol = Row.of(71L, 4L, 0L, null, 1, 2);
Row longCol = Row.of(79L, 4L, 0L, null, 1L, 2L);
Row stringCol = Row.of(79L, 4L, 0L, null, "1", "2");

List<Row> expected =
Lists.newArrayList(
Expand Down Expand Up @@ -289,8 +289,8 @@ public void testSelectNestedValues() throws Exception {
public void testNestedValues() throws Exception {
createNestedTable();

Row leafDoubleCol = Row.of(50L, 3L, 1L, 1L, 0.0D, 0.0D);
Row leafLongCol = Row.of(57L, 3L, 1L, null, 0L, 1L);
Row leafDoubleCol = Row.of(46L, 3L, 1L, 1L, 0.0D, 0.0D);
Row leafLongCol = Row.of(54L, 3L, 1L, null, 0L, 1L);
Row metrics = Row.of(Row.of(leafDoubleCol, leafLongCol));

TestHelpers.assertRows(
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ netty-buffer = "4.1.114.Final"
netty-buffer-compat = "4.1.114.Final"
object-client-bundle = "3.3.2"
orc = "1.9.4"
parquet = "1.14.3"
parquet = "1.13.1"
pig = "0.17.0"
roaringbitmap = "1.3.0"
scala-collection-compat = "2.12.0"
Expand Down

0 comments on commit 36aeda4

Please sign in to comment.