This is an automated email from the ASF dual-hosted git repository.
russellspitzer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 7cc16fa94d Revert "Build: Bump parquet from 1.13.1 to 1.14.3 (#11264)"
(#11462)
7cc16fa94d is described below
commit 7cc16fa94d7cd4e19397e9b4fba62185e0fa5eac
Author: Russell Spitzer <[email protected]>
AuthorDate: Mon Nov 4 13:27:40 2024 -0600
Revert "Build: Bump parquet from 1.13.1 to 1.14.3 (#11264)" (#11462)
This reverts commit b8c2b20237bc9309d34dc96c473e9941d1b2ad58.
apache/parquet-java#3040
Was discovered by @pan3793 in Parquet 1.14.(0,1,2,3).
---
.../source/TestMetadataTableReadableMetrics.java | 22 +++++++++++-----------
.../source/TestMetadataTableReadableMetrics.java | 22 +++++++++++-----------
.../source/TestMetadataTableReadableMetrics.java | 22 +++++++++++-----------
gradle/libs.versions.toml | 2 +-
4 files changed, 34 insertions(+), 34 deletions(-)
diff --git
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
index 3aa2a7c066..40dfda7237 100644
---
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
+++
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
@@ -217,27 +217,27 @@ public class TestMetadataTableReadableMetrics extends
CatalogTestBase {
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(
@@ -289,8 +289,8 @@ public class TestMetadataTableReadableMetrics extends
CatalogTestBase {
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(
diff --git
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
index 9cdcb72c12..9cf953342a 100644
---
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
+++
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
@@ -217,27 +217,27 @@ public class TestMetadataTableReadableMetrics extends
CatalogTestBase {
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(
@@ -289,8 +289,8 @@ public class TestMetadataTableReadableMetrics extends
CatalogTestBase {
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(
diff --git
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
index 9cdcb72c12..9cf953342a 100644
---
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
+++
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
@@ -217,27 +217,27 @@ public class TestMetadataTableReadableMetrics extends
CatalogTestBase {
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(
@@ -289,8 +289,8 @@ public class TestMetadataTableReadableMetrics extends
CatalogTestBase {
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(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1e2ca79e94..091d0a9ec5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -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"
