Skip to content

Flink: Reuse nested projections in RowDataProjection #16790

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

Open
wombatu-kun wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −12
Open

Flink: Reuse nested projections in RowDataProjection #16790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/data/RowDataProjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,18 @@ private static RowData.FieldGetter createFieldGetter(
switch (projectField.type().typeId()) {
case STRUCT:
RowType nestedRowType = (RowType) rowType.getTypeAt(position);
// Build the nested projection once instead of recreating it on every row.
RowDataProjection nestedProjection =
RowDataProjection.create(
nestedRowType, rowField.type().asStructType(), projectField.type().asStructType());
int nestedFieldCount = nestedRowType.getFieldCount();
return row -> {
// null nested struct value
if (row.isNullAt(position)) {
return null;
}

RowData nestedRow = row.getRow(position, nestedRowType.getFieldCount());
return RowDataProjection.create(
nestedRowType, rowField.type().asStructType(), projectField.type().asStructType())
.wrap(nestedRow);
return nestedProjection.wrap(row.getRow(position, nestedFieldCount));
};

case MAP:
Expand Down
10 changes: 6 additions & 4 deletions flink/v2.0/flink/src/main/java/org/apache/iceberg/flink/data/RowDataProjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,18 @@ private static RowData.FieldGetter createFieldGetter(
switch (projectField.type().typeId()) {
case STRUCT:
RowType nestedRowType = (RowType) rowType.getTypeAt(position);
// Build the nested projection once instead of recreating it on every row.
RowDataProjection nestedProjection =
RowDataProjection.create(
nestedRowType, rowField.type().asStructType(), projectField.type().asStructType());
int nestedFieldCount = nestedRowType.getFieldCount();
return row -> {
// null nested struct value
if (row.isNullAt(position)) {
return null;
}

RowData nestedRow = row.getRow(position, nestedRowType.getFieldCount());
return RowDataProjection.create(
nestedRowType, rowField.type().asStructType(), projectField.type().asStructType())
.wrap(nestedRow);
return nestedProjection.wrap(row.getRow(position, nestedFieldCount));
};

case MAP:
Expand Down
10 changes: 6 additions & 4 deletions flink/v2.1/flink/src/main/java/org/apache/iceberg/flink/data/RowDataProjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,18 @@ private static RowData.FieldGetter createFieldGetter(
switch (projectField.type().typeId()) {
case STRUCT:
RowType nestedRowType = (RowType) rowType.getTypeAt(position);
// Build the nested projection once instead of recreating it on every row.
RowDataProjection nestedProjection =
RowDataProjection.create(
nestedRowType, rowField.type().asStructType(), projectField.type().asStructType());
int nestedFieldCount = nestedRowType.getFieldCount();
return row -> {
// null nested struct value
if (row.isNullAt(position)) {
return null;
}

RowData nestedRow = row.getRow(position, nestedRowType.getFieldCount());
return RowDataProjection.create(
nestedRowType, rowField.type().asStructType(), projectField.type().asStructType())
.wrap(nestedRow);
return nestedProjection.wrap(row.getRow(position, nestedFieldCount));
};

case MAP:
Expand Down