Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.7.0-RC1 Cherry-picks #11466

Merged
merged 2 commits into from
Nov 4, 2024
+43 −34
Merged

1.7.0-RC1 Cherry-picks #11466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
502795e
Revert "Build: Bump parquet from 1.13.1 to 1.14.3 (#11264)" (#11462)
RussellSpitzer Nov 4, 2024
105fa7b
Docs: warn `parallelism > 1` doesn't work for migration procedures (#…
manuzhang Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docs/docs/spark-procedures.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,9 @@ See [`migrate`](#migrate) to replace an existing table with an Iceberg table.
| `properties` | ️ | map<string, string> | Properties to add to the newly created table |
| `parallelism` | | int | Number of threads to use for file reading (defaults to 1) |

!!! warning
There's a [known issue with `parallelism > 1`](https://github.com/apache/iceberg/issues/11147) that is scheduled to be fixed in the next release.

#### Output

| Output Name | Type | Description |
Expand Down Expand Up @@ -629,6 +632,9 @@ By default, the original table is retained with the name `table_BACKUP_`.
| `backup_table_name` | | string | Name of the table that will be retained as backup (defaults to `table_BACKUP_`) |
| `parallelism` | | int | Number of threads to use for file reading (defaults to 1) |

!!! warning
There's a [known issue with `parallelism > 1`](https://github.com/apache/iceberg/issues/11147) that is scheduled to be fixed in the next release.

#### Output

| Output Name | Type | Description |
Expand Down Expand Up @@ -675,6 +681,9 @@ Warning : Schema is not validated, adding files with different schema to the Ice

Warning : Files added by this method can be physically deleted by Iceberg operations

!!! warning
There's a [known issue with `parallelism > 1`](https://github.com/apache/iceberg/issues/11147) that is scheduled to be fixed in the next release.

#### Output

| Output Name | Type | Description |
Expand Down
22 changes: 11 additions & 11 deletions ...flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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